Author: olamy
Date: Wed Sep 14 10:22:39 2011
New Revision: 1170513
URL: http://svn.apache.org/viewvc?rev=1170513&view=rev
Log:
more cleanup of direct use of archiva-configuration
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.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/connectors/proxy/AbstractProxyConnectorFormAction.java?rev=1170513&r1=1170512&r2=1170513&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
Wed Sep 14 10:22:39 2011
@@ -21,9 +21,10 @@ package org.apache.maven.archiva.web.act
import com.opensymphony.xwork2.Preparable;
import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.networkproxy.NetworkProxy;
+import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.admin.model.proxyconnector.ProxyConnector;
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.policies.DownloadErrorPolicy;
import org.apache.maven.archiva.policies.Policy;
import org.apache.maven.archiva.policies.PostDownloadPolicy;
@@ -32,6 +33,8 @@ import org.apache.maven.archiva.policies
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -96,7 +99,7 @@ public abstract class AbstractProxyConne
protected ProxyConnector connector;
@Inject
- private ArchivaConfiguration archivaConfiguration;
+ private NetworkProxyAdmin networkProxyAdmin;
@PostConstruct
public void initialize()
@@ -395,15 +398,33 @@ public abstract class AbstractProxyConne
}
protected List<String> createNetworkProxyOptions()
+ throws RepositoryAdminException
{
List<String> options = new ArrayList<String>();
options.add( DIRECT_CONNECTION );
- options.addAll(
archivaConfiguration.getConfiguration().getNetworkProxiesAsMap().keySet() );
+ options.addAll( getNetworkProxiesKeys() );
return options;
}
+ private Collection<String> getNetworkProxiesKeys()
+ throws RepositoryAdminException
+ {
+ List<NetworkProxy> networkProxies =
networkProxyAdmin.getNetworkProxies();
+ if ( networkProxies == null || networkProxies.isEmpty() )
+ {
+ return Collections.emptyList();
+ }
+ List<String> keys = new ArrayList<String>( networkProxies.size() );
+ for ( NetworkProxy networkProxy : networkProxies )
+ {
+ keys.add( networkProxy.getId() );
+ }
+ return keys;
+
+ }
+
protected Map<String, Policy> createPolicyMap()
{
Map<String, Policy> policyMap = new HashMap<String, Policy>();
@@ -485,14 +506,13 @@ public abstract class AbstractProxyConne
}
}
- // FIXME remove
- public ArchivaConfiguration getArchivaConfiguration()
+ public NetworkProxyAdmin getNetworkProxyAdmin()
{
- return archivaConfiguration;
+ return networkProxyAdmin;
}
- public void setArchivaConfiguration( ArchivaConfiguration
archivaConfiguration )
+ public void setNetworkProxyAdmin( NetworkProxyAdmin networkProxyAdmin )
{
- this.archivaConfiguration = archivaConfiguration;
+ this.networkProxyAdmin = networkProxyAdmin;
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.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/connectors/proxy/AddProxyConnectorActionTest.java?rev=1170513&r1=1170512&r2=1170513&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
Wed Sep 14 10:22:39 2011
@@ -45,7 +45,7 @@ import java.util.List;
import java.util.Map;
/**
- * AddProxyConnectorActionTest
+ * AddProxyConnectorActionTest
*
* @version $Id$
*/
@@ -68,7 +68,6 @@ public class AddProxyConnectorActionTest
archivaConfigurationControl = MockControl.createControl(
ArchivaConfiguration.class );
archivaConfiguration = (ArchivaConfiguration)
archivaConfigurationControl.getMock();
- action.setArchivaConfiguration( archivaConfiguration );
( (DefaultManagedRepositoryAdmin) action.getManagedRepositoryAdmin()
).setArchivaConfiguration(
archivaConfiguration );
( (DefaultRemoteRepositoryAdmin) action.getRemoteRepositoryAdmin()
).setArchivaConfiguration(
@@ -140,7 +139,7 @@ public class AddProxyConnectorActionTest
assertEquals( 1, connector.getProperties().size() );
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
public void testAddProxyConnectorCommit()
throws Exception
{
@@ -411,7 +410,7 @@ public class AddProxyConnectorActionTest
archivaConfiguration.save( config );
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
private void populateProxyConnector( ProxyConnector connector )
{
connector.setProxyId(
AbstractProxyConnectorFormAction.DIRECT_CONNECTION );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.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/connectors/proxy/EditProxyConnectorActionTest.java?rev=1170513&r1=1170512&r2=1170513&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
Wed Sep 14 10:22:39 2011
@@ -68,16 +68,12 @@ public class EditProxyConnectorActionTes
{
super.setUp();
- //action = (EditProxyConnectorAction) lookup( Action.class.getName(),
"editProxyConnectorAction" );
action = (EditProxyConnectorAction) getActionProxy(
"/admin/editProxyConnector.action" ).getAction();
archivaConfigurationControl = MockControl.createControl(
ArchivaConfiguration.class );
archivaConfiguration = (ArchivaConfiguration)
archivaConfigurationControl.getMock();
- action.setArchivaConfiguration( archivaConfiguration );
- /* Configuration will be requested at least 3 times. */
- archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( new Configuration(), 3 );
+
( (DefaultManagedRepositoryAdmin) action.getManagedRepositoryAdmin()
).setArchivaConfiguration(
archivaConfiguration );
@@ -98,13 +94,22 @@ public class EditProxyConnectorActionTes
{
Configuration config = createInitialConfiguration();
- archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( config, requestConfigCount
);
+ archivaConfigurationControl.expectAndReturn(
archivaConfiguration.getConfiguration(), config,
+ requestConfigCount , 20);
+ //archivaConfiguration.getConfiguration();
+ //archivaConfigurationControl.setReturnValue( config,
requestConfigCount );
for ( int i = 0; i <= saveRequestCount; i++ )
{
archivaConfiguration.save( config );
}
+
+ ( (DefaultManagedRepositoryAdmin) action.getManagedRepositoryAdmin()
).setArchivaConfiguration(
+ archivaConfiguration );
+ ( (DefaultRemoteRepositoryAdmin) action.getRemoteRepositoryAdmin()
).setArchivaConfiguration(
+ archivaConfiguration );
+ ( (DefaultProxyConnectorAdmin) action.getProxyConnectorAdmin()
).setArchivaConfiguration(
+ archivaConfiguration );
}
public void testAddBlackListPattern()
@@ -408,6 +413,9 @@ public class EditProxyConnectorActionTes
public void testSecureActionBundle()
throws Exception
{
+ /* Configuration will be requested at least 3 times. */
+ archivaConfiguration.getConfiguration();
+ archivaConfigurationControl.setReturnValue( new Configuration(), 3 );
archivaConfigurationControl.replay();
action.prepare();
