From commits-return-6273-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Wed Aug 04 12:10:34 2010 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 72204 invoked from network); 4 Aug 2010 12:10:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Aug 2010 12:10:34 -0000 Received: (qmail 54271 invoked by uid 500); 4 Aug 2010 12:10:34 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 54211 invoked by uid 500); 4 Aug 2010 12:10:31 -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 54204 invoked by uid 99); 4 Aug 2010 12:10:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Aug 2010 12:10:30 +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 12:10:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 17695238897D; Wed, 4 Aug 2010 12:09:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r982227 - in /continuum/trunk/continuum-xmlrpc: continuum-xmlrpc-api/ continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ continuum-xmlrpc-backup/ continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/cli... Date: Wed, 04 Aug 2010 12:09:12 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100804120913.17695238897D@eris.apache.org> Author: ctan Date: Wed Aug 4 12:09:12 2010 New Revision: 982227 URL: http://svn.apache.org/viewvc?rev=982227&view=rev Log: [CONTINUUM-2551] added buildProject( int projectId, BuildTrigger trigger ) in XMLRPC so user can set the trigger when building a project Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml 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/pom.xml 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/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml?rev=982227&r1=982226&r2=982227&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml Wed Aug 4 12:09:12 2010 @@ -27,6 +27,13 @@ under the License. continuum-xmlrpc-api Continuum :: XMLRPC :: API + + + org.apache.continuum + continuum-api + + + 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=982227&r1=982226&r2=982227&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 12:09:12 2010 @@ -22,6 +22,7 @@ package org.apache.maven.continuum.xmlrp import java.util.List; import java.util.Map; +import org.apache.continuum.utils.build.BuildTrigger; import org.apache.continuum.xmlrpc.release.ContinuumReleaseResult; import org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration; import org.apache.continuum.xmlrpc.repository.LocalRepository; @@ -540,6 +541,17 @@ public interface ContinuumService throws Exception; /** + * Forced build the project + * + * @param projectId The project id + * @param buildTrigger The build trigger + * @return + * @throws Exception + */ + int buildProject( int projectId, BuildTrigger buildTrigger ) + throws Exception; + + /** * Build the project group with the default build definition. * * @param projectGroupId The project group id Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml?rev=982227&r1=982226&r2=982227&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml Wed Aug 4 12:09:12 2010 @@ -31,6 +31,12 @@ under the License. org.apache.continuum continuum-xmlrpc-api + + + org.apache.continuum + continuum-api + + org.apache.continuum 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=982227&r1=982226&r2=982227&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 12:09:12 2010 @@ -24,6 +24,7 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; +import org.apache.continuum.utils.build.BuildTrigger; import org.apache.continuum.xmlrpc.release.ContinuumReleaseResult; import org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration; import org.apache.continuum.xmlrpc.repository.LocalRepository; @@ -323,6 +324,12 @@ public class ContinuumXmlRpcClient return continuum.buildProject( projectId, buildDefinitionId ); } + public int buildProject( int projectId, BuildTrigger buildTrigger ) + throws Exception + { + return continuum.buildProject( projectId, buildTrigger ); + } + public int buildGroup( int projectGroupId ) throws Exception { Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml?rev=982227&r1=982226&r2=982227&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml Wed Aug 4 12:09:12 2010 @@ -38,10 +38,6 @@ under the License. org.apache.continuum - continuum-api - - - org.apache.continuum continuum-security 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=982227&r1=982226&r2=982227&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 12:09:12 2010 @@ -591,6 +591,7 @@ public class ContinuumServiceImpl // Building // ---------------------------------------------------------------------- + // TODO: delete this since it does exactly the same as buildProject( int projectId ) public int addProjectToBuildQueue( int projectId ) throws ContinuumException, NoBuildAgentException, NoBuildAgentInGroupException { @@ -601,6 +602,7 @@ public class ContinuumServiceImpl return 0; } + // TODO: delete this since it does exactly the same as buildProject( int projectId, int buildDefinitionId ); public int addProjectToBuildQueue( int projectId, int buildDefinitionId ) throws ContinuumException, NoBuildAgentException, NoBuildAgentInGroupException { @@ -631,6 +633,16 @@ public class ContinuumServiceImpl return 0; } + public int buildProject( int projectId, BuildTrigger buildTrigger ) + throws ContinuumException, NoBuildAgentException, NoBuildAgentInGroupException + { + ProjectSummary ps = getProjectSummary( projectId ); + checkBuildProjectInGroupAuthorization( ps.getProjectGroup().getName() ); + + continuum.buildProject( projectId, buildTrigger ); + return 0; + } + public int buildGroup( int projectGroupId ) throws ContinuumException, NoBuildAgentException, NoBuildAgentInGroupException {