You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/05/10 21:49:10 UTC
svn commit: r536978 - in
/maven/archiva/trunk/archiva-web/archiva-webapp/src/main:
java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
Author: joakime
Date: Thu May 10 12:49:10 2007
New Revision: 536978
URL: http://svn.apache.org/viewvc?view=rev&rev=536978
Log:
[MRM-328] Unable to delete network proxies
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java?view=diff&rev=536978&r1=536977&r2=536978
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java Thu May 10 12:49:10 2007
@@ -26,7 +26,6 @@
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.configuration.InvalidConfigurationException;
import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
import org.apache.maven.archiva.configuration.functors.NetworkProxySelectionPredicate;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
@@ -37,8 +36,6 @@
import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-import java.io.IOException;
-
/**
* ConfigureNetworkProxyAction
*
@@ -75,7 +72,27 @@
public String delete()
{
- return INPUT;
+ Configuration config = archivaConfiguration.getConfiguration();
+
+ String id = getProxyid();
+ if ( StringUtils.isBlank( id ) )
+ {
+ addActionError( "Unable to delete network proxy with blank id." );
+ return SUCCESS;
+ }
+
+ NetworkProxySelectionPredicate networkProxySelection = new NetworkProxySelectionPredicate( id );
+ NetworkProxyConfiguration proxyConfig = (NetworkProxyConfiguration) CollectionUtils.find( config
+ .getNetworkProxies(), networkProxySelection );
+ if ( proxyConfig == null )
+ {
+ addActionError( "Unable to remove network proxy, proxy with id [" + id + "] not found." );
+ return SUCCESS;
+ }
+
+ archivaConfiguration.getConfiguration().removeNetworkProxy( proxyConfig );
+ addActionMessage( "Successfully removed network proxy [" + id + "]" );
+ return saveConfiguration();
}
public String edit()
@@ -93,7 +110,7 @@
{
return proxy;
}
-
+
public String getProxyid()
{
return proxyid;
@@ -142,25 +159,8 @@
removeNetworkProxy( id );
}
- try
- {
- addNetworkProxy( getProxy() );
- saveConfiguration();
- }
- catch ( IOException e )
- {
- addActionError( "I/O Exception: " + e.getMessage() );
- }
- catch ( InvalidConfigurationException e )
- {
- addActionError( "Invalid Configuration Exception: " + e.getMessage() );
- }
- catch ( RegistryException e )
- {
- addActionError( "Configuration Registry Exception: " + e.getMessage() );
- }
-
- return SUCCESS;
+ addNetworkProxy( getProxy() );
+ return saveConfiguration();
}
public void setMode( String mode )
@@ -200,11 +200,16 @@
}
private String saveConfiguration()
- throws IOException, InvalidConfigurationException, RegistryException
{
- archivaConfiguration.save( archivaConfiguration.getConfiguration() );
-
- addActionMessage( "Successfully saved configuration" );
+ try
+ {
+ archivaConfiguration.save( archivaConfiguration.getConfiguration() );
+ addActionMessage( "Successfully saved configuration" );
+ }
+ catch ( RegistryException e )
+ {
+ addActionError( "Unable to save configuration: " + e.getMessage() );
+ }
return SUCCESS;
}
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp?view=diff&rev=536978&r1=536977&r2=536978
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp Thu May 10 12:49:10 2007
@@ -38,7 +38,7 @@
</blockquote>
<p>
- Are you sure you want to delete network proxy ${proxyid} ?
+ Are you sure you want to delete network proxy <code>${proxyid}</code> ?
</p>
<ww:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">