Author: brett
Date: Tue Sep 11 23:51:45 2007
New Revision: 574803
URL: http://svn.apache.org/viewvc?rev=574803&view=rev
Log:
[MRM-462] removed unneeded classes
Removed:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AdminRepositoryConfiguration.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryConfigurationAdminTransformer.java
Modified:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
Modified:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.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/connectors/proxy/ProxyConnectorsAction.java?rev=574803&r1=574802&r2=574803&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
(original)
+++
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
Tue Sep 11 23:51:45 2007
@@ -22,12 +22,10 @@
import com.opensymphony.xwork.Preparable;
import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Transformer;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import
org.apache.maven.archiva.web.action.admin.repositories.AdminRepositoryConfiguration;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
@@ -51,41 +49,24 @@
implements SecureAction, Preparable
{
/**
- * @plexus.requirement role-hint="adminrepoconfig"
- */
- private Transformer repoConfigToAdmin;
-
- /**
* @plexus.requirement
*/
private ArchivaConfiguration archivaConfiguration;
- private Map /*<String,AdminRepositoryConfiguration>*/repoMap;
+ private Map repoMap;
/**
* Map of Proxy Connectors.
*/
- private Map /*<String,AdminProxyConnector>*/proxyConnectorMap;
+ private Map proxyConnectorMap;
public void prepare()
- throws Exception
{
Configuration config = archivaConfiguration.getConfiguration();
repoMap = new HashMap();
-
- Closure addToRepoMap = new Closure()
- {
- public void execute( Object input )
- {
- AdminRepositoryConfiguration arepo =
- (AdminRepositoryConfiguration)
repoConfigToAdmin.transform( input );
- repoMap.put( arepo.getId(), arepo );
- }
- };
-
- CollectionUtils.forAllDo( config.getManagedRepositories(),
addToRepoMap );
- CollectionUtils.forAllDo( config.getRemoteRepositories(), addToRepoMap
);
+ repoMap.putAll( config.getRemoteRepositoriesAsMap() );
+ repoMap.putAll( config.getManagedRepositoriesAsMap() );
proxyConnectorMap = new HashMap();
@@ -129,18 +110,8 @@
return repoMap;
}
- public void setRepoMap( Map repoMap )
- {
- this.repoMap = repoMap;
- }
-
public Map getProxyConnectorMap()
{
return proxyConnectorMap;
- }
-
- public void setProxyConnectorMap( Map proxyConnectorMap )
- {
- this.proxyConnectorMap = proxyConnectorMap;
}
}
Modified:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.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/ConfigureRepositoryAction.java?rev=574803&r1=574802&r2=574803&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
(original)
+++
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
Tue Sep 11 23:51:45 2007
@@ -45,7 +45,7 @@
/**
* The model for this action.
*/
- private AdminRepositoryConfiguration repository;
+ private ManagedRepositoryConfiguration repository;
/**
* @plexus.requirement role-hint="default"
@@ -67,7 +67,7 @@
String result = SUCCESS;
if ( StringUtils.equals( mode, "delete-entry" ) || StringUtils.equals(
mode, "delete-contents" ) )
{
- AdminRepositoryConfiguration existingRepository = repository;
+ ManagedRepositoryConfiguration existingRepository = repository;
if ( existingRepository == null )
{
addActionError( "A repository with that id does not exist" );
@@ -116,7 +116,7 @@
return result;
}
- public AdminRepositoryConfiguration getRepository()
+ public ManagedRepositoryConfiguration getRepository()
{
return repository;
}
@@ -126,16 +126,13 @@
String id = repoid;
if ( id == null )
{
- this.repository = new AdminRepositoryConfiguration();
+ this.repository = new ManagedRepositoryConfiguration();
this.repository.setReleases( false );
this.repository.setIndexed( false );
}
-
- ManagedRepositoryConfiguration repoconfig =
- archivaConfiguration.getConfiguration().findManagedRepositoryById(
id );
- if ( repoconfig != null )
+ else
{
- this.repository = new AdminRepositoryConfiguration( repoconfig );
+ repository =
archivaConfiguration.getConfiguration().findManagedRepositoryById( id );
}
}
@@ -230,7 +227,7 @@
return containsError;
}
- private void addRepository( AdminRepositoryConfiguration repository,
Configuration configuration )
+ private void addRepository( ManagedRepositoryConfiguration repository,
Configuration configuration )
throws IOException, RoleManagerException
{
// Normalize the path
@@ -251,7 +248,7 @@
roleManager.createTemplatedRole( "archiva-repository-observer",
repository.getId() );
}
- private void removeContents( AdminRepositoryConfiguration
existingRepository )
+ private void removeContents( ManagedRepositoryConfiguration
existingRepository )
throws IOException
{
FileUtils.deleteDirectory( new File( existingRepository.getLocation()
) );
Modified:
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.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/ConfigureRepositoryActionTest.java?rev=574803&r1=574802&r2=574803&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
(original)
+++
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
Tue Sep 11 23:51:45 2007
@@ -98,7 +98,7 @@
action.prepare();
assertNull( action.getRepoid() );
assertNull( action.getMode() );
- AdminRepositoryConfiguration configuration = action.getRepository();
+ ManagedRepositoryConfiguration configuration = action.getRepository();
assertNotNull( configuration );
assertNull( configuration.getId() );
// check all booleans are false
@@ -140,7 +140,7 @@
action.prepare();
action.setMode( "add" );
- AdminRepositoryConfiguration repository = action.getRepository();
+ ManagedRepositoryConfiguration repository = action.getRepository();
populateRepository( repository );
assertFalse( location.exists() );
@@ -168,7 +168,7 @@
action.prepare();
assertEquals( REPO_ID, action.getRepoid() );
assertNull( action.getMode() );
- AdminRepositoryConfiguration repository = action.getRepository();
+ ManagedRepositoryConfiguration repository = action.getRepository();
assertNotNull( repository );
assertRepositoryEquals( repository, createRepository() );
@@ -199,7 +199,7 @@
action.prepare();
action.setMode( "edit" );
- AdminRepositoryConfiguration repository = action.getRepository();
+ ManagedRepositoryConfiguration repository = action.getRepository();
populateRepository( repository );
repository.setName( "new repo name" );
@@ -229,7 +229,7 @@
action.prepare();
assertEquals( REPO_ID, action.getRepoid() );
assertNull( action.getMode() );
- AdminRepositoryConfiguration repository = action.getRepository();
+ ManagedRepositoryConfiguration repository = action.getRepository();
assertNotNull( repository );
assertRepositoryEquals( repository, createRepository() );
@@ -266,7 +266,7 @@
ManagedRepositoryConfiguration originalRepository = createRepository();
Configuration configuration = executeDeletionTest( "unmodified",
originalRepository );
- AdminRepositoryConfiguration repository = action.getRepository();
+ ManagedRepositoryConfiguration repository = action.getRepository();
assertRepositoryEquals( repository, createRepository() );
assertEquals( Collections.singletonList( originalRepository ),
configuration.getManagedRepositories() );
@@ -294,7 +294,7 @@
action.prepare();
assertEquals( REPO_ID, action.getRepoid() );
assertEquals( mode, action.getMode() );
- AdminRepositoryConfiguration repository = action.getRepository();
+ ManagedRepositoryConfiguration repository = action.getRepository();
assertNotNull( repository );
assertRepositoryEquals( repository, createRepository() );
