[MRM-462] more cleanup

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

diff --git a/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
index 44904499a159a0b75796b75349459c1c3ae088da..859747925106eb0ddc140ca6c3fd9033a0b6a602 100644 (file)
--- a/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
+++ b/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
@@ -25,7 +25,7 @@
         This object is not serialized to the Database.
       </description>
       <fields>
-        <!-- TODO! check it -->
+        <!-- Note: these are only managed repositories. This should be reviewed as to whether they are still needed -->
         <field>
           <name>repositories</name>
           <version>1.0.0+</version>
@@ -122,7 +122,6 @@
             The Name of the repository.
           </description>
         </field>
-        <!-- TODO! check it -->
         <field stash.maxSize="250">
           <name>url</name>
           <identifier>false</identifier>

diff --git a/MRM-462/archiva-web/archiva-webapp/pom.xml b/MRM-462/archiva-web/archiva-webapp/pom.xml
index 9899bcfc75d6568668684dbc71c18998efec017c..040aea629644a5416a95d833831978d6533ec9d4 100644 (file)
--- a/MRM-462/archiva-web/archiva-webapp/pom.xml
+++ b/MRM-462/archiva-web/archiva-webapp/pom.xml
@@ -400,18 +400,6 @@
           </roleDefaults>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <!-- TODO! add unit tests -->
-        <configuration>
-          <instrumentation>
-            <excludes>
-              <exclude>**/**</exclude>
-            </excludes>
-          </instrumentation>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>

diff --git a/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java b/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
index 779250ca52474b0615f38478f39dd1973a2f0bd9..6406b912382a955da8bf1e253599c55d8b644f17 100644 (file)
--- a/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
+++ b/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
@@ -47,7 +47,7 @@ public class AbstractConfigureRepositoryAction
 
     protected String repoid;
 
-    // TODO! consider removing? was just meant to be for delete...
+    // TODO: consider removing? was just meant to be for delete...
     protected String mode;
 
     // TODO: rename to confirmDelete

diff --git a/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java b/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
index 3200bf57f3ad53ed8c441a43d1c454512a72a683..ca7f2ae7d28ec3eba7d363e7b67e871958e3f1e3 100644 (file)
--- a/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
+++ b/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
@@ -196,7 +196,7 @@ public class ConfigureRemoteRepositoryActionTest
     public void testDeleteRemoteRepositoryKeepContent()
         throws RegistryException, IndeterminateConfigurationException
     {
-        Configuration configuration = executeDeletionTest( "delete-entry", createRepository() );
+        Configuration configuration = executeDeletionTest( createRepository() );
 
         assertTrue( configuration.getRemoteRepositories().isEmpty() );
     }
@@ -216,11 +216,9 @@ public class ConfigureRemoteRepositoryActionTest
         archivaConfigurationControl.replay();
 
         action.setRepoid( REPO_ID );
-        action.setMode( "unmodified" ); // TODO! remove
 
         action.prepare();
         assertEquals( REPO_ID, action.getRepoid() );
-        assertEquals( "unmodified", action.getMode() );
         RemoteRepositoryConfiguration repositoryConfiguration = action.getRepository();
         assertNotNull( repositoryConfiguration );
         assertRepositoryEquals( repositoryConfiguration, createRepository() );
@@ -233,7 +231,7 @@ public class ConfigureRemoteRepositoryActionTest
         assertEquals( Collections.singletonList( originalRepository ), configuration.getRemoteRepositories() );
     }
 
-    private Configuration executeDeletionTest( String mode, RemoteRepositoryConfiguration originalRepository )
+    private Configuration executeDeletionTest( RemoteRepositoryConfiguration originalRepository )
         throws RegistryException, IndeterminateConfigurationException
     {
         Configuration configuration = createConfigurationForEditing( originalRepository );
@@ -247,11 +245,9 @@ public class ConfigureRemoteRepositoryActionTest
         archivaConfigurationControl.replay();
 
         action.setRepoid( REPO_ID );
-        action.setMode( mode ); // TODO! remove
 
         action.prepare();
         assertEquals( REPO_ID, action.getRepoid() );
-        assertEquals( mode, action.getMode() );
         RemoteRepositoryConfiguration repository = action.getRepository();
         assertNotNull( repository );
         assertRepositoryEquals( repository, createRepository() );

diff --git a/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java b/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
index a5e4164c98f6bf23269841c2bf075c7f54c41d70..781cb229aab8b72ffaecf797caf732216580a98f 100644 (file)
--- a/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
+++ b/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
@@ -106,7 +106,7 @@ public class RepositoryServletTest
 
         Configuration c = configuration.getConfiguration();
         c.removeManagedRepository( c.findManagedRepositoryById( REPOSITORY_ID ) );
-        // TODO! it would be better to use a mock configuration and "save" to more accurately reflect the calls made
+        // TODO it would be better to use a mock configuration and "save" to more accurately reflect the calls made
         triggerConfigurationChange( servlet, "managedRepositories.managedRepository(0).id", REPOSITORY_ID );
 
         ManagedRepositoryConfiguration repository = servlet.getRepository( REPOSITORY_ID );
@@ -124,7 +124,7 @@ public class RepositoryServletTest
         repo.setId( NEW_REPOSITORY_ID );
         repo.setName( NEW_REPOSITORY_NAME );
         c.addManagedRepository( repo );
-        // TODO! it would be better to use a mock configuration and "save" to more accurately reflect the calls made
+        // TODO it would be better to use a mock configuration and "save" to more accurately reflect the calls made
         triggerConfigurationChange( servlet, "managedRepositories.managedRepository(2).id", NEW_REPOSITORY_ID );
 
         ManagedRepositoryConfiguration repository = servlet.getRepository( NEW_REPOSITORY_ID );

diff --git a/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml b/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
index 6f2bbc5a48a779810ba32a83d5c41d789c42d68b..a86edac15295c40dda7f7ada3f10162101af6d11 100644 (file)
--- a/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
+++ b/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
@@ -38,7 +38,7 @@
       </configuration>
     </component>
 
-    <!-- TODO! shouldn't need so many components just to use in-memory - is flaky since these are auto-generated -->
+    <!-- TODO: shouldn't need so many components just to use in-memory - is flaky since these are auto-generated -->
     <component>
       <role>org.codehaus.plexus.redback.system.SecuritySystem</role>
       <role-hint>default</role-hint>