You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2008/06/04 08:38:50 UTC
svn commit: r663006 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src:
main/java/org/apache/maven/archiva/web/action/admin/repositories/
test/java/org/apache/maven/archiva/web/action/admin/repositories/
Author: oching
Date: Tue Jun 3 23:38:50 2008
New Revision: 663006
URL: http://svn.apache.org/viewvc?rev=663006&view=rev
Log:
-reverted -r662662 (validation check against system properties)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java?rev=663006&r1=663005&r2=663006&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java Tue Jun 3 23:38:50 2008
@@ -42,7 +42,6 @@
import java.io.IOException;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
/**
* DeleteManagedRepositoryAction
@@ -102,20 +101,6 @@
return ERROR;
}
- if( deleteContents )
- {
- // [MRM-789] Archiva may delete your app server installation
- Properties props = System.getProperties();
- for( Object value : props.values() )
- {
- if( StringUtils.equalsIgnoreCase( ( (String) value ).trim(), existingRepository.getLocation().trim() ) )
- {
- addActionError( "Unable to delete repository. The location is being referenced in the system properties." );
- return ERROR;
- }
- }
- }
-
String result = SUCCESS;
try
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java?rev=663006&r1=663005&r2=663006&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java Tue Jun 3 23:38:50 2008
@@ -214,26 +214,6 @@
assertFalse( location.exists() );
}
-
- public void testDeleteRepositoryLocationReferencedInSysPropertiesError()
- throws Exception
- {
- System.setProperty( "test.property", getTestFile( "target/test/location" ).getAbsolutePath() );
-
- prepareRoleManagerMock();
-
- Configuration configuration = prepDeletionTest( createRepository(), 4 );
-
- String status = action.deleteContents();
-
- assertEquals( Action.ERROR, status );
-
- assertFalse( configuration.getManagedRepositories().isEmpty() );
-
- assertTrue( location.exists() );
-
- System.clearProperty( "test.property" );
- }
private Configuration prepDeletionTest( ManagedRepositoryConfiguration originalRepository, int expectCountGetConfig )
throws RegistryException, IndeterminateConfigurationException