svn commit: r1242594 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest: archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ archiva-rest-services/src/main/java/org/apache/archiva/rest/services/

[olamy]

Author: olamy
Date: Thu Feb  9 23:07:37 2012
New Revision: 1242594

URL: http://svn.apache.org/viewvc?rev=1242594&view=rev
Log:
more easy REST method to delete a ProxyConnector

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java?rev=1242594&r1=1242593&r2=1242594&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
 Thu Feb  9 23:07:37 2012
@@ -72,6 +72,17 @@ public interface ProxyConnectorService
     Boolean deleteProxyConnector( ProxyConnector proxyConnector )
         throws ArchivaRestServiceException;
 
+    @Path( "removeProxyConnector" )
+    @GET
+    @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+    @RedbackAuthorization( permissions = 
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
+    /**
+     * @since 1.4-M3
+     */
+    Boolean removeProxyConnector( @QueryParam( "sourceRepoId" ) String 
sourceRepoId,
+                                  @QueryParam( "targetRepoId" ) String 
targetRepoId )
+        throws ArchivaRestServiceException;
+
     /**
      * <b>only for enabled/disable or changing bean values except 
target/source</b>
      *

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java?rev=1242594&r1=1242593&r2=1242594&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
 Thu Feb  9 23:07:37 2012
@@ -113,6 +113,19 @@ public class DefaultProxyConnectorServic
         }
     }
 
+    public Boolean removeProxyConnector( String sourceRepoId, String 
targetRepoId )
+        throws ArchivaRestServiceException
+    {
+        ProxyConnector proxyConnector = getProxyConnector( sourceRepoId, 
targetRepoId );
+        if ( proxyConnector == null )
+        {
+            throw new ArchivaRestServiceException(
+                "proxyConnector with sourceRepoId:" + sourceRepoId + " and 
targetRepoId:" + targetRepoId
+                    + " not exists" );
+        }
+        return deleteProxyConnector( proxyConnector );
+    }
+
     public Boolean updateProxyConnector( ProxyConnector proxyConnector )
         throws ArchivaRestServiceException
     {