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/12/09 01:15:22 UTC
svn commit: r1043796 [1/2] - in /continuum/trunk/continuum-xmlrpc:
continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/
continuum-xmlrpc-api/src/main/mdo/
continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/
...
Author: ctan
Date: Thu Dec 9 00:15:22 2010
New Revision: 1043796
URL: http://svn.apache.org/viewvc?rev=1043796&view=rev
Log:
[CONTINUUM-2593] ability to add/edit/delete/retrieve a build agent through web service
Submitted By: Mark John Kenedy L. Magallanes
Modified:
continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java
continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.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/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml
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=1043796&r1=1043795&r2=1043796&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 Thu Dec 9 00:15:22 2010
@@ -29,6 +29,7 @@ import org.apache.continuum.xmlrpc.repos
import org.apache.continuum.xmlrpc.repository.RepositoryPurgeConfiguration;
import org.apache.continuum.xmlrpc.utils.BuildTrigger;
import org.apache.maven.continuum.xmlrpc.project.AddingResult;
+import org.apache.maven.continuum.xmlrpc.project.BuildAgentConfiguration;
import org.apache.maven.continuum.xmlrpc.project.BuildDefinition;
import org.apache.maven.continuum.xmlrpc.project.BuildDefinitionTemplate;
import org.apache.maven.continuum.xmlrpc.project.BuildProjectTask;
@@ -57,7 +58,7 @@ public interface ContinuumService
/**
* Get All projects.
- *
+ *
* @param projectGroupId The project group Id
* @return List of {@link ProjectSummary}
* @throws Exception
@@ -65,10 +66,9 @@ public interface ContinuumService
List<ProjectSummary> getProjects( int projectGroupId )
throws Exception;
-
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroupId The project group Id
* @return List of {@link ProjectSummary} as RPC value
* @throws Exception
@@ -76,10 +76,9 @@ public interface ContinuumService
List<Object> getProjectsRPC( int projectGroupId )
throws Exception;
-
/**
* Get a project.
- *
+ *
* @param projectId the project id
* @return The project summary
* @throws Exception
@@ -89,7 +88,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectId the project id
* @return The project summary as RPC value
* @throws Exception
@@ -99,7 +98,7 @@ public interface ContinuumService
/**
* Get a project with all details.
- *
+ *
* @param projectId The project id
* @return The project
* @throws Exception
@@ -109,7 +108,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectId the project id
* @return The project as RPC value
* @throws Exception
@@ -119,7 +118,7 @@ public interface ContinuumService
/**
* Remove a project.
- *
+ *
* @param projectId The project id
* @throws Exception
*/
@@ -128,7 +127,7 @@ public interface ContinuumService
/**
* Update a project. Useful to change the scm parameters.
- *
+ *
* @param project The project to update
* @throws Exception
*/
@@ -137,20 +136,21 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param project The project to update
* @return The project as RPC value
* @throws Exception
*/
Map<String, Object> updateProjectRPC( Map<String, Object> project )
throws Exception;
+
// ----------------------------------------------------------------------
// Projects Groups
// ----------------------------------------------------------------------
/**
* Get a project groups.
- *
+ *
* @param projectGroupId the id
* @return project group
* @throws Exception
@@ -160,7 +160,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroupId the id
* @return project group as RPC value
* @throws Exception
@@ -170,7 +170,7 @@ public interface ContinuumService
/**
* Get all project groups.
- *
+ *
* @return All project groups
* @throws Exception
*/
@@ -179,7 +179,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @return List of {@link ProjectGroupSummary} as RPC value
* @throws Exception
*/
@@ -188,7 +188,7 @@ public interface ContinuumService
/**
* Get all project groups with all details (project summaries, notifiers, build definitions).
- *
+ *
* @return All project groups
* @throws Exception
*/
@@ -197,7 +197,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @return List of {@link ProjectGroup} as RPC value
* @throws Exception
*/
@@ -206,7 +206,7 @@ public interface ContinuumService
/**
* Get all project groups with all details.
- *
+ *
* @return All project groups
* @throws Exception
* @deprecated
@@ -216,7 +216,7 @@ public interface ContinuumService
/**
* Get a project group.
- *
+ *
* @param projectGroupId The project group id
* @return The project group summary
* @throws Exception
@@ -226,7 +226,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroupId The project group id
* @return The project group summary as RPC value
* @throws Exception
@@ -236,7 +236,7 @@ public interface ContinuumService
/**
* Get a project group with all details.
- *
+ *
* @param projectGroupId The project group id
* @return The project group
* @throws Exception
@@ -246,7 +246,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroupId The project group id
* @return The project group as RPC value
* @throws Exception
@@ -256,7 +256,7 @@ public interface ContinuumService
/**
* Remove a project group.
- *
+ *
* @param projectGroupId The project group id
* @throws Exception
*/
@@ -265,7 +265,7 @@ public interface ContinuumService
/**
* Update a project Group.
- *
+ *
* @param projectGroup The project group to update
* @throws Exception
*/
@@ -274,7 +274,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroup The project group to update
* @return The project group as RPC value
* @throws Exception
@@ -284,9 +284,9 @@ public interface ContinuumService
/**
* Add a project Group.
- *
- * @param groupName The project group name
- * @param groupId The project group id
+ *
+ * @param groupName The project group name
+ * @param groupId The project group id
* @param description The project group description
* @return the project group summary of the created project group
* @throws Exception
@@ -299,9 +299,9 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
- * @param groupName The project group name
- * @param groupId The project group id
+ *
+ * @param groupName The project group name
+ * @param groupId The project group id
* @param description The project group description
* @return the project group summary of the created project group as RPC value
* @throws Exception
@@ -357,7 +357,7 @@ public interface ContinuumService
/**
* Get the build definitions list of the project.
- *
+ *
* @param projectId The project id
* @return The build definitions list
* @throws Exception
@@ -367,7 +367,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectId The project id
* @return The build definitions list as RPC value
* @throws Exception
@@ -377,7 +377,7 @@ public interface ContinuumService
/**
* Get the build definitions list of the project group.
- *
+ *
* @param projectGroupId The project group id
* @return The build definitions list
* @throws Exception
@@ -387,7 +387,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroupId The project group id
* @return The build definitions list as RPC value
* @throws Exception
@@ -397,9 +397,9 @@ public interface ContinuumService
/**
* Update a project build definition.
- *
+ *
* @param projectId The project id
- * @param buildDef The build defintion to update
+ * @param buildDef The build defintion to update
* @return the updated build definition
* @throws Exception
*/
@@ -408,9 +408,9 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectId The project id
- * @param buildDef The build defintion to update
+ * @param buildDef The build defintion to update
* @return the updated build definition as RPC value
* @throws Exception
*/
@@ -419,9 +419,9 @@ public interface ContinuumService
/**
* Update a project group build definition.
- *
+ *
* @param projectGroupId The project group id
- * @param buildDef The build defintion to update
+ * @param buildDef The build defintion to update
* @return the updated build definition
* @throws Exception
*/
@@ -430,9 +430,9 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroupId The project group id
- * @param buildDef The build defintion to update
+ * @param buildDef The build defintion to update
* @return the updated build definition as RPC value
* @throws Exception
*/
@@ -441,9 +441,9 @@ public interface ContinuumService
/**
* Add a project build definition.
- *
+ *
* @param projectId The project id
- * @param buildDef The build defintion to update
+ * @param buildDef The build defintion to update
* @return the added build definition
* @throws Exception
*/
@@ -452,9 +452,9 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectId The project id
- * @param buildDef The build defintion to update
+ * @param buildDef The build defintion to update
* @return the added build definition as RPC value
* @throws Exception
*/
@@ -463,9 +463,9 @@ public interface ContinuumService
/**
* Add a project group buildDefinition.
- *
+ *
* @param projectGroupId The project group id
- * @param buildDef The build defintion to update
+ * @param buildDef The build defintion to update
* @return the build definition added
* @throws Exception
*/
@@ -474,9 +474,9 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroupId The project group id
- * @param buildDef The build defintion to update
+ * @param buildDef The build defintion to update
* @return the added build definition as RPC value
* @throws Exception
*/
@@ -485,7 +485,7 @@ public interface ContinuumService
/**
* Get the build definition templates list.
- *
+ *
* @return The build definitions templates list
* @throws Exception
*/
@@ -494,19 +494,20 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @return The build definitions templates list as RPC value
* @throws Exception
*/
List<Object> getBuildDefinitionTemplatesRPC()
throws Exception;
+
// ----------------------------------------------------------------------
// Building
// ----------------------------------------------------------------------
/**
* Add the project to the build queue.
- *
+ *
* @param projectId The project id
* @throws Exception
*/
@@ -515,8 +516,8 @@ public interface ContinuumService
/**
* Add the project to the build queue.
- *
- * @param projectId The project id
+ *
+ * @param projectId The project id
* @param buildDefinitionId The build definition id
* @throws Exception
*/
@@ -525,7 +526,7 @@ public interface ContinuumService
/**
* Build the project
- *
+ *
* @param projectId The project id
* @throws Exception
*/
@@ -534,8 +535,8 @@ public interface ContinuumService
/**
* Build the project
- *
- * @param projectId The project id
+ *
+ * @param projectId The project id
* @param buildDefinitionId The build definition id
* @throws Exception
*/
@@ -545,8 +546,8 @@ public interface ContinuumService
/**
* Forced build the project
*
- * @param projectId The project id
- * @param buildTrigger The build trigger
+ * @param projectId The project id
+ * @param buildTrigger The build trigger
* @return
* @throws Exception
*/
@@ -555,7 +556,7 @@ public interface ContinuumService
/**
* Build the project group with the default build definition.
- *
+ *
* @param projectGroupId The project group id
* @throws Exception
*/
@@ -564,8 +565,8 @@ public interface ContinuumService
/**
* Build the project group with the specified build definition.
- *
- * @param projectGroupId The project group id
+ *
+ * @param projectGroupId The project group id
* @param buildDefinitionId The build definition id
* @throws Exception
*/
@@ -578,7 +579,7 @@ public interface ContinuumService
/**
* Returns the latest build result for the project.
- *
+ *
* @param projectId The project id
* @return The build result
* @throws Exception
@@ -588,7 +589,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectId The project id
* @return The build result as RPC value
* @throws Exception
@@ -598,9 +599,9 @@ public interface ContinuumService
/**
* Returns the build result.
- *
+ *
* @param projectId The project id
- * @param buildId The build id
+ * @param buildId The build id
* @return The build result
* @throws Exception
*/
@@ -609,9 +610,9 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectId The project id
- * @param buildId The build id
+ * @param buildId The build id
* @return The build result as RPC value
* @throws Exception
*/
@@ -620,7 +621,7 @@ public interface ContinuumService
/**
* Returns the project build result summary list.
- *
+ *
* @param projectId The project id
* @return The build result list
* @throws Exception
@@ -630,7 +631,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectId The project id
* @return The build result list as RPC value
* @throws Exception
@@ -640,7 +641,7 @@ public interface ContinuumService
/**
* Remove the project build result.
- *
+ *
* @param br The project build result
* @return 0
* @throws Exception
@@ -650,7 +651,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param br The project build result
* @return 0
* @throws Exception
@@ -660,9 +661,9 @@ public interface ContinuumService
/**
* Returns the build output.
- *
+ *
* @param projectId The project id
- * @param buildId The build id
+ * @param buildId The build id
* @return The build output
* @throws Exception
*/
@@ -675,7 +676,7 @@ public interface ContinuumService
/**
* Add a maven 2.x project from an url.
- *
+ *
* @param url The POM url
* @return The result of the action with the list of projects created
* @throws Exception
@@ -685,7 +686,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param url The POM url
* @return The result of the action with the list of projects created as RPC value
* @throws Exception
@@ -695,8 +696,8 @@ public interface ContinuumService
/**
* Add a maven 2.x project from an url.
- *
- * @param url The POM url
+ *
+ * @param url The POM url
* @param projectGroupId The id of the group where projects will be stored
* @return The result of the action with the list of projects created
* @throws Exception
@@ -706,8 +707,8 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
- * @param url The POM url
+ *
+ * @param url The POM url
* @param projectGroupId The id of the group where projects will be stored
* @return The result of the action with the list of projects created as RPC value
* @throws Exception
@@ -717,9 +718,9 @@ public interface ContinuumService
/**
* 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 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
@@ -729,9 +730,9 @@ public interface ContinuumService
/**
* 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 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
@@ -740,13 +741,11 @@ public interface ContinuumService
throws Exception;
/**
- * Add a maven 2.x multi-module project from a url and add it to Continuum as a single project instead of
- * as multiple projects (one project per module).
- *
- * To add a multi-module project with its modules as separate Continuum projects,
- * use ContinuumService#addMavenTwoProject( String url, int projectGroupId, boolean checkoutInSingleDirectory)
- * instead.
- *
+ * Add a maven 2.x multi-module project from a url and add it to Continuum as a single project instead of as
+ * multiple projects (one project per module). To add a multi-module project with its modules as separate Continuum
+ * projects, use ContinuumService#addMavenTwoProject( String url, int projectGroupId, boolean
+ * checkoutInSingleDirectory) instead.
+ *
* @param url
* @param projectGroupId
* @return
@@ -763,7 +762,7 @@ public interface ContinuumService
* @return
* @throws Exception
*/
- Map<String,Object> addMavenTwoProjectAsSingleProjectRPC( String url, int projectGroupId )
+ Map<String, Object> addMavenTwoProjectAsSingleProjectRPC( String url, int projectGroupId )
throws Exception;
// ----------------------------------------------------------------------
@@ -772,8 +771,8 @@ public interface ContinuumService
/**
* Add a maven 1.x project from an url.
- *
- * @param url The POM url
+ *
+ * @param url The POM url
* @param projectGroupId The id of the group where projects will be stored
* @return The result of the action with the list of projects created
* @throws Exception
@@ -783,8 +782,8 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
- * @param url The POM url
+ *
+ * @param url The POM url
* @param projectGroupId The id of the group where projects will be stored
* @return The result of the action with the list of projects created as RPC value
* @throws Exception
@@ -798,8 +797,8 @@ public interface ContinuumService
/**
* Add an ANT project in the specified group.
- *
- * @param project The project to add. name, version and scm informations are required
+ *
+ * @param project The project to add. name, version and scm informations are required
* @param projectGroupId The id of the group where projects will be stored
* @return The project populated with the id.
* @throws Exception
@@ -809,8 +808,8 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
- * @param project The project to add. name, version and scm informations are required
+ *
+ * @param project The project to add. name, version and scm informations are required
* @param projectGroupId The id of the group where projects will be stored
* @return The project populated with the id as RPC value
* @throws Exception
@@ -824,8 +823,8 @@ public interface ContinuumService
/**
* Add an shell project in the specified group.
- *
- * @param project The project to add. name, version and scm informations are required
+ *
+ * @param project The project to add. name, version and scm informations are required
* @param projectGroupId The id of the group where projects will be stored
* @return The project populated with the id.
* @throws Exception
@@ -835,8 +834,8 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
- * @param project The project to add. name, version and scm informations are required
+ *
+ * @param project The project to add. name, version and scm informations are required
* @param projectGroupId The id of the group where projects will be stored
* @return The project populated with the id as RPC value
* @throws Exception
@@ -854,7 +853,7 @@ public interface ContinuumService
/**
* Return the schedules list.
- *
+ *
* @return The schedule list.
* @throws Exception
*/
@@ -863,7 +862,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @return The schedule list as RPC value.
* @throws Exception
*/
@@ -872,7 +871,7 @@ public interface ContinuumService
/**
* Return the schedule defined by this id.
- *
+ *
* @param scheduleId The schedule id
* @return The schedule.
* @throws Exception
@@ -882,7 +881,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param scheduleId The schedule id
* @return The schedule as RPC value.
* @throws Exception
@@ -892,7 +891,7 @@ public interface ContinuumService
/**
* Add the schedule.
- *
+ *
* @param schedule The schedule
* @return The schedule.
* @throws Exception
@@ -902,7 +901,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param schedule The schedule
* @return The schedule as RPC value.
* @throws Exception
@@ -912,7 +911,7 @@ public interface ContinuumService
/**
* Update the schedule.
- *
+ *
* @param schedule The schedule
* @return The schedule.
* @throws Exception
@@ -922,7 +921,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param schedule The schedule
* @return The schedule as RPC value.
* @throws Exception
@@ -936,7 +935,7 @@ public interface ContinuumService
/**
* Return the profiles list.
- *
+ *
* @return The profiles list.
* @throws Exception
*/
@@ -945,7 +944,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @return The profiles list as RPC value.
* @throws Exception
*/
@@ -954,7 +953,7 @@ public interface ContinuumService
/**
* Return the profile defined by this id.
- *
+ *
* @param profileId The profile id
* @return The profile.
* @throws Exception
@@ -964,7 +963,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param profileId The profile id
* @return The profile.
* @throws Exception
@@ -993,7 +992,7 @@ public interface ContinuumService
/**
* Return the installations list.
- *
+ *
* @return The installations list.
* @throws Exception
*/
@@ -1002,7 +1001,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @return The installations list.
* @throws Exception
*/
@@ -1011,7 +1010,7 @@ public interface ContinuumService
/**
* Return the installation defined by this id.
- *
+ *
* @param installationId The installation id
* @return The installation.
* @throws Exception
@@ -1021,7 +1020,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param installationId The installation id
* @return The installation.
* @throws Exception
@@ -1058,19 +1057,18 @@ public interface ContinuumService
// Queue
// ----------------------------------------------------------------------
-
/**
* Return true if the project is in prepare build queue
*
- * @param projectId The project id
- * @throws ContinuumException
+ * @param projectId The project id
+ * @throws ContinuumException
*/
boolean isProjectInPrepareBuildQueue( int projectId )
throws Exception;
/**
* Return true if the project is in building queue.
- *
+ *
* @param projectId The project id
* @throws ContinuumException
*/
@@ -1089,6 +1087,7 @@ public interface ContinuumService
/**
* Return true if the project is currently building
+ *
* @param projectId
* @return
* @throws Exception
@@ -1098,7 +1097,7 @@ public interface ContinuumService
/**
* Return projects building queue.
- *
+ *
* @throws ContinuumException
*/
public List<BuildProjectTask> getProjectsInBuildQueue()
@@ -1106,7 +1105,7 @@ public interface ContinuumService
/**
* Remove projects from build queue
- *
+ *
* @param projectsId project id to be removed from the building queue
* @return
* @throws Exception
@@ -1116,7 +1115,7 @@ public interface ContinuumService
/**
* Cancel the current project build
- *
+ *
* @return
* @throws Exception
*/
@@ -1140,7 +1139,7 @@ public interface ContinuumService
/**
* Add a local repository
- *
+ *
* @param repository the local repository to add
* @return
* @throws Exception
@@ -1150,7 +1149,7 @@ public interface ContinuumService
/**
* Same method but compatible with the standard XMLRPC
- *
+ *
* @param repository the local repository to add
* @return
* @throws Exception
@@ -1160,7 +1159,7 @@ public interface ContinuumService
/**
* Update the local repository
- *
+ *
* @param repository the local repository to update
* @return
* @throws Exception
@@ -1170,7 +1169,7 @@ public interface ContinuumService
/**
* Same method but compatible with the standard XMLRPC
- *
+ *
* @param repository the local repository to update
* @return
* @throws Exception
@@ -1180,7 +1179,7 @@ public interface ContinuumService
/**
* Remove the local repository
- *
+ *
* @param repositoryId
* @return
* @throws Exception
@@ -1190,7 +1189,7 @@ public interface ContinuumService
/**
* Returns the local repository
- *
+ *
* @param repositoryId the local repository id
* @return
* @throws Exception
@@ -1200,7 +1199,7 @@ public interface ContinuumService
/**
* Same method but compatible with the standard XMLRPC
- *
+ *
* @param repositoryId
* @return
* @throws Exception
@@ -1210,7 +1209,7 @@ public interface ContinuumService
/**
* Returns all local repositories
- *
+ *
* @return
* @throws Exception
*/
@@ -1219,7 +1218,7 @@ public interface ContinuumService
/**
* Same method but compatible with the standard XMLRPC
- *
+ *
* @return
* @throws Exception
*/
@@ -1232,7 +1231,7 @@ public interface ContinuumService
/**
* Add a repository purge configuration
- *
+ *
* @param repoPurge the repository purge configuration
* @return
* @throws Exception
@@ -1242,7 +1241,7 @@ public interface ContinuumService
/**
* Same method but compatible with the standard XMLRPC
- *
+ *
* @param repoPurge the repository purge configuration
* @return
* @throws Exception
@@ -1252,7 +1251,7 @@ public interface ContinuumService
/**
* Update the repository purge configuration
- *
+ *
* @param repoPurge the repository purge configuration
* @return
* @throws Exception
@@ -1262,7 +1261,7 @@ public interface ContinuumService
/**
* Same method but compatible with the standard XMLRPC
- *
+ *
* @param repoPurge the repository purge configuration
* @return
* @throws Exception
@@ -1272,7 +1271,7 @@ public interface ContinuumService
/**
* Remove repository purge configuration
- *
+ *
* @param repoPurgeId the repository purge configuration id
* @return
* @throws Exception
@@ -1282,7 +1281,7 @@ public interface ContinuumService
/**
* Returns the repository purge configuration
- *
+ *
* @param purgeConfigId the repository purge configuration id
* @return the repository purge configuration
* @throws Exception
@@ -1292,7 +1291,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param purgeConfigId the repository purge configuration id
* @return the repository purge configuration
* @throws Exception
@@ -1302,7 +1301,7 @@ public interface ContinuumService
/**
* Returns repository purge configurations list
- *
+ *
* @return list of repository purge configurations
* @throws Exception
*/
@@ -1311,7 +1310,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @return list of repository purge configurations
* @throws Exception
*/
@@ -1320,7 +1319,7 @@ public interface ContinuumService
/**
* Add a directory purge configuration
- *
+ *
* @param dirPurge the directory purge configuration
* @return
* @throws Exception
@@ -1330,7 +1329,7 @@ public interface ContinuumService
/**
* Same method but compatible with the standard XMLRPC
- *
+ *
* @param dirPurge the directory purge configuration
* @return
* @throws Exception
@@ -1340,7 +1339,7 @@ public interface ContinuumService
/**
* Update the directory purge configuration
- *
+ *
* @param dirPurge the directory purge configuration
* @return
* @throws Exception
@@ -1350,7 +1349,7 @@ public interface ContinuumService
/**
* Same method but compatible with the standard XMLRPC
- *
+ *
* @param dirPurge the directory purge configuration
* @return
* @throws Exception
@@ -1360,7 +1359,7 @@ public interface ContinuumService
/**
* Removes the directory purge configuration
- *
+ *
* @param dirPurgeId the directory purge configuration id
* @return
* @throws Exception
@@ -1370,7 +1369,7 @@ public interface ContinuumService
/**
* Returns the directory purge configuration
- *
+ *
* @param purgeConfigId the directory purge configuration id
* @return the directory purge configuration
* @throws Exception
@@ -1380,7 +1379,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param purgeConfigId the directory purge configuration id
* @return the directory purge configuration
* @throws Exception
@@ -1390,7 +1389,7 @@ public interface ContinuumService
/**
* Returns directory purge configurations list
- *
+ *
* @return list of directory purge configurations
* @throws Exception
*/
@@ -1399,7 +1398,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @return list of directory purge configurations
* @throws Exception
*/
@@ -1418,7 +1417,7 @@ public interface ContinuumService
/**
* Returns the release result.
- *
+ *
* @param releaseId The release id
* @return The release result
* @throws Exception
@@ -1428,7 +1427,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param releaseId The release id
* @return The release result as RPC value
* @throws Exception
@@ -1438,7 +1437,7 @@ public interface ContinuumService
/**
* Returns the project group release result list.
- *
+ *
* @param projectGroupId The project group id
* @return The release result list
* @throws Exception
@@ -1448,7 +1447,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param projectGroupId The project group id
* @return The release result list as RPC value
* @throws Exception
@@ -1458,7 +1457,7 @@ public interface ContinuumService
/**
* Remove the project release result.
- *
+ *
* @param releaseResult The project release result
* @return 0
* @throws Exception
@@ -1468,7 +1467,7 @@ public interface ContinuumService
/**
* Same method but compatible with standard XMLRPC
- *
+ *
* @param rr The project release result
* @return 0
* @throws Exception
@@ -1478,7 +1477,7 @@ public interface ContinuumService
/**
* Returns the release output.
- *
+ *
* @param releaseId The release id
* @return The release output
* @throws Exception
@@ -1499,7 +1498,7 @@ public interface ContinuumService
* @throws Exception
*/
String releasePrepare( int projectId, Properties releaseProperties, Map<String, String> releaseVersions,
- Map<String, String> developmentVersions, Map<String, String> environments, String username )
+ Map<String, String> developmentVersions, Map<String, String> environments, String username )
throws Exception;
/**
@@ -1515,8 +1514,8 @@ public interface ContinuumService
* @return
* @throws Exception
*/
- int releasePerform( int projectId, String releaseId, String goals, String arguments, boolean useReleaseProfile,
- String repositoryName, String username )
+ int releasePerform( int projectId, String releaseId, String goals, String arguments, boolean useReleaseProfile,
+ String repositoryName, String username )
throws Exception;
/**
@@ -1572,4 +1571,80 @@ public interface ContinuumService
*/
Map<String, Object> getReleasePluginParameters( int projectId )
throws Exception;
+
+ /**
+ * Add/Register build agent to Continuum Master
+ *
+ * @return
+ * @throws Exception
+ */
+ BuildAgentConfiguration addBuildAgent( BuildAgentConfiguration buildAgentConfiguration )
+ throws Exception;
+
+ /**
+ * Same method but compatible with standard XMLRPC
+ *
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> addBuildAgentRPC( Map<String, Object> buildAgentConfiguration )
+ throws Exception;
+
+ /**
+ * Get build agent in Continuum Master
+ *
+ * @param url - build agent URL
+ * @return
+ */
+ BuildAgentConfiguration getBuildAgent( String url );
+
+ /**
+ * Same method but compatible with standard XMLRPC
+ *
+ * @param url - build agent URL
+ * @return
+ */
+ Map<String, Object> getBuildAgentRPC( String url );
+
+ /**
+ * Update build agent in Continuum Master
+ *
+ * @return
+ * @throws Exception
+ */
+ BuildAgentConfiguration updateBuildAgent( BuildAgentConfiguration buildAgentConfiguration )
+ throws Exception;
+
+ /**
+ * Same method but compatible with standard XMLRPC
+ *
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> updateBuildAgentRPC( Map<String, Object> buildAgentConfiguration )
+ throws Exception;
+
+ /**
+ * remove build agent in Continuum Master
+ *
+ * @param url - build agent URL
+ * @return Exception
+ */
+ boolean removeBuildAgent( String url )
+ throws Exception;
+
+ /**
+ * List all build agent in Continuum Master
+ *
+ * @return
+ */
+ List<BuildAgentConfiguration> getAllBuildAgents();
+
+ /**
+ * Same method but compatible with standard XMLRPC
+ *
+ * @return
+ */
+ List<Object> getAllBuildAgentsRPC();
+
}
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml?rev=1043796&r1=1043795&r2=1043796&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml Thu Dec 9 00:15:22 2010
@@ -1471,5 +1471,27 @@
</field>
</fields>
</class>
+ <class>
+ <name>BuildAgentConfiguration</name>
+ <version>1.4.1+</version>
+ <packageName>org.apache.maven.continuum.xmlrpc.project</packageName>
+ <fields>
+ <field>
+ <name>url</name>
+ <version>1.4.1+</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>description</name>
+ <version>1.4.1+</version>
+ <type>String</type>
+ </field>
+ <field>
+ <name>enabled</name>
+ <version>1.4.1+</version>
+ <type>boolean</type>
+ </field>
+ </fields>
+ </class>
</classes>
</model>
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=1043796&r1=1043795&r2=1043796&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 Thu Dec 9 00:15:22 2010
@@ -32,6 +32,7 @@ import org.apache.continuum.xmlrpc.repos
import org.apache.continuum.xmlrpc.utils.BuildTrigger;
import org.apache.maven.continuum.xmlrpc.ContinuumService;
import org.apache.maven.continuum.xmlrpc.project.AddingResult;
+import org.apache.maven.continuum.xmlrpc.project.BuildAgentConfiguration;
import org.apache.maven.continuum.xmlrpc.project.BuildDefinition;
import org.apache.maven.continuum.xmlrpc.project.BuildDefinitionTemplate;
import org.apache.maven.continuum.xmlrpc.project.BuildProjectTask;
@@ -698,6 +699,41 @@ public class ContinuumXmlRpcClient
return continuum.getAllLocalRepositories();
}
+ // ----------------------------------------------------------------------
+ // ConfigurationService
+ // ----------------------------------------------------------------------
+
+ public BuildAgentConfiguration addBuildAgent( BuildAgentConfiguration buildAgentConfiguration )
+ throws Exception
+ {
+ return continuum.addBuildAgent( buildAgentConfiguration );
+ }
+
+ public BuildAgentConfiguration getBuildAgent( String url )
+
+ {
+ return continuum.getBuildAgent( url );
+ }
+
+ public BuildAgentConfiguration updateBuildAgent( BuildAgentConfiguration buildAgentConfiguration )
+ throws Exception
+
+ {
+ return continuum.updateBuildAgent( buildAgentConfiguration );
+ }
+
+ public boolean removeBuildAgent( String url )
+ throws Exception
+
+ {
+ return continuum.removeBuildAgent( url );
+ }
+
+ public List<BuildAgentConfiguration> getAllBuildAgents()
+ {
+ return continuum.getAllBuildAgents();
+ }
+
public Map<String, Object> addAntProjectRPC( Map<String, Object> project, int projectGroupId )
throws Exception
{
@@ -740,7 +776,7 @@ public class ContinuumXmlRpcClient
return continuum.addMavenTwoProjectRPC( url, projectGroupId, checkoutInSingleDirectory );
}
- public Map<String,Object> addMavenTwoProjectAsSingleProjectRPC( String url, int projectGroupId )
+ public Map<String, Object> addMavenTwoProjectAsSingleProjectRPC( String url, int projectGroupId )
throws Exception
{
return continuum.addMavenTwoProjectAsSingleProjectRPC( url, projectGroupId );
@@ -896,8 +932,7 @@ public class ContinuumXmlRpcClient
return continuum.removeBuildResultRPC( br );
}
- public Map<String, Object> updateBuildDefinitionForProjectGroupRPC( int projectGroupId,
- Map<String, Object> buildDef )
+ public Map<String, Object> updateBuildDefinitionForProjectGroupRPC( int projectGroupId, Map<String, Object> buildDef )
throws Exception
{
return continuum.updateBuildDefinitionForProjectGroupRPC( projectGroupId, buildDef );
@@ -1167,19 +1202,45 @@ public class ContinuumXmlRpcClient
return continuum.getAllLocalRepositoriesRPC();
}
+ public Map<String, Object> addBuildAgentRPC( Map<String, Object> buildAgentConfiguration )
+ throws Exception
+ {
+ return continuum.addBuildAgentRPC( buildAgentConfiguration );
+ }
+
+ public Map<String, Object> getBuildAgentRPC( String url )
+
+ {
+ return continuum.getBuildAgentRPC( url );
+ }
+
+ public Map<String, Object> updateBuildAgentRPC( Map<String, Object> buildAgentConfiguration )
+ throws Exception
+
+ {
+ return continuum.updateBuildAgentRPC( buildAgentConfiguration );
+ }
+
+ public List<Object> getAllBuildAgentsRPC()
+ {
+ return continuum.getAllBuildAgentsRPC();
+ }
+
public int releasePerform( int projectId, String releaseId, String goals, String arguments,
- boolean useReleaseProfile, String repositoryName, String username )
+ boolean useReleaseProfile, String repositoryName, String username )
throws Exception
{
- return continuum.releasePerform( projectId, releaseId, goals, arguments, useReleaseProfile, repositoryName, username );
+ return continuum.releasePerform( projectId, releaseId, goals, arguments, useReleaseProfile, repositoryName,
+ username );
}
public String releasePrepare( int projectId, Properties releaseProperties, Map<String, String> releaseVersions,
- Map<String, String> developmentVersions, Map<String, String> environments,
- String username )
+ Map<String, String> developmentVersions, Map<String, String> environments,
+ String username )
throws Exception
{
- return continuum.releasePrepare( projectId, releaseProperties, releaseVersions, developmentVersions, environments, username );
+ return continuum.releasePrepare( projectId, releaseProperties, releaseVersions, developmentVersions,
+ environments, username );
}
public ReleaseListenerSummary getListener( int projectId, String releaseId )
@@ -1211,4 +1272,5 @@ public class ContinuumXmlRpcClient
{
return continuum.getReleasePluginParameters( projectId );
}
+
}