Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1510] api to configure NetworkProxy : use it webapp 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1166586 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-09-08 09:33:57 +00:00
parent 4060f79073
commit 84775832fd
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java
View File

@ -20,9 +20,9 @@ package org.apache.maven.archiva.web.action.admin.networkproxies;
*/ */
import com.opensymphony.xwork2.Preparable; import com.opensymphony.xwork2.Preparable;
import org.apache.archiva.admin.repository.networkproxy.NetworkProxy;
import org.apache.archiva.admin.repository.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
import org.apache.maven.archiva.web.action.AbstractActionSupport; import org.apache.maven.archiva.web.action.AbstractActionSupport;
import org.codehaus.plexus.redback.rbac.Resource; import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.redback.integration.interceptor.SecureAction; import org.codehaus.redback.integration.interceptor.SecureAction;
@ -47,14 +47,14 @@ public class NetworkProxiesAction
{ {
@Inject @Inject
private ArchivaConfiguration configuration; private NetworkProxyAdmin networkProxyAdmin;
private List<NetworkProxyConfiguration> networkProxies; private List<NetworkProxy> networkProxies;
public void prepare() public void prepare()
throws Exception throws Exception
{ {
networkProxies = configuration.getConfiguration().getNetworkProxies(); networkProxies = getNetworkProxyAdmin().getNetworkProxies();
} }
public SecureActionBundle getSecureActionBundle() public SecureActionBundle getSecureActionBundle()
@ -68,13 +68,23 @@ public class NetworkProxiesAction
return bundle; return bundle;
} }
public List<NetworkProxyConfiguration> getNetworkProxies() public List<NetworkProxy> getNetworkProxies()
{ {
return networkProxies; return networkProxies;
} }
public void setNetworkProxies( List<NetworkProxyConfiguration> networkProxies ) public void setNetworkProxies( List<NetworkProxy> networkProxies )
{ {
this.networkProxies = networkProxies; this.networkProxies = networkProxies;
} }
public NetworkProxyAdmin getNetworkProxyAdmin()
{
return networkProxyAdmin;
}
public void setNetworkProxyAdmin( NetworkProxyAdmin networkProxyAdmin )
{
this.networkProxyAdmin = networkProxyAdmin;
}
} }