svn commit: r1188327 - in /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src: main/java/org/apache/archiva/admin/repository/managed/ test/java/org/apache/archiva/admin/repository/managed/

[olamy]

Author: olamy
Date: Mon Oct 24 19:35:43 2011
New Revision: 1188327

URL: http://svn.apache.org/viewvc?rev=1188327&view=rev
Log:
remove a FIXME as it's fixed and covered by a unit test too 
RepositoryGroupAdminTest#addAndDeleteGroupWithRemowingManagedRepo

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1188327&r1=1188326&r2=1188327&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
 Mon Oct 24 19:35:43 2011
@@ -263,8 +263,6 @@ public class DefaultManagedRepositoryAdm
         return repository;
     }
 
-
-    // FIXME cleanup repositoryGroups when deleting a ManagedRepo
     public Boolean deleteManagedRepository( String repositoryId, 
AuditInformation auditInformation,
                                             boolean deleteContent )
         throws RepositoryAdminException

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java?rev=1188327&r1=1188326&r2=1188327&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
 Mon Oct 24 19:35:43 2011
@@ -35,6 +35,10 @@ public class ManagedRepositoryAdminTest
 {
     public static final String STAGE_REPO_ID_END = 
DefaultManagedRepositoryAdmin.STAGE_REPO_ID_END;
 
+
+    String repoId = "test-new-one";
+    String repoLocation = APPSERVER_BASE_PATH + File.separator + repoId;
+
     @Test
     public void getAllManagedRepos()
         throws Exception
@@ -69,10 +73,6 @@ public class ManagedRepositoryAdminTest
     {
         mockAuditListener.clearEvents();
 
-        String repoId = "test-new-one";
-
-        String repoLocation = APPSERVER_BASE_PATH + File.separator + repoId;
-
         File repoDir = clearRepoLocation( repoLocation );
 
         List<ManagedRepository> repos = 
managedRepositoryAdmin.getManagedRepositories();
@@ -116,9 +116,6 @@ public class ManagedRepositoryAdminTest
     public void updateDeleteManagedRepo()
         throws Exception
     {
-        String repoId = "test-new-one";
-
-        String repoLocation = APPSERVER_BASE_PATH + File.separator + 
"new-path";
 
         File repoDir = clearRepoLocation( repoLocation );
 
@@ -177,9 +174,6 @@ public class ManagedRepositoryAdminTest
         throws Exception
     {
 
-        String repoId = "test-new-one";
-        String repoLocation = APPSERVER_BASE_PATH + File.separator + repoId;
-
         File repoDir = clearRepoLocation( repoLocation );
 
         mockAuditListener.clearEvents();
@@ -234,9 +228,6 @@ public class ManagedRepositoryAdminTest
     public void updateDeleteManagedRepoWithStagedRepo()
         throws Exception
     {
-        String repoId = "test-new-one";
-
-        String repoLocation = APPSERVER_BASE_PATH + File.separator + 
"new-path";
 
         String stageRepoLocation = APPSERVER_BASE_PATH + File.separator + 
repoId;
 
@@ -312,6 +303,7 @@ public class ManagedRepositoryAdminTest
 
     }
 
+
     //----------------------------------
     // utility methods
     //----------------------------------