svn commit: r1164555 - 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/

[olamy]

Author: olamy
Date: Fri Sep  2 14:52:07 2011
New Revision: 1164555

URL: http://svn.apache.org/viewvc?rev=1164555&view=rev
Log:
[MRM-1505] api to configure ManagedRepository : get RID of not any more used 
methods/fields

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.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/AbstractManagedRepositoriesAction.java?rev=1164555&r1=1164554&r2=1164555&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
 Fri Sep  2 14:52:07 2011
@@ -19,12 +19,9 @@ package org.apache.maven.archiva.web.act
  * under the License.
  */
 
-import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.io.File;
 import java.io.IOException;
 
@@ -38,37 +35,5 @@ import java.io.IOException;
 public abstract class AbstractManagedRepositoriesAction
     extends AbstractRepositoriesAdminAction
 {
-
-
-    @Inject
-    @Named( value = "archivaTaskScheduler#repository" )
-    private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
-
     public static final String CONFIRM = "confirm";
-
-    
-    public void setRepositoryTaskScheduler( RepositoryArchivaTaskScheduler 
repositoryTaskScheduler )
-    {
-        this.repositoryTaskScheduler = repositoryTaskScheduler;
-    }
-
-    protected void addRepository( ManagedRepositoryConfiguration repository, 
Configuration configuration )
-        throws IOException
-    {
-        // Normalize the path
-        File file = new File( repository.getLocation() );
-        repository.setLocation( file.getCanonicalPath() );
-        if ( !file.exists() )
-        {
-            file.mkdirs();
-        }
-        if ( !file.exists() || !file.isDirectory() )
-        {
-            throw new IOException(
-                "Unable to add repository - no write access, can not create 
the root directory: " + file );
-        }
-
-        configuration.addManagedRepository( repository );
-
-    }
 }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.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/EditManagedRepositoryActionTest.java?rev=1164555&r1=1164554&r2=1164555&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
 Fri Sep  2 14:52:07 2011
@@ -93,15 +93,12 @@ public class EditManagedRepositoryAction
 
         roleManagerControl = MockControl.createControl( RoleManager.class );
         roleManager = (RoleManager) roleManagerControl.getMock();
-        //action.setRoleManager( roleManager );
 
         registryControl = MockControl.createControl( Registry.class );
         registry = (Registry) registryControl.getMock();
-        //action.setRegistry( registry );
 
         repositoryTaskSchedulerControl = MockClassControl.createControl( 
RepositoryArchivaTaskScheduler.class );
         repositoryTaskScheduler = (RepositoryArchivaTaskScheduler) 
repositoryTaskSchedulerControl.getMock();
-        action.setRepositoryTaskScheduler( repositoryTaskScheduler );
 
         location = new File( "target/test/location" );
 
@@ -110,7 +107,6 @@ public class EditManagedRepositoryAction
         when( repositorySession.getRepository() ).thenReturn( 
metadataRepository );
         TestRepositorySessionFactory factory = applicationContext.getBean( 
TestRepositorySessionFactory.class );
         factory.setRepositorySession( repositorySession );
-        action.setRepositorySessionFactory( factory );
 
         ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() 
).setArchivaConfiguration( archivaConfiguration );
         ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() 
).setRoleManager( roleManager );