Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4AFE1761A for ; Wed, 24 Aug 2011 00:55:55 +0000 (UTC) Received: (qmail 42800 invoked by uid 500); 24 Aug 2011 00:55:55 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 42745 invoked by uid 500); 24 Aug 2011 00:55:54 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 42738 invoked by uid 99); 24 Aug 2011 00:55:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2011 00:55:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2011 00:55:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3C9B723889D5 for ; Wed, 24 Aug 2011 00:55:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1160948 - in /continuum/trunk/continuum-xmlrpc: continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ continuum-xmlrpc-server/src/main/java/org... Date: Wed, 24 Aug 2011 00:55:30 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110824005530.3C9B723889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctan Date: Wed Aug 24 00:55:29 2011 New Revision: 1160948 URL: http://svn.apache.org/viewvc?rev=1160948&view=rev Log: [CONTINUUM-2654] changed return type to int Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java?rev=1160948&r1=1160947&r2=1160948&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java Wed Aug 24 00:55:29 2011 @@ -1595,10 +1595,10 @@ public interface ContinuumService List getAllDirectoryPurgeConfigurationsRPC() throws Exception; - void purgeLocalRepository( int repoPurgeId ) + int purgeLocalRepository( int repoPurgeId ) throws Exception; - void purgeDirectory( int dirPurgeId ) + int purgeDirectory( int dirPurgeId ) throws Exception; // ---------------------------------------------------------------------- @@ -1869,6 +1869,6 @@ public interface ContinuumService Map updateBuildAgentGroupRPC( Map buildAgentGroup ) throws Exception; - void removeBuildAgentGroup( String name ) + int removeBuildAgentGroup( String name ) throws Exception; } Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java?rev=1160948&r1=1160947&r2=1160948&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java Wed Aug 24 00:55:29 2011 @@ -737,16 +737,16 @@ public class ContinuumXmlRpcClient return continuum.getAllDirectoryPurgeConfigurations(); } - public void purgeLocalRepository( int repoPurgeId ) + public int purgeLocalRepository( int repoPurgeId ) throws Exception { - continuum.purgeLocalRepository( repoPurgeId ); + return continuum.purgeLocalRepository( repoPurgeId ); } - public void purgeDirectory( int dirPurgeId ) + public int purgeDirectory( int dirPurgeId ) throws Exception { - continuum.purgeDirectory( dirPurgeId ); + return continuum.purgeDirectory( dirPurgeId ); } // ---------------------------------------------------------------------- @@ -1449,9 +1449,9 @@ public class ContinuumXmlRpcClient return continuum.updateBuildAgentGroupRPC( buildAgentGroup ); } - public void removeBuildAgentGroup( String name ) + public int removeBuildAgentGroup( String name ) throws Exception { - continuum.removeBuildAgentGroup( name ); + return continuum.removeBuildAgentGroup( name ); } } Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java?rev=1160948&r1=1160947&r2=1160948&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java Wed Aug 24 00:55:29 2011 @@ -1862,7 +1862,7 @@ public class ContinuumServiceImpl return d; } - public void purgeLocalRepository( int repoPurgeId ) + public int purgeLocalRepository( int repoPurgeId ) throws ContinuumException { checkManagePurgingAuthorization(); @@ -1872,6 +1872,8 @@ public class ContinuumServiceImpl org.apache.continuum.model.repository.RepositoryPurgeConfiguration repoPurgeConfig = continuum.getPurgeConfigurationService().getRepositoryPurgeConfiguration( repoPurgeId ); continuum.getPurgeManager().purgeRepository( repoPurgeConfig ); + + return 0; } catch ( PurgeConfigurationServiceException e ) { @@ -1883,7 +1885,7 @@ public class ContinuumServiceImpl } } - public void purgeDirectory( int dirPurgeId ) + public int purgeDirectory( int dirPurgeId ) throws ContinuumException { checkManagePurgingAuthorization(); @@ -1893,6 +1895,8 @@ public class ContinuumServiceImpl org.apache.continuum.model.repository.DirectoryPurgeConfiguration dirPurgeConfig = continuum.getPurgeConfigurationService().getDirectoryPurgeConfiguration( dirPurgeId ); continuum.getPurgeManager().purgeDirectory( dirPurgeConfig ); + + return 0; } catch ( PurgeConfigurationServiceException e ) { @@ -2211,14 +2215,17 @@ public class ContinuumServiceImpl } } - public void removeBuildAgentGroup( String name ) + public int removeBuildAgentGroup( String name ) throws ConfigurationException { ConfigurationService configurationService = continuum.getConfiguration(); org.apache.continuum.configuration.BuildAgentGroupConfiguration buildAgentGroupConfiguration = configurationService.getBuildAgentGroup( name ); configurationService.removeBuildAgentGroup( buildAgentGroupConfiguration ); + + return 0; } + // ---------------------------------------------------------------------- // Converters // ----------------------------------------------------------------------