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=1372260&r1=1372259&r2=1372260&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 Mon Aug 13 04:29:09 2012 @@ -19,10 +19,6 @@ package org.apache.maven.continuum.xmlrp * under the License. */ -import java.util.List; -import java.util.Map; -import java.util.Properties; - import org.apache.continuum.xmlrpc.release.ContinuumReleaseResult; import org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration; import org.apache.continuum.xmlrpc.repository.LocalRepository; @@ -48,6 +44,10 @@ import org.apache.maven.continuum.xmlrpc import org.apache.maven.continuum.xmlrpc.system.Profile; import org.apache.maven.continuum.xmlrpc.system.SystemConfiguration; +import java.util.List; +import java.util.Map; +import java.util.Properties; + /** * @author Emmanuel Venisse * @version $Id$ @@ -60,7 +60,7 @@ public interface ContinuumService /** * Get All projects. - * + * * @param projectGroupId The project group Id * @return List of {@link ProjectSummary} * @throws Exception @@ -70,7 +70,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param projectGroupId The project group Id * @return List of {@link ProjectSummary} as RPC value * @throws Exception @@ -80,7 +80,7 @@ public interface ContinuumService /** * Get a project. - * + * * @param projectId the project id * @return The project summary * @throws Exception @@ -90,7 +90,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 @@ -100,7 +100,7 @@ public interface ContinuumService /** * Get a project with all details. - * + * * @param projectId The project id * @return The project * @throws Exception @@ -110,7 +110,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param projectId the project id * @return The project as RPC value * @throws Exception @@ -120,7 +120,7 @@ public interface ContinuumService /** * Remove a project. - * + * * @param projectId The project id * @throws Exception */ @@ -129,7 +129,7 @@ public interface ContinuumService /** * Update a project. Useful to change the scm parameters. - * + * * @param project The project to update * @throws Exception */ @@ -138,7 +138,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param project The project to update * @return The project as RPC value * @throws Exception @@ -152,7 +152,7 @@ public interface ContinuumService /** * Get a project groups. - * + * * @param projectGroupId the id * @return project group * @throws Exception @@ -162,7 +162,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param projectGroupId the id * @return project group as RPC value * @throws Exception @@ -172,7 +172,7 @@ public interface ContinuumService /** * Get all project groups. - * + * * @return All project groups * @throws Exception */ @@ -181,7 +181,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return List of {@link ProjectGroupSummary} as RPC value * @throws Exception */ @@ -190,7 +190,7 @@ public interface ContinuumService /** * Get all project groups with all details (project summaries, notifiers, build definitions). - * + * * @return All project groups * @throws Exception */ @@ -199,7 +199,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return List of {@link ProjectGroup} as RPC value * @throws Exception */ @@ -208,7 +208,7 @@ public interface ContinuumService /** * Get all project groups with all details. - * + * * @return All project groups * @throws Exception * @deprecated @@ -218,7 +218,7 @@ public interface ContinuumService /** * Get a project group. - * + * * @param projectGroupId The project group id * @return The project group summary * @throws Exception @@ -228,7 +228,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 @@ -238,7 +238,7 @@ public interface ContinuumService /** * Get a project group with all details. - * + * * @param projectGroupId The project group id * @return The project group * @throws Exception @@ -248,7 +248,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 @@ -258,7 +258,7 @@ public interface ContinuumService /** * Remove a project group. - * + * * @param projectGroupId The project group id * @throws Exception */ @@ -267,7 +267,7 @@ public interface ContinuumService /** * Update a project Group. - * + * * @param projectGroup The project group to update * @throws Exception */ @@ -276,7 +276,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 @@ -286,9 +286,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 @@ -301,9 +301,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 @@ -359,7 +359,7 @@ public interface ContinuumService /** * Get the build definitions list of the project. - * + * * @param projectId The project id * @return The build definitions list * @throws Exception @@ -369,7 +369,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 @@ -379,7 +379,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 @@ -389,7 +389,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 @@ -399,6 +399,7 @@ public interface ContinuumService /** * Get the build definition + * * @param buildDefinitionId The build definition id * @return The build definition * @throws Exception @@ -408,6 +409,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC + * * @param buildDefinitionId The build definition id * @return The build definition as RPC value * @throws Exception @@ -417,9 +419,9 @@ public interface ContinuumService /** * Update a project build definition. - * + * * @param projectId The project id - * @param buildDef The build definition to update + * @param buildDef The build definition to update * @return the updated build definition * @throws Exception */ @@ -428,9 +430,9 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param projectId The project id - * @param buildDef The build definition to update + * @param buildDef The build definition to update * @return the updated build definition as RPC value * @throws Exception */ @@ -439,9 +441,9 @@ public interface ContinuumService /** * Update a project group build definition. - * + * * @param projectGroupId The project group id - * @param buildDef The build definition to update + * @param buildDef The build definition to update * @return the updated build definition * @throws Exception */ @@ -450,9 +452,9 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param projectGroupId The project group id - * @param buildDef The build definition to update + * @param buildDef The build definition to update * @return the updated build definition as RPC value * @throws Exception */ @@ -461,9 +463,9 @@ public interface ContinuumService /** * Add a project build definition. - * + * * @param projectId The project id - * @param buildDef The build definition to update + * @param buildDef The build definition to update * @return the added build definition * @throws Exception */ @@ -472,9 +474,9 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param projectId The project id - * @param buildDef The build definition to update + * @param buildDef The build definition to update * @return the added build definition as RPC value * @throws Exception */ @@ -483,9 +485,9 @@ public interface ContinuumService /** * Add a project group buildDefinition. - * + * * @param projectGroupId The project group id - * @param buildDef The build definition to update + * @param buildDef The build definition to update * @return the build definition added * @throws Exception */ @@ -494,9 +496,9 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param projectGroupId The project group id - * @param buildDef The build definition to update + * @param buildDef The build definition to update * @return the added build definition as RPC value * @throws Exception */ @@ -505,7 +507,7 @@ public interface ContinuumService /** * Get the build definition templates list. - * + * * @return The build definitions templates list * @throws Exception */ @@ -514,7 +516,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return The build definitions templates list as RPC value * @throws Exception */ @@ -527,7 +529,7 @@ public interface ContinuumService /** * Add the project to the build queue. - * + * * @param projectId The project id * @throws Exception */ @@ -536,8 +538,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 */ @@ -546,7 +548,7 @@ public interface ContinuumService /** * Build the project - * + * * @param projectId The project id * @throws Exception */ @@ -555,8 +557,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 */ @@ -565,21 +567,21 @@ public interface ContinuumService /** * Forced build the project - * - * @param projectId The project id + * + * @param projectId The project id * @param buildTrigger The build trigger * @return * @throws Exception */ int buildProject( int projectId, BuildTrigger buildTrigger ) throws Exception; - + /** * Forced build the project - * - * @param projectId The project id + * + * @param projectId The project id * @param buildDefinitionId The build definition id - * @param buildTrigger The build trigger + * @param buildTrigger The build trigger * @return * @throws Exception */ @@ -588,7 +590,7 @@ public interface ContinuumService /** * Build the project group with the default build definition. - * + * * @param projectGroupId The project group id * @throws Exception */ @@ -597,8 +599,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 */ @@ -611,7 +613,7 @@ public interface ContinuumService /** * Get the SCM roots for all projects in a project group - * + * * @param projectGroupId the project group id * @return * @throws Exception @@ -621,7 +623,7 @@ public interface ContinuumService /** * Get the SCM root for a specific project - * + * * @param projectId the project id * @return * @throws Exception @@ -635,7 +637,7 @@ public interface ContinuumService /** * Returns the latest build result for the project. - * + * * @param projectId The project id * @return The build result * @throws Exception @@ -645,7 +647,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 @@ -655,9 +657,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 */ @@ -666,9 +668,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 */ @@ -677,7 +679,7 @@ public interface ContinuumService /** * Returns the project build result summary list. - * + * * @param projectId The project id * @return The build result list * @throws Exception @@ -687,7 +689,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 @@ -697,7 +699,7 @@ public interface ContinuumService /** * Remove the project build result. - * + * * @param br The project build result * @return 0 * @throws Exception @@ -707,7 +709,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param br The project build result * @return 0 * @throws Exception @@ -717,9 +719,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 */ @@ -732,7 +734,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 @@ -742,7 +744,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 @@ -752,8 +754,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 @@ -763,8 +765,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 @@ -774,24 +776,24 @@ 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 - * @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 + * @Param checkoutInSingleDirectory Determines whether the project will be stored on a single directory */ AddingResult addMavenTwoProject( String url, int projectGroupId, boolean checkoutInSingleDirectory ) throws Exception; /** * 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 - * @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 + * @Param checkoutInSingleDirectory Determines whether the project will be stored on a single directory */ Map addMavenTwoProjectRPC( String url, int projectGroupId, boolean checkoutInSingleDirectory ) throws Exception; @@ -801,7 +803,7 @@ public interface ContinuumService * 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 @@ -812,40 +814,39 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param url * @param projectGroupId - * @return + * @return * @throws Exception */ Map addMavenTwoProjectAsSingleProjectRPC( String url, int projectGroupId ) throws Exception; - + /** * Add a maven 2.x multi-module project from a url - * - * @param url The POM url - * @param projectGroupId The id of the group where projects will be stored - * @param checkProtocol Determines whether the protocol will be checked - * @param useCredentialsCache Determines whether user credentials will be cached - * @param recursiveProjects Determines whether to load recursive projects + * + * @param url The POM url + * @param projectGroupId The id of the group where projects will be stored + * @param checkProtocol Determines whether the protocol will be checked + * @param useCredentialsCache Determines whether user credentials will be cached + * @param recursiveProjects Determines whether to load recursive projects * @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 checkProtocol, - boolean useCredentialsCache, boolean recursiveProjects, - boolean checkoutInSingleDirectory ) + AddingResult addMavenTwoProject( String url, int projectGroupId, boolean checkProtocol, boolean useCredentialsCache, + boolean recursiveProjects, 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 checkProtocol Determines whether the protocol will be checked - * @param useCredentialsCache Determines whether user credentials will be cached - * @param recursiveProjects Determines whether to load recursive projects + * + * @param url The POM url + * @param projectGroupId The id of the group where projects will be stored + * @param checkProtocol Determines whether the protocol will be checked + * @param useCredentialsCache Determines whether user credentials will be cached + * @param recursiveProjects Determines whether to load recursive projects * @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 @@ -854,16 +855,15 @@ public interface ContinuumService boolean useCredentialsCache, boolean recursiveProjects, boolean checkoutInSingleDirectory ) throws Exception; - - + // ---------------------------------------------------------------------- // Maven 1.x projects // ---------------------------------------------------------------------- /** * 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 @@ -873,8 +873,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 @@ -888,8 +888,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 @@ -899,8 +899,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 @@ -914,8 +914,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 @@ -925,8 +925,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 @@ -944,7 +944,7 @@ public interface ContinuumService /** * Return the schedules list. - * + * * @return The schedule list. * @throws Exception */ @@ -953,7 +953,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return The schedule list as RPC value. * @throws Exception */ @@ -962,7 +962,7 @@ public interface ContinuumService /** * Return the schedule defined by this id. - * + * * @param scheduleId The schedule id * @return The schedule. * @throws Exception @@ -972,7 +972,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param scheduleId The schedule id * @return The schedule as RPC value. * @throws Exception @@ -982,7 +982,7 @@ public interface ContinuumService /** * Add the schedule. - * + * * @param schedule The schedule * @return The schedule. * @throws Exception @@ -992,7 +992,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param schedule The schedule * @return The schedule as RPC value. * @throws Exception @@ -1002,7 +1002,7 @@ public interface ContinuumService /** * Update the schedule. - * + * * @param schedule The schedule * @return The schedule. * @throws Exception @@ -1012,7 +1012,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param schedule The schedule * @return The schedule as RPC value. * @throws Exception @@ -1026,7 +1026,7 @@ public interface ContinuumService /** * Return the profiles list. - * + * * @return The profiles list. * @throws Exception */ @@ -1035,7 +1035,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return The profiles list as RPC value. * @throws Exception */ @@ -1044,7 +1044,7 @@ public interface ContinuumService /** * Return the profile defined by this id. - * + * * @param profileId The profile id * @return The profile. * @throws Exception @@ -1054,7 +1054,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param profileId The profile id * @return The profile. * @throws Exception @@ -1089,7 +1089,7 @@ public interface ContinuumService /** * Return the installations list. - * + * * @return The installations list. * @throws Exception */ @@ -1098,7 +1098,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return The installations list. * @throws Exception */ @@ -1107,7 +1107,7 @@ public interface ContinuumService /** * Return the installation defined by this id. - * + * * @param installationId The installation id * @return The installation. * @throws Exception @@ -1117,7 +1117,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param installationId The installation id * @return The installation. * @throws Exception @@ -1127,7 +1127,7 @@ public interface ContinuumService /** * Return the installation defined by this name - * + * * @param installationName The installation name * @return The installation * @throws Exception @@ -1137,7 +1137,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param installationName The installation name * @return The installation * @throws Exception @@ -1147,7 +1147,7 @@ public interface ContinuumService /** * Return the installations list defined by this URL. - * + * * @param url The build agent URL * @return The installations list. * @throws Exception @@ -1157,12 +1157,12 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param url The build agent URL * @return The installations list. * @throws Exception */ - List getBuildAgentInstallationsRPC(String url) + List getBuildAgentInstallationsRPC( String url ) throws Exception; Installation addInstallation( Installation installation ) @@ -1196,7 +1196,7 @@ public interface ContinuumService /** * Return true if the project is in prepare build queue - * + * * @param projectId The project id * @throws ContinuumException */ @@ -1205,8 +1205,8 @@ public interface ContinuumService /** * Return true if the project is in prepare build queue - * - * @param projectId The project id + * + * @param projectId The project id * @param buildDefinitionId The build definition id * @throws ContinuumException */ @@ -1215,7 +1215,7 @@ public interface ContinuumService /** * Return true if the project is in building queue. - * + * * @param projectId The project id * @throws ContinuumException */ @@ -1224,8 +1224,8 @@ public interface ContinuumService /** * Return true if the project is in building queue. - * - * @param projectId The project id + * + * @param projectId The project id * @param buildDefinitionId The build definition id * @throws ContinuumException */ @@ -1234,7 +1234,7 @@ public interface ContinuumService /** * Return true if the project is currently preparing build - * + * * @param projectId The project id * @return * @throws Exception @@ -1244,8 +1244,8 @@ public interface ContinuumService /** * Return true if the project is currently preparing build - * - * @param projectId The project id + * + * @param projectId The project id * @param buildDefinitionId The build definition id * @return * @throws Exception @@ -1255,7 +1255,7 @@ public interface ContinuumService /** * Return true if the project is currently building - * + * * @param projectId The project id * @return * @throws Exception @@ -1265,8 +1265,8 @@ public interface ContinuumService /** * Return true if the project is currently building - * - * @param projectId The project id + * + * @param projectId The project id * @param buildDefinitionId The build definition id * @return * @throws Exception @@ -1276,7 +1276,7 @@ public interface ContinuumService /** * Return projects building queue. - * + * * @throws ContinuumException */ public List getProjectsInBuildQueue() @@ -1284,7 +1284,7 @@ public interface ContinuumService /** * Remove projects from build queue - * + * * @param projectsId project id to be removed from the building queue * @return * @throws Exception @@ -1294,7 +1294,7 @@ public interface ContinuumService /** * Cancel the current project build - * + * * @return * @throws Exception */ @@ -1303,8 +1303,8 @@ public interface ContinuumService /** * Cancel a project build - * - * @param projectId the project id + * + * @param projectId the project id * @param buildDefinitionId the build definition id * @return * @throws Exception @@ -1329,7 +1329,7 @@ public interface ContinuumService /** * Add a local repository - * + * * @param repository the local repository to add * @return * @throws Exception @@ -1339,7 +1339,7 @@ public interface ContinuumService /** * Same method but compatible with the standard XMLRPC - * + * * @param repository the local repository to add * @return * @throws Exception @@ -1349,7 +1349,7 @@ public interface ContinuumService /** * Update the local repository - * + * * @param repository the local repository to update * @return * @throws Exception @@ -1359,7 +1359,7 @@ public interface ContinuumService /** * Same method but compatible with the standard XMLRPC - * + * * @param repository the local repository to update * @return * @throws Exception @@ -1369,7 +1369,7 @@ public interface ContinuumService /** * Remove the local repository - * + * * @param repositoryId * @return * @throws Exception @@ -1379,7 +1379,7 @@ public interface ContinuumService /** * Returns the local repository - * + * * @param repositoryId the local repository id * @return * @throws Exception @@ -1389,7 +1389,7 @@ public interface ContinuumService /** * Same method but compatible with the standard XMLRPC - * + * * @param repositoryId * @return * @throws Exception @@ -1399,7 +1399,7 @@ public interface ContinuumService /** * Returns all local repositories - * + * * @return * @throws Exception */ @@ -1408,7 +1408,7 @@ public interface ContinuumService /** * Same method but compatible with the standard XMLRPC - * + * * @return * @throws Exception */ @@ -1421,7 +1421,7 @@ public interface ContinuumService /** * Add a repository purge configuration - * + * * @param repoPurge the repository purge configuration * @return * @throws Exception @@ -1431,7 +1431,7 @@ public interface ContinuumService /** * Same method but compatible with the standard XMLRPC - * + * * @param repoPurge the repository purge configuration * @return * @throws Exception @@ -1441,7 +1441,7 @@ public interface ContinuumService /** * Update the repository purge configuration - * + * * @param repoPurge the repository purge configuration * @return * @throws Exception @@ -1451,7 +1451,7 @@ public interface ContinuumService /** * Same method but compatible with the standard XMLRPC - * + * * @param repoPurge the repository purge configuration * @return * @throws Exception @@ -1461,7 +1461,7 @@ public interface ContinuumService /** * Remove repository purge configuration - * + * * @param repoPurgeId the repository purge configuration id * @return * @throws Exception @@ -1471,7 +1471,7 @@ public interface ContinuumService /** * Returns the repository purge configuration - * + * * @param purgeConfigId the repository purge configuration id * @return the repository purge configuration * @throws Exception @@ -1481,7 +1481,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 @@ -1491,7 +1491,7 @@ public interface ContinuumService /** * Returns repository purge configurations list - * + * * @return list of repository purge configurations * @throws Exception */ @@ -1500,7 +1500,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return list of repository purge configurations * @throws Exception */ @@ -1509,7 +1509,7 @@ public interface ContinuumService /** * Add a directory purge configuration - * + * * @param dirPurge the directory purge configuration * @return * @throws Exception @@ -1519,7 +1519,7 @@ public interface ContinuumService /** * Same method but compatible with the standard XMLRPC - * + * * @param dirPurge the directory purge configuration * @return * @throws Exception @@ -1529,7 +1529,7 @@ public interface ContinuumService /** * Update the directory purge configuration - * + * * @param dirPurge the directory purge configuration * @return * @throws Exception @@ -1539,7 +1539,7 @@ public interface ContinuumService /** * Same method but compatible with the standard XMLRPC - * + * * @param dirPurge the directory purge configuration * @return * @throws Exception @@ -1549,7 +1549,7 @@ public interface ContinuumService /** * Removes the directory purge configuration - * + * * @param dirPurgeId the directory purge configuration id * @return * @throws Exception @@ -1559,7 +1559,7 @@ public interface ContinuumService /** * Returns the directory purge configuration - * + * * @param purgeConfigId the directory purge configuration id * @return the directory purge configuration * @throws Exception @@ -1569,7 +1569,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 @@ -1579,7 +1579,7 @@ public interface ContinuumService /** * Returns directory purge configurations list - * + * * @return list of directory purge configurations * @throws Exception */ @@ -1588,7 +1588,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return list of directory purge configurations * @throws Exception */ @@ -1607,7 +1607,7 @@ public interface ContinuumService /** * Returns the release result. - * + * * @param releaseId The release id * @return The release result * @throws Exception @@ -1617,7 +1617,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 @@ -1627,7 +1627,7 @@ public interface ContinuumService /** * Returns the project group release result list. - * + * * @param projectGroupId The project group id * @return The release result list * @throws Exception @@ -1637,7 +1637,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 @@ -1647,7 +1647,7 @@ public interface ContinuumService /** * Remove the project release result. - * + * * @param releaseResult The project release result * @return 0 * @throws Exception @@ -1657,7 +1657,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @param rr The project release result * @return 0 * @throws Exception @@ -1667,7 +1667,7 @@ public interface ContinuumService /** * Returns the release output. - * + * * @param releaseId The release id * @return The release output * @throws Exception @@ -1677,7 +1677,7 @@ public interface ContinuumService /** * Release prepare a project - * + * * @param projectId * @param releaseProperties * @param releaseVersions @@ -1693,7 +1693,7 @@ public interface ContinuumService /** * Release perform a project - * + * * @param projectId * @param releaseId * @param goals @@ -1710,7 +1710,7 @@ public interface ContinuumService /** * Get release listener - * + * * @param projectId * @param releaseId * @return @@ -1721,7 +1721,7 @@ public interface ContinuumService /** * Cleanup the release - * + * * @param projectId * @param releaseId * @return @@ -1732,7 +1732,7 @@ public interface ContinuumService /** * Cleanup the release - * + * * @param projectId * @param releaseId * @param releaseType @@ -1744,7 +1744,7 @@ public interface ContinuumService /** * Rollback a release - * + * * @param projectId * @param releaseId * @return @@ -1755,19 +1755,20 @@ public interface ContinuumService /** * Get release plugin parameters - * + * * @param projectId * @return */ Map getReleasePluginParameters( int projectId ) throws Exception; - List> getProjectReleaseAndDevelopmentVersions( int projectId, String pomFilename, boolean autoVersionSubmodules ) + List> getProjectReleaseAndDevelopmentVersions( int projectId, String pomFilename, + boolean autoVersionSubmodules ) throws Exception; /** * Add/Register build agent to Continuum Master - * + * * @return * @throws Exception */ @@ -1776,7 +1777,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return * @throws Exception */ @@ -1785,25 +1786,25 @@ public interface ContinuumService /** * Get build agent in Continuum Master - * + * * @param url - build agent URL * @return */ BuildAgentConfiguration getBuildAgent( String url ); - + /** * Get the url of the build agent that is processing the project - * - * @param projectId project Id + * + * @param projectId project Id * @param buildDefinitionId build definition Id - * * @return build agent url */ - String getBuildAgentUrl( int projectId, int buildDefinition ) throws Exception; + String getBuildAgentUrl( int projectId, int buildDefinition ) + throws Exception; /** * Same method but compatible with standard XMLRPC - * + * * @param url - build agent URL * @return */ @@ -1811,7 +1812,7 @@ public interface ContinuumService /** * Update build agent in Continuum Master - * + * * @return * @throws Exception */ @@ -1820,7 +1821,7 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return * @throws Exception */ @@ -1829,7 +1830,7 @@ public interface ContinuumService /** * remove build agent in Continuum Master - * + * * @param url - build agent URL * @return Exception */ @@ -1838,20 +1839,21 @@ public interface ContinuumService /** * List all build agent in Continuum Master - * + * * @return */ List getAllBuildAgents(); /** * Same method but compatible with standard XMLRPC - * + * * @return */ List getAllBuildAgentsRPC(); /** * Retrieve all enabled build agents with their available installations + * * @return * @throws Exception */ @@ -1860,13 +1862,13 @@ public interface ContinuumService /** * Same method but compatible with standard XMLRPC - * + * * @return * @throws Exception */ List getBuildAgentsWithInstallationsRPC() throws Exception; - + boolean pingBuildAgent( String buildAgentUrl ) throws Exception; 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=1372260&r1=1372259&r2=1372260&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 Mon Aug 13 04:29:09 2012 @@ -533,8 +533,8 @@ - 1.1.0+ - 1.1.0+ + type 1.1.0+ String - type of the buid defintion - + type of the buid defintion + schedule 1.1.0+ @@ -859,7 +859,7 @@ true if this buildDefinition is a template - + @@ -892,8 +892,8 @@ type 1.1.0+ String - type of the buid BuildDefinitionTemplate use for default - + type of the buid BuildDefinitionTemplate use for default + buildDefinitions 1.1.0+ @@ -1021,7 +1021,7 @@ buildAgentGroup 1.4.1+ String - + @@ -1044,7 +1044,7 @@ varName 1.1.0+ String - + name 1.1.0+ @@ -1126,8 +1126,8 @@ - 1.1.0+ - 1.1.0+ + String - + LocalRepository @@ -1243,7 +1243,7 @@ String true - The file system location for this repository + The file system location for this repository @@ -1252,12 +1252,12 @@ String default - The layout of the repository. Valid values are "default" and "legacy" + The layout of the repository. Valid values are "default" and "legacy" - + AbstractPurgeConfiguration 1.1.1+ @@ -1287,7 +1287,7 @@ int 2 - The total count of the artifact for each snapshot or the release/build output folder to be retained. + The total count of the artifact for each snapshot or the release/build output folder to be retained. @@ -1296,7 +1296,7 @@ int 100 - The number of days old which will be the basis for removing a snapshot or a folder. + The number of days old which will be the basis for removing a snapshot or a folder. @@ -1370,7 +1370,7 @@ - + ContinuumReleaseResult 1.1.1+ @@ -1422,7 +1422,7 @@ String - + BuildTrigger 1.4.1+ @@ -1496,7 +1496,7 @@ description 1.4.1+ String - + enabled 1.4.1+ 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=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml Mon Aug 13 04:29:09 2012 @@ -17,7 +17,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - + org.apache.continuum continuum-xmlrpc Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/src/main/java/org/apache/maven/continuum/xmlrpc/backup/Backup.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/src/main/java/org/apache/maven/continuum/xmlrpc/backup/Backup.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/src/main/java/org/apache/maven/continuum/xmlrpc/backup/Backup.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/src/main/java/org/apache/maven/continuum/xmlrpc/backup/Backup.java Mon Aug 13 04:29:09 2012 @@ -21,13 +21,13 @@ package org.apache.maven.continuum.xmlrp import com.sampullara.cli.Args; import com.sampullara.cli.Argument; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.apache.continuum.xmlrpc.release.ContinuumReleaseResult; import org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration; import org.apache.continuum.xmlrpc.repository.LocalRepository; import org.apache.continuum.xmlrpc.repository.RepositoryPurgeConfiguration; +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; import org.apache.maven.continuum.xmlrpc.client.ContinuumXmlRpcClient; import org.apache.maven.continuum.xmlrpc.project.BuildDefinition; import org.apache.maven.continuum.xmlrpc.project.BuildDefinitionTemplate; @@ -138,7 +138,7 @@ public class Backup if ( !command.overwrite && out.exists() ) { System.err.println( out.getAbsolutePath() + - " already exists and will not be overwritten unless the -overwrite flag is used." ); + " already exists and will not be overwritten unless the -overwrite flag is used." ); Args.usage( command ); return; } @@ -173,32 +173,32 @@ public class Backup private static class Commands { - @Argument(description = "Display help information", value = "help", alias = "h") + @Argument( description = "Display help information", value = "help", alias = "h" ) private boolean help; - @Argument(description = "Display version information", value = "version", alias = "v") + @Argument( description = "Display version information", value = "version", alias = "v" ) private boolean version; - @Argument(description = "Continuum XMLRPC URL", value = "url") + @Argument( description = "Continuum XMLRPC URL", value = "url" ) private URL url; - @Argument(description = "Username", value = "username", alias = "u") + @Argument( description = "Username", value = "username", alias = "u" ) private String username; - @Argument(description = "Password", value = "password", alias = "p") + @Argument( description = "Password", value = "password", alias = "p" ) private String password; - @Argument(description = "Backup file", value = "outputFile", alias = "o") + @Argument( description = "Backup file", value = "outputFile", alias = "o" ) private File outputFile; @Argument( description = "Whether to overwrite the designated backup file if it already exists in export mode. Default is false.", - value = "overwrite") + value = "overwrite" ) private boolean overwrite; @Argument( description = "Turn on debugging information. Default is off.", - value = "debug") + value = "debug" ) private boolean debug; } @@ -570,8 +570,8 @@ public class Backup startTag( "environmentVariables", true ); for ( Installation env : (List) profile.getEnvironmentVariables() ) { - writeTagWithParameter( "environmentVariable", "installationId", - String.valueOf( env.getInstallationId() ) ); + writeTagWithParameter( "environmentVariable", "installationId", String.valueOf( + env.getInstallationId() ) ); } endTag( "environmentVariables", true ); } @@ -583,8 +583,8 @@ public class Backup if ( profile.getBuilder() != null ) { - writeTagWithParameter( "builder", "installationId", - String.valueOf( profile.getBuilder().getInstallationId() ) ); + writeTagWithParameter( "builder", "installationId", String.valueOf( + profile.getBuilder().getInstallationId() ) ); } endTag( "profile", true ); @@ -719,7 +719,7 @@ public class Backup } startTag( "repositoryPurgeConfiguration", true ); writeSimpleFields( repoPurge ); - + if ( repoPurge.getRepository() != null ) { writeTagWithParameter( "repository", "id", String.valueOf( repoPurge.getRepository().getId() ) ); @@ -756,7 +756,7 @@ public class Backup { return; } - startTag( "directoryPurgeConfiguration", true); + startTag( "directoryPurgeConfiguration", true ); writeSimpleFields( dirPurge ); if ( dirPurge.getSchedule() != null ) Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/pom.xml (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/pom.xml Mon Aug 13 04:29:09 2012 @@ -17,7 +17,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - + org.apache.continuum continuum-xmlrpc Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/BuildResultsPurge.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/BuildResultsPurge.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/BuildResultsPurge.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/BuildResultsPurge.java Mon Aug 13 04:29:09 2012 @@ -19,11 +19,14 @@ package org.apache.maven.continuum.xmlrp * under the License. */ +import org.apache.maven.continuum.xmlrpc.project.BuildResult; +import org.apache.maven.continuum.xmlrpc.project.BuildResultSummary; +import org.apache.maven.continuum.xmlrpc.project.ProjectGroupSummary; +import org.apache.maven.continuum.xmlrpc.project.ProjectSummary; + import java.net.URL; -import java.util.List; import java.util.Date; - -import org.apache.maven.continuum.xmlrpc.project.*; +import java.util.List; /** * Utility class to purge old build results. @@ -31,7 +34,8 @@ import org.apache.maven.continuum.xmlrpc * The easiest way to use it is to change the exec plugin config in the pom to execute this class instead of * SampleClient, change RETENTION_DAYS if desired, and type 'mvn clean install exec:exec' */ -public class BuildResultsPurge { +public class BuildResultsPurge +{ private static ContinuumXmlRpcClient client; @@ -39,47 +43,53 @@ public class BuildResultsPurge { private static long DAY_IN_MILLISECONDS = 24 * 60 * 60 * 1000; - public static void main(String[] args) - throws Exception { + public static void main( String[] args ) + throws Exception + { - client = new ContinuumXmlRpcClient(new URL(args[0]), args[1], args[2]); + client = new ContinuumXmlRpcClient( new URL( args[0] ), args[1], args[2] ); long today = new Date().getTime(); - System.out.println("Today is " + new Date(today)); + System.out.println( "Today is " + new Date( today ) ); - long purgeDate = today - (RETENTION_DAYS * DAY_IN_MILLISECONDS); + long purgeDate = today - ( RETENTION_DAYS * DAY_IN_MILLISECONDS ); //long purgeDate = today - 1000; // 1 second ago (for testing) - System.out.println("Purging build results older than " + new Date(purgeDate)); + System.out.println( "Purging build results older than " + new Date( purgeDate ) ); List groups = client.getAllProjectGroups(); - for (ProjectGroupSummary group : groups) { - - System.out.println("Project Group [" + group.getId() + "] " + group.getName()); + for ( ProjectGroupSummary group : groups ) + { - List projects = client.getProjects(group.getId()); + System.out.println( "Project Group [" + group.getId() + "] " + group.getName() ); - for (ProjectSummary project : projects) { + List projects = client.getProjects( group.getId() ); + for ( ProjectSummary project : projects ) + { - System.out.println(" Project [" + project.getId() + "] " + project.getName()); + System.out.println( " Project [" + project.getId() + "] " + project.getName() ); - List results = client.getBuildResultsForProject(project.getId()); + List results = client.getBuildResultsForProject( project.getId() ); - for (BuildResultSummary brs : results) { + for ( BuildResultSummary brs : results ) + { - BuildResult br = client.getBuildResult(project.getId(), brs.getId()); + BuildResult br = client.getBuildResult( project.getId(), brs.getId() ); - System.out.print(" Build Result [" + br.getId() + "] ended " + new Date(br.getEndTime())); + System.out.print( " Build Result [" + br.getId() + "] ended " + new Date( br.getEndTime() ) ); - if (br.getEndTime() > 0 && br.getEndTime() < purgeDate) { + if ( br.getEndTime() > 0 && br.getEndTime() < purgeDate ) + { - client.removeBuildResult(br); - System.out.println(" ...removed."); - } else { - System.out.println(" ...retained."); + client.removeBuildResult( br ); + System.out.println( " ...removed." ); + } + else + { + System.out.println( " ...retained." ); } } } 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=1372260&r1=1372259&r2=1372260&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 Mon Aug 13 04:29:09 2012 @@ -19,12 +19,6 @@ package org.apache.maven.continuum.xmlrp * under the License. */ -import java.net.URL; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.Properties; - import org.apache.continuum.xmlrpc.release.ContinuumReleaseResult; import org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration; import org.apache.continuum.xmlrpc.repository.LocalRepository; @@ -56,6 +50,12 @@ import org.apache.xmlrpc.client.XmlRpcCl import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory; import org.apache.xmlrpc.client.util.ClientFactory; +import java.net.URL; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.Properties; + /** * @author Emmanuel Venisse * @version $Id$ @@ -336,7 +336,7 @@ public class ContinuumXmlRpcClient { return continuum.buildProject( projectId, buildTrigger ); } - + public int buildProject( int projectId, int buildDefinitionId, BuildTrigger buildTrigger ) throws Exception { @@ -432,17 +432,16 @@ public class ContinuumXmlRpcClient { return continuum.addMavenTwoProjectAsSingleProject( url, projectGroupId ); } - + public AddingResult addMavenTwoProject( String url, int projectGroupId, boolean checkProtocol, boolean useCredentialsCache, boolean recursiveProjects, boolean checkoutInSingleDirectory ) throws Exception { - return continuum.addMavenTwoProject( url, projectGroupId, checkProtocol, useCredentialsCache, - recursiveProjects, checkoutInSingleDirectory ); + return continuum.addMavenTwoProject( url, projectGroupId, checkProtocol, useCredentialsCache, recursiveProjects, + checkoutInSingleDirectory ); } - // ---------------------------------------------------------------------- // Maven 1.x projects // ---------------------------------------------------------------------- @@ -854,7 +853,8 @@ public class ContinuumXmlRpcClient return continuum.addMavenTwoProjectRPC( url, projectGroupId ); } - public Map addMavenTwoProjectRPC( String url, int projectGroupId, boolean checkoutInSingleDirectory ) + public Map addMavenTwoProjectRPC( String url, int projectGroupId, + boolean checkoutInSingleDirectory ) throws Exception { return continuum.addMavenTwoProjectRPC( url, projectGroupId, checkoutInSingleDirectory ); @@ -865,7 +865,7 @@ public class ContinuumXmlRpcClient { return continuum.addMavenTwoProjectAsSingleProjectRPC( url, projectGroupId ); } - + public Map addMavenTwoProjectRPC( String url, int projectGroupId, boolean checkProtocol, boolean useCredentialsCache, boolean recursiveProjects, boolean checkoutInSingleDirectory ) @@ -1043,7 +1043,8 @@ public class ContinuumXmlRpcClient return continuum.removeBuildResultRPC( br ); } - public Map updateBuildDefinitionForProjectGroupRPC( int projectGroupId, Map buildDef ) + public Map updateBuildDefinitionForProjectGroupRPC( int projectGroupId, + Map buildDef ) throws Exception { return continuum.updateBuildDefinitionForProjectGroupRPC( projectGroupId, buildDef ); @@ -1396,7 +1397,7 @@ public class ContinuumXmlRpcClient { return continuum.pingBuildAgent( buildAgentUrl ); } - + public String getBuildAgentUrl( int projectId, int buildDefinitionId ) throws Exception { Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java Mon Aug 13 04:29:09 2012 @@ -31,10 +31,8 @@ import org.apache.maven.continuum.xmlrpc import org.apache.maven.continuum.xmlrpc.project.ProjectDependency; import org.apache.maven.continuum.xmlrpc.project.ProjectGroupSummary; import org.apache.maven.continuum.xmlrpc.project.ProjectSummary; -import org.apache.maven.continuum.xmlrpc.project.Schedule; import org.apache.maven.continuum.xmlrpc.scm.ChangeSet; import org.apache.maven.continuum.xmlrpc.scm.ScmResult; -import org.apache.maven.continuum.xmlrpc.system.Installation; import java.net.URL; import java.util.ArrayList; @@ -53,10 +51,10 @@ public class SampleClient throws Exception { client = new ContinuumXmlRpcClient( new URL( args[0] ), args[1], args[2] ); - + // Test for [CONTINUUM-2641]: (test with distributed builds with multiple build agents or parallel builds with > 1 build queue) // make sure to set the projectIds to the actual projectIds of your projects added in Continuum - int projectIds[] = new int[] { 2, 3, 4, 5, 6 }; + int projectIds[] = new int[]{2, 3, 4, 5, 6}; List threads = new ArrayList(); @@ -64,7 +62,8 @@ public class SampleClient { final int order = i; final int projectId = projectIds[i]; - Runnable task = new Runnable (){ + Runnable task = new Runnable() + { public void run() { BuildTrigger buildTrigger = new BuildTrigger(); @@ -81,16 +80,17 @@ public class SampleClient } } }; - threads.add(new Thread(task)); + threads.add( new Thread( task ) ); } - + for ( Thread thread : threads ) { thread.start(); } System.out.println( "Adding project..." ); - AddingResult result = client.addMavenTwoProject( "http://svn.apache.org/repos/asf/continuum/sandbox/simple-example/pom.xml" ); + AddingResult result = client.addMavenTwoProject( + "http://svn.apache.org/repos/asf/continuum/sandbox/simple-example/pom.xml" ); if ( result.hasErrors() ) { System.out.println( result.getErrorsAsString() ); @@ -126,7 +126,7 @@ public class SampleClient { ps = client.refreshProjectSummary( ps ); System.out.println( "State of " + ps.getName() + "(" + ps.getId() + "): " + - client.getProjectStatusAsString( ps.getState() ) ); + client.getProjectStatusAsString( ps.getState() ) ); Thread.sleep( 1000 ); } @@ -151,8 +151,8 @@ public class SampleClient System.out.println( "Building..." ); String state = "unknown"; - while ( "Updating".equals( client.getProjectStatusAsString( ps.getState() ) ) || - "Building".equals( client.getProjectStatusAsString( ps.getState() ) ) ) + while ( "Updating".equals( client.getProjectStatusAsString( ps.getState() ) ) || "Building".equals( + client.getProjectStatusAsString( ps.getState() ) ) ) { ps = client.refreshProjectSummary( ps ); state = client.getProjectStatusAsString( ps.getState() ); @@ -182,9 +182,9 @@ public class SampleClient brs = (BuildResultSummary) i.next(); System.out.print( "Removing build result (" + brs.getId() + ") - " ); BuildResult br = client.getBuildResult( ps.getId(), brs.getId() ); - System.out.println( (client.removeBuildResult( br ) == 0 ? "OK" : "Error" ) ); + System.out.println( ( client.removeBuildResult( br ) == 0 ? "OK" : "Error" ) ); } - System.out.println( "Done."); + System.out.println( "Done." ); System.out.println(); @@ -243,7 +243,7 @@ public class SampleClient System.out.println( "Adding Directory Purge Configuration..." ); dirPurgeConfig = client.addDirectoryPurgeConfiguration( dirPurgeConfig ); System.out.println(); - + RepositoryPurgeConfiguration purgeConfig = new RepositoryPurgeConfiguration(); purgeConfig.setDeleteAll( true ); purgeConfig.setRepository( repository ); @@ -263,8 +263,8 @@ public class SampleClient System.out.println( "Remove local repository" ); System.out.println( "=====================" ); - System.out.println( "Removing Local Repository '" + repository.getName() + "' (" + - repository.getId() + ")..." ); + System.out.println( "Removing Local Repository '" + repository.getName() + "' (" + + repository.getId() + ")..." ); client.removeLocalRepository( repository.getId() ); System.out.println( "Done." ); } @@ -377,7 +377,7 @@ public class SampleClient public static void printLocalRepository( LocalRepository repo ) { - System.out.println( "Id: " +repo.getId() ); + System.out.println( "Id: " + repo.getId() ); System.out.println( "Layout: " + repo.getLayout() ); System.out.println( "Location: " + repo.getLocation() ); System.out.println( "Name: " + repo.getName() ); 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=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml Mon Aug 13 04:29:09 2012 @@ -17,7 +17,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - + org.apache.continuum continuum-xmlrpc @@ -139,7 +140,7 @@ under the License. org.objenesis - objenesis + objenesis test Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java Mon Aug 13 04:29:09 2012 @@ -534,7 +534,7 @@ public abstract class AbstractContinuumS { throw new ContinuumException( "Authentication required." ); } - + try { checkAuthorization( ContinuumRoleConstants.SYSTEM_ADMINISTRATOR_ROLE ); Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AddingResultUtil.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AddingResultUtil.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AddingResultUtil.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AddingResultUtil.java Mon Aug 13 04:29:09 2012 @@ -7,31 +7,39 @@ public class AddingResultUtil { private static final Map errorMap; - static + static { errorMap = new HashMap(); errorMap.put( "add.project.unknown.host.error", "The specified host is either unknown or inaccessible." ); - errorMap.put( "add.project.connect.error", "Unable to connect to remote server."); + errorMap.put( "add.project.connect.error", "Unable to connect to remote server." ); errorMap.put( "add.project.malformed.url.error", "The URL provided is malformed." ); errorMap.put( "add.project.field.required.error", "Either POM URL or Upload POM is required." ); errorMap.put( "add.project.xml.parse.error", "The XML content of the POM can not be parsed." ); errorMap.put( "add.project.extend.error", "Cannot use a POM with an ''extend'' element." ); - errorMap.put( "add.project.missing.pom.error", "POM file does not exist. Either the POM you specified or one of its modules does not exist." ); + errorMap.put( "add.project.missing.pom.error", + "POM file does not exist. Either the POM you specified or one of its modules does not exist." ); errorMap.put( "add.project.missing.groupid.error", "Missing 'groupId' element in the POM." ); errorMap.put( "add.project.missing.artifactid.error", "Missing 'artifactId' element in the POM." ); errorMap.put( "add.project.missing.version.error", "Missing 'version' element in the POM." ); errorMap.put( "add.project.missing.name.error", "Missing 'name' element in the POM." ); errorMap.put( "add.project.missing.repository.error", "Missing 'repository' element in the POM." ); - errorMap.put( "add.project.missing.scm.error", "Missing 'scm' element in the POM project." ); - errorMap.put( "add.project.missing.scm.connection.error", "Missing 'connection' sub-element in the 'scm' element in the POM." ); - errorMap.put( "add.project.missing.notifier.type.error", "Missing 'type' sub-element in the 'notifier' element in the POM." ); - errorMap.put( "add.project.missing.notifier.configuration.error", "Missing 'configuration' sub-element in the 'notifier' element in the POM." ); + errorMap.put( "add.project.missing.scm.error", "Missing 'scm' element in the POM project." ); + errorMap.put( "add.project.missing.scm.connection.error", + "Missing 'connection' sub-element in the 'scm' element in the POM." ); + errorMap.put( "add.project.missing.notifier.type.error", + "Missing 'type' sub-element in the 'notifier' element in the POM." ); + errorMap.put( "add.project.missing.notifier.configuration.error", + "Missing 'configuration' sub-element in the 'notifier' element in the POM." ); errorMap.put( "add.project.metadata.transfer.error", "Transfer of Metadata has failed." ); - errorMap.put( "add.project.validation.protocol.not_allowed", "The specified resource isn't a file or the protocol used isn't allowed." ); - errorMap.put( "add.project.unauthorized.error", "You are not authorized to access the requested URL. Please verify that the correct username and password are provided." ); - errorMap.put( "add.project.artifact.not.found.error", "Missing artifact trying to build the POM. Check that its parent POM is available or add it first in Continuum." ); + errorMap.put( "add.project.validation.protocol.not_allowed", + "The specified resource isn't a file or the protocol used isn't allowed." ); + errorMap.put( "add.project.unauthorized.error", + "You are not authorized to access the requested URL. Please verify that the correct username and password are provided." ); + errorMap.put( "add.project.artifact.not.found.error", + "Missing artifact trying to build the POM. Check that its parent POM is available or add it first in Continuum." ); errorMap.put( "add.project.project.building.error", "Unknown error trying to build POM." ); - errorMap.put( "add.project.unknown.error", "The specified resource cannot be accessed. Please try again later or contact your administrator." ); + errorMap.put( "add.project.unknown.error", + "The specified resource cannot be accessed. Please try again later or contact your administrator." ); errorMap.put( "add.project.nogroup.error", "No project group specified." ); errorMap.put( "add.project.duplicate.error", "Trying to add duplicate projects in the same project group." ); } Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java Mon Aug 13 04:29:09 2012 @@ -19,9 +19,6 @@ package org.apache.maven.continuum.xmlrp * under the License. */ -import java.util.HashMap; -import java.util.Map; - import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.XmlRpcRequest; import org.apache.xmlrpc.server.RequestProcessorFactoryFactory; @@ -36,6 +33,9 @@ import org.codehaus.plexus.personality.p import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashMap; +import java.util.Map; + /** * @author Emmanuel Venisse * @version $Id$