[MRM-1452] add ability to delete contents of a repository via xml-rpc

submitted by Maria Catherine Tan

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1064444 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
index 214c9bad28d96ef9b74d9461119b7dda63cda5f9..78e90b24cbe98cc773515aa5f69e204d979ea47e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
@@ -113,6 +113,16 @@ public interface AdministrationService
     public Boolean deleteManagedRepository( String repoId )
         throws Exception;
 
+    /**
+     * Deletes a managed repository content with the given repository id
+     * 
+     * @param repoId
+     * @return
+     * @throws Exception
+     */
+    public Boolean deleteManagedRepositoryContent( String repoId )
+        throws Exception;
+
     /**
      * Get a managed repository with the given repository id.
      * @param repoId

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java
index 457ab8b7bb8fd10edec66a4871488f4e07755dc5..5183d327107ab00f6e5408b44e76fd46d2e1c37d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java
@@ -43,7 +43,8 @@ public class ServiceMethodsPermissionsMapping
                        "AdministrationService.deleteArtifact", 
                        "AdministrationService.addManagedRepository",
                        "AdministrationService.deleteManagedRepository", "AdministrationService.getManagedRepository",
-                       "AdministrationService.merge");
+                       "AdministrationService.merge",
+                       "AdministrationService.deleteManagedRepositoryContent");
 
     public static final List<String> SERVICE_METHODS_FOR_OPERATION_RUN_INDEXER =
         Arrays.asList( "AdministrationService.executeRepositoryScanner" );

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
index 0dc4cc1271a65e07e0807781bf0b8b364ad275a1..2d894dde98430f1091571f941159e7ef754ffba8 100644 (file)
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
@@ -468,6 +468,44 @@ public class AdministrationServiceImpl
         return Boolean.TRUE;
     }
 
+    public Boolean deleteManagedRepositoryContent( String repoId )
+        throws Exception
+    {
+        Configuration config = archivaConfiguration.getConfiguration();
+
+        ManagedRepositoryConfiguration repository = config.findManagedRepositoryById( repoId );
+
+        if ( repository == null )
+        {
+            throw new Exception( "Repository Id : " + repoId + " not found." );
+        }
+
+        RepositorySession repositorySession = repositorySessionFactory.createSession();
+        try
+        {
+            MetadataRepository metadataRepository = repositorySession.getRepository();
+            metadataRepository.removeRepository( repository.getId() );
+            repositorySession.save();
+        }
+        finally
+        {
+            repositorySession.close();
+        }
+
+        File repoDir = new File( repository.getLocation() );
+        File[] children = repoDir.listFiles();
+
+        if ( children != null )
+        {
+            for ( File child : children )
+            {
+                FileUtils.deleteDirectory( child );
+            }
+        }
+
+        return Boolean.TRUE;
+    }
+
     public ManagedRepository getManagedRepository( String repoId )
         throws Exception
     {

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
index 53620eb7b34509068f47ac1b54e7af9eaf07c303..d4eb637ef3de459c3e57d4f8bf93d19300074adc 100644 (file)
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
@@ -665,6 +665,52 @@ public class AdministrationServiceImplTest
         assertRemoteRepo( repos.get( 1 ), remoteRepos.get( 1 ) );
     }
 
+    public void testDeleteInvalidRepositoryContent()
+    {
+        archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config );
+        configControl.expectAndReturn( config.findManagedRepositoryById( "invalid" ), null );
+
+        archivaConfigControl.replay();
+        configControl.replay();
+
+        try
+        {
+            service.deleteManagedRepositoryContent( "invalid" );
+        }
+        catch ( Exception e )
+        {
+            assertEquals( "Repository Id : invalid not found.", e.getMessage() );
+        }
+
+        archivaConfigControl.verify();
+        configControl.verify();
+    }
+
+    public void testDeleteRepositoryContent()
+        throws Exception
+    {
+        ManagedRepositoryConfiguration managedRepo = createManagedRepo( "default", "default-repo" );
+        assertTrue( new File( managedRepo.getLocation(), "org" ).exists() );
+
+        archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config );
+        configControl.expectAndReturn( config.findManagedRepositoryById( "internal" ), managedRepo );
+        metadataRepository.removeRepository( "internal" );
+        
+        archivaConfigControl.replay();
+        configControl.replay();
+        metadataRepositoryControl.replay();
+
+        boolean success = service.deleteManagedRepositoryContent( "internal" );
+        assertTrue( success );
+
+        archivaConfigControl.verify();
+        configControl.verify();
+        metadataRepositoryControl.verify();
+
+        assertFalse( new File( managedRepo.getLocation(), "org" ).exists() );
+        assertTrue( new File( managedRepo.getLocation() ).exists() );
+    }
+
     /* Merge method */
 
     public void testMergeRepositoryWithInvalidRepository()