You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2010/08/04 14:09:12 UTC
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...
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.
<artifactId>continuum-xmlrpc-api</artifactId>
<name>Continuum :: XMLRPC :: API</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-api</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
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.
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-xmlrpc-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
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.
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.continuum</groupId>
<artifactId>continuum-security</artifactId>
</dependency>
<dependency>
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
{