From commits-return-6274-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Wed Aug 04 13:40:43 2010 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 9284 invoked from network); 4 Aug 2010 13:40:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Aug 2010 13:40:43 -0000 Received: (qmail 47578 invoked by uid 500); 4 Aug 2010 13:40:40 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 46389 invoked by uid 500); 4 Aug 2010 13:40:38 -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 46373 invoked by uid 99); 4 Aug 2010 13:40:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Aug 2010 13:40:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 04 Aug 2010 13:40:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7F6D723889B3; Wed, 4 Aug 2010 13:39:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r982247 - 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, 04 Aug 2010 13:39:16 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100804133916.7F6D723889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctan Date: Wed Aug 4 13:39:16 2010 New Revision: 982247 URL: http://svn.apache.org/viewvc?rev=982247&view=rev Log: [CONTINUUM-2549] overloaded addMavenTwoProject to be able to use single checkout in XMLRPC Submitted By: Teody Cue Jr. 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=982247&r1=982246&r2=982247&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 4 13:39:16 2010 @@ -713,6 +713,30 @@ public interface ContinuumService Map addMavenTwoProjectRPC( String url, int projectGroupId ) throws Exception; + /** + * Add a maven 2.x project from an url. + * + * @param url The POM url + * @param projectGroupId The id of the group where projects will be stored + * @Param checkoutInSingleDirectory Determines whether the project will be stored on a single directory + * @return The result of the action with the list of projects created + * @throws Exception + */ + AddingResult addMavenTwoProject( String url, int projectGroupId, boolean checkoutInSingleDirectory ) + throws Exception; + + /** + * Same method but compatible with standard XMLRPC + * + * @param url The POM url + * @param projectGroupId The id of the group where projects will be stored + * @Param checkoutInSingleDirectory Determines whether the project will be stored on a single directory + * @return The result of the action with the list of projects created as RPC value + * @throws Exception + */ + Map addMavenTwoProjectRPC( String url, int projectGroupId, boolean checkoutInSingleDirectory ) + throws Exception; + // ---------------------------------------------------------------------- // Maven 1.x projects // ---------------------------------------------------------------------- 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=982247&r1=982246&r2=982247&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 4 13:39:16 2010 @@ -392,6 +392,12 @@ public class ContinuumXmlRpcClient return continuum.addMavenTwoProject( url, projectGroupId ); } + public AddingResult addMavenTwoProject( String url, int projectGroupId, boolean checkoutInSingleDirectory ) + throws Exception + { + return continuum.addMavenTwoProject( url, projectGroupId, checkoutInSingleDirectory ); + } + // ---------------------------------------------------------------------- // Maven 1.x projects // ---------------------------------------------------------------------- @@ -703,6 +709,12 @@ public class ContinuumXmlRpcClient return continuum.addMavenTwoProjectRPC( url, projectGroupId ); } + public Map addMavenTwoProjectRPC( String url, int projectGroupId, boolean checkoutInSingleDirectory ) + throws Exception + { + return continuum.addMavenTwoProjectRPC( url, projectGroupId, checkoutInSingleDirectory ); + } + public Map addProjectGroupRPC( String groupName, String groupId, String description ) throws Exception { 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=982247&r1=982246&r2=982247&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 4 13:39:16 2010 @@ -44,6 +44,7 @@ import org.apache.continuum.xmlrpc.repos import org.apache.continuum.xmlrpc.repository.RepositoryPurgeConfiguration; import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; +import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException; import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants; import org.apache.maven.continuum.installation.InstallationException; import org.apache.maven.continuum.profile.ProfileException; @@ -750,6 +751,32 @@ public class ContinuumServiceImpl return populateAddingResult( result ); } + public AddingResult addMavenTwoProject( String url, int projectGroupId, boolean checkoutInSingleDirectory ) + throws ContinuumException + { + checkAddProjectToGroupAuthorization( getProjectGroupName( projectGroupId ) ); + + ContinuumProjectBuildingResult result = null; + try + { + result = + continuum.addMavenTwoProject( + url, + projectGroupId, + true, // checkProtocol + false, // useCredentialsCache + true, // recursiveProjects + continuum.getBuildDefinitionService().getDefaultMavenTwoBuildDefinitionTemplate().getId(), + checkoutInSingleDirectory ); + } + catch ( BuildDefinitionServiceException e ) + { + throw new ContinuumException( e.getMessage(), e ); + } + + return populateAddingResult( result ); + } + // ---------------------------------------------------------------------- // Maven 1.x projects // ---------------------------------------------------------------------- @@ -2322,6 +2349,12 @@ public class ContinuumServiceImpl return serializeObject( this.addMavenTwoProject( url, projectGroupId ) ); } + public Map addMavenTwoProjectRPC( String url, int projectGroupId, boolean checkoutInSingleDirectory ) + throws Exception + { + return serializeObject( this.addMavenTwoProject( url, projectGroupId, checkoutInSingleDirectory ) ); + } + public Map addProjectGroupRPC( String groupName, String groupId, String description ) throws Exception {