Author: brett
Date: Wed Sep 12 00:07:26 2007
New Revision: 574810
URL: http://svn.apache.org/viewvc?rev=574810&view=rev
Log:
[MRM-462] more cleanup
Modified:
maven/archiva/branches/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/pom.xml
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
Modified:
maven/archiva/branches/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=574810&r1=574809&r2=574810&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
(original)
+++
maven/archiva/branches/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
Wed Sep 12 00:07:26 2007
@@ -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>
Modified: maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/pom.xml?rev=574810&r1=574809&r2=574810&view=diff
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/pom.xml Wed Sep
12 00:07:26 2007
@@ -401,18 +401,6 @@
</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>
<execution>
Modified:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java?rev=574810&r1=574809&r2=574810&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
(original)
+++
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
Wed Sep 12 00:07:26 2007
@@ -47,7 +47,7 @@
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
Modified:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java?rev=574810&r1=574809&r2=574810&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
(original)
+++
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
Wed Sep 12 00:07:26 2007
@@ -196,7 +196,7 @@
public void testDeleteRemoteRepositoryKeepContent()
throws RegistryException, IndeterminateConfigurationException
{
- Configuration configuration = executeDeletionTest( "delete-entry",
createRepository() );
+ Configuration configuration = executeDeletionTest( createRepository()
);
assertTrue( configuration.getRemoteRepositories().isEmpty() );
}
@@ -216,11 +216,9 @@
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 @@
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 @@
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() );
Modified:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java?rev=574810&r1=574809&r2=574810&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
(original)
+++
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
Wed Sep 12 00:07:26 2007
@@ -106,7 +106,7 @@
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 @@
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 );
Modified:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml?rev=574810&r1=574809&r2=574810&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
(original)
+++
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
Wed Sep 12 00:07:26 2007
@@ -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>
