Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 85783 invoked from network); 6 May 2010 09:25:40 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 May 2010 09:25:40 -0000 Received: (qmail 858 invoked by uid 500); 6 May 2010 09:25:40 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 755 invoked by uid 500); 6 May 2010 09:25:40 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 737 invoked by uid 99); 6 May 2010 09:25:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 May 2010 09:25:40 +0000 X-ASF-Spam-Status: No, hits=-1600.5 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 May 2010 09:25:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1288F23889FD; Thu, 6 May 2010 09:23:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r941625 [15/24] - in /continuum/branches/continuum-flat-multi-module: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/ cont... Date: Thu, 06 May 2010 09:23:34 -0000 To: commits@continuum.apache.org From: oching@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100506092409.1288F23889FD@eris.apache.org> Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/index.apt URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/index.apt?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/index.apt (original) +++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/index.apt Thu May 6 09:23:13 2010 @@ -1,41 +1,44 @@ ------ Releasing Projects ------ + ------ + 2010-02-18 + ------ Releasing Projects - The release process has two steps, {{{prepare.html}Prepare}} and {{{perform.html}Perform}}. + The release process has two steps, {{{./prepare.html}Prepare}} and {{{./perform.html}Perform}}. [[1]] First, it prepares your project for release by doing the following: * Checks that your project is in a "releasable" state. - + * Updates the POMs for the new development version. - + * Runs a test build. - + * Generates a tag for the release. - - * Generates the artifact to be deployed, such as a jar file. - + + * Generates the artifact to be deployed, such as a JAR file. + * Generates the site and deploys it. - - * Commits the new POMs to the new development version. It will do the commit to the SCM + + * Commits the new POMs with the new development version. It will do the commit to the SCM connection URL you specify (explained later). - + [] - + [[2]] Then the release management system performs the release by checking out a clean copy of the tagged release and deploying the artifacts and site. - + [] - + * Modifying POM for Release - The source code control system you use must be specified in your POM file in an <<>> entry + The source code control system you use must be specified in your POM file in an <<<\>>> entry similar to the one shown here: - -+----------------------------------------------------------------------------------+ + ++----------------------------------------------------------------------------------+ scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk @@ -46,19 +49,26 @@ Releasing Projects http://svn.apache.org/viewcvs.cgi/maven/components/trunk +---------------------------------------------------------------------------------+ - - To determine what to enter for your connection URL (the "<<< \ >>>" tag) go to the link + + To determine what to enter for your connection URL (the <<<\>>> tag) go to the link {{http://maven.apache.org/scm/scms-overview.html}} for a list of supported SCMs and click on your source code control system to see the appropriate syntax for your particular software. - + In general the format for an SCM URL is: <<< scm: >>> - - In the example above, the <<>> is "<<>>" (Subversion). The <<>> is a colon. - And the rest of the line is the "<<>>". - + + In the example above, the <<>> is <<>> (Subversion). The <<>> is a colon. + And the rest of the line is the <<>>. + It is important to prepare the release just before performing the release. The reason these processes have been separated into two steps is to allow the user to confirm that everything has been set correctly before the actual release. If between the prepare and performing of the release there is a change to the SCM tree, an error will occur causing the prepare process to restart. - \ No newline at end of file + + [] + +* Releasing projects in a distributed build + + Release will happen in the Build Agent where the last build of project occurred. + + To view on-going releases from different build agents, click the <> button under the <> menu. Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/perform.apt URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/perform.apt?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/perform.apt (original) +++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/perform.apt Thu May 6 09:23:13 2010 @@ -1,19 +1,27 @@ ------ Perform Release ------ + ------ + 2010-02-19 + ------ Perform Release - Choose "Perform Release" and the version number + Choose <> and the version number [../../images/release-choose-perform-goal.png] - Fill in the form and click Submit + Fill in the form and click <> + + To specify a different Maven goal to execute during the release, fill in the <> field with another goal. + By default, the goal for this field is <<>>. + + To specify additional arguments during execution, fill in the <> field. [../../images/release-perform-parameters.png] - Wait for the process to complete, then click Done. + Wait for the process to complete, then click <>. [../../images/release-perform-executing.png] - To view the release perform results, refer to {{{release_results.html}Release Results Management}}. \ No newline at end of file + To view the release perform results, refer to {{{./release_results.html}Release Results Management}}. Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/perform.apt ------------------------------------------------------------------------------ svn:eol-style = native Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/prepare.apt URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/prepare.apt?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/prepare.apt (original) +++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/prepare.apt Thu May 6 09:23:13 2010 @@ -1,31 +1,49 @@ ------ Preparing for Release ------ + ------ + 2010-02-19 + ------ Prepare for Release - Navigate to the Project Group Summary and click the Release button or icon. + Navigate to the <> and click the <> button or icon. [../../images/release-project-group-summary.png] Release - Choose "Prepare project for release" and click "Submit" + Choose <> and click <>. [../../images/release-choose-prepare-goal.png] Release - Complete the form, providing the scm tag name, etc. + Complete the form, providing the SCM tag name, etc. - Check the 'Use edit mode' checkbox if you are using a SCM system that requires you to obtain a lock before editing. + Check the <> checkbox if you are using an SCM system that requires you to obtain a lock before editing. - Click Submit. + Click <>. + + <> When releasing in a {{{../../administrator_guides/distributed-builds.html} distributed builds}} setup, a <> + should be selected containing at least one enabled build agent. Furthermore, the release will not happen in the following cases: + + * no build environment selected + + * no build agent found in the build agent group attached to the build environment + + * all build agents configured in the selected build environment are disabled + + [] [../../images/release-prepare-parameters.png] Release Prepare parameters - Wait for the process to complete, then click Done. + Wait for the process to complete, then click <>. + + <> Hitting the <> button does not roll back or delete the SCM tag created during the <<>> phase. + So when re-doing the release prepare of the same version, make sure that the tag does not exist in SVN, if so, + the tag should be manually deleted. [../../images/release-prepare-executing.png] - You will be returned to this page to make another selection + You will be returned to this page to make another selection. [../../images/release-choose-perform-goal.png] - To view the release prepare results, refer to {{{release_results.html}Release Results Management}}. + To view the release prepare results, refer to {{{./release_results.html}Release Results Management}}. Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/prepare.apt ------------------------------------------------------------------------------ svn:eol-style = native Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/release_results.apt URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/release_results.apt?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/release_results.apt (original) +++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/release_results.apt Thu May 6 09:23:13 2010 @@ -7,13 +7,17 @@ Release Results Management - <> tab from the <> page displays all the release results of a - project when executing release goals prepare and perform. + The <> tab from the <> page displays all the release results of a + project when executing the release goals prepare and perform. + +~~TODO What does the last part of the above mean? [../../images/release_result-1.png] Release Results page To view the release result, click the <> link in-line with the release goal being executed. + + The <> field displays the username of the person who initiated the release. [../../images/release_result-2.png] Release Summary - To delete release results, select the boxes beside the project name then click <>. \ No newline at end of file + To delete release results, select the boxes beside the project name then click <>. Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/release/release_results.apt ------------------------------------------------------------------------------ svn:eol-style = native Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt (original) +++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt Thu May 6 09:23:13 2010 @@ -8,10 +8,10 @@ Viewing Queues - Click the <> link under the <> section + Click the <> link under the <> section. [../../images/queues.png] Queues - You can only view the current checkout, current build, checkout queues and build queues. - -[../../images/queues-view.png] Queues View + You can only view the current checkout, current prepare build, current build, checkout queues, prepare build queues and build queues. + +[../../images/queues-view.png] Queues View Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/pdf.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/pdf.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/pdf.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/pdf.xml Thu May 6 09:23:13 2010 @@ -21,7 +21,7 @@ - Apache Continuum + Apache Continuum ${project.version} The Apache Continuum Project @@ -34,14 +34,9 @@ - - - - - - + @@ -56,13 +51,19 @@ + + + + + + - + @@ -71,11 +72,20 @@ + + + + + + + + + Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/pdf.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/build_result-1.png URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/build_result-1.png?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== Binary files - no diff available. Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/notifier-mail-add.png URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/notifier-mail-add.png?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== Binary files - no diff available. Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/release-perform-parameters.png URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/release-perform-parameters.png?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== Binary files - no diff available. Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/release-prepare-parameters.png URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/release-prepare-parameters.png?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== Binary files - no diff available. Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/release_result-2.png URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/resources/images/release_result-2.png?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== Binary files - no diff available. Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/site.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/site.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/site.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/site.xml Thu May 6 09:23:13 2010 @@ -21,30 +21,29 @@ - + + + - - - - - + + - + @@ -71,35 +70,47 @@ + - + - + - + + + + + + + + + - + + + + Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/xdoc/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 6 09:23:13 2010 @@ -1,5 +1,5 @@ /continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024,725845,726103,726239,726462 -/continuum/branches/continuum-1.3.x/continuum-docs/src/site/xdoc:766106,766120-766121,766641,766645,766669,766977,767363,767397,767792,767796,768222 +/continuum/branches/continuum-1.3.x/continuum-docs/src/site/xdoc:760767-900271,904130,915354,915760,915848-915864,916073-916074 /continuum/branches/continuum-distributed-builds/continuum-docs/src/site/xdoc:713270-734307 /continuum/tags/continuum-1.2.3/continuum-docs/src/site/xdoc:733253 /continuum/trunk/continuum-docs/src/site/xdoc:690494-690520 Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/xdoc/release-notes.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/xdoc/release-notes.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/xdoc/release-notes.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/xdoc/release-notes.xml Thu May 6 09:23:13 2010 @@ -4,168 +4,117 @@ -

Apache Continuum 1.3.2 Release Notes

+

Apache Continuum 1.4.0 Release Notes

-

The Apache Continuum team is pleased to announce Apache Continuum 1.3.2.

+

The Apache Continuum team is pleased to announce Apache Continuum 1.4.0.

-

Apache Continuum 1.3.2 includes the following new features:

+

This release includes the following new features:

-

Scm Comment Prefix for Release Prepare -- Ability to configure the scm comment prefix through the web UI for release prepare.

- -

Build Agent Group -- Build agents can now be assigned to a specific project build.

+

Improved user recognition - information on who executed releases and forced builds, and better handling of sending notifications to developers who made a change

To learn more about how the Continuum dev team versions releases, see our release guidelines.

-

Release Notes - Continuum - Version 1.3.2

- -

Sub-task -

- +

Bug +

+
    +
  • [CONTINUUM-1578] - No output after a successful perform release +
    • +
  • [CONTINUUM-2114] - cannot login with perforce scm until new version of scm is included +
    • +
  • [CONTINUUM-2170] - No such object error when forcing a build from the group-level Build Definitions tab +
    • +
  • [CONTINUUM-2267] - Error with backslash in Windows path for inatallation tests +
    • +
  • [CONTINUUM-2270] - Selenium tests fail when run with JDK 1.6 +
    • +
  • [CONTINUUM-2285] - Queues page turns to blank if build queues are not empty +
    • +
  • [CONTINUUM-2349] - Project should only build in agents that are in the Build agent group assigned to it +
    • +
  • [CONTINUUM-2371] - Unable to view queues after loss of build agent +
    • +
  • [CONTINUUM-2381] - Project is not building even when there is an enabled build agent configured +
    • +
  • [CONTINUUM-2386] - Build environment selection is ignored when releasing with distributed build enabled +
    • +
  • [CONTINUUM-2391] - Master should not pass full path to local repository to the agent +
    • +
  • [CONTINUUM-2395] - Build Environment accepts duplicate name during edit +
    • +
  • [CONTINUUM-2397] - Unable to edit the added local repository +
    • +
  • [CONTINUUM-2440] - Unable to download html file from working copy +
    • +
  • [CONTINUUM-2450] - Intermittent error when releasing in a distributed build +
    • +
  • [CONTINUUM-2451] - Unable to release a project using the "provide parameters" option with distributed builds +
    • +
  • [CONTINUUM-2466] - authorization failed when building ant / shell projects +
    • +
  • [CONTINUUM-2474] - Fix selenium failing test in windows +
    • +
  • [CONTINUUM-2476] - Projects are not built in the correct build agent when the project is already in the build queue and then triggered to be built again +
    • +
  • [CONTINUUM-2479] - Link to cron-help is wrong +
    • +
  • [CONTINUUM-2487] - Selenium tests fail if run at certain times crossing the 'on the hour' default schedule trigger +
    • +
  • [CONTINUUM-2490] - Getting permission denied when running selenium tests in IE +
    • +
  • [CONTINUUM-2493] - "Users Wiki" link on home page points at old wiki +
    • +
  • [CONTINUUM-2494] - Unable to build a project even though the build agent is there. +
    • +
  • [CONTINUUM-2504] - Queues page shows distributedBuild.table.agentUrl for the Agent URL field instead of the actual value +
    • +
-

Bug -

-
    -
  • [CONTINUUM-1503] - scm release tag default should match what the release plugin uses -
    • -
  • [CONTINUUM-1504] - when autoVersionSubmodules=true is defined in the pom for the release plugin, the release prepare screen should not show or allow changing of child project versions -
    • -
  • [CONTINUUM-1505] - release perform page does not use defaults specified in pom for release plugin for goals and useReleaseProfile -
    • -
  • [CONTINUUM-1887] - Release rollback hangs when the release failed at the scm-check-modifications phase -
    • -
  • [CONTINUUM-1909] - login and password ignored in checkout operation -
    • -
  • [CONTINUUM-1918] - Username and Password should be optional on project release form (Subversion projects) -
    • -
  • [CONTINUUM-1972] - Error attempting to delete project group -
    • -
  • [CONTINUUM-2015] - Deleting Purge Configuration doesn't ask for confirmation upon deletion -
    • -
  • [CONTINUUM-2038] - Some dojo js files are missing -
    • -
  • [CONTINUUM-2047] - Can't edit or delete PROJECT build Definition -
    • -
  • [CONTINUUM-2048] - Parallel Build Queue Name accepts null value -
    • -
  • [CONTINUUM-2050] - Available Templates has "false" on top of delete icon -
    • -
  • [CONTINUUM-2053] - Problem with french characters -
    • -
  • [CONTINUUM-2055] - link to data management cli broken in migration doc -
    • -
  • [CONTINUUM-2058] - Editing an Installation , page dont change -
    • -
  • [CONTINUUM-2059] - Dont validate envirotment name when create installation with 'Create a Build Environment Installation with the name' -
    • -
  • [CONTINUUM-2064] - Default Build Enviroment List don't show installations -
    • -
  • [CONTINUUM-2065] - Wrong content in Other Changes Since Last Success section of build results -
    • -
  • [CONTINUUM-2067] - Error while deleting project caused by SCM RESULT dependency foreign key constraint violation -
    • -
  • [CONTINUUM-2072] - Take care of the platform's default encoding when building continuum -
    • -
  • [CONTINUUM-2077] - Project Scm Root is not deleted even when you delete the projects. -
    • -
  • [CONTINUUM-2090] - Stack Overflow error when preparing project for release -
    • -
  • [CONTINUUM-2102] - Unable to configure subject line for email notifications -
    • -
  • [CONTINUUM-2107] - Send on SCM Failure is duplicated on the Add/Edit Mail Notifier page -
    • -
  • [CONTINUUM-2112] - Incorrect title page of Add/Edit Parallel Build Queue -
    • -
  • [CONTINUUM-2118] - update code that checks isLocked() to also check isPasswordChangeRequired() as well -
    • -
  • [CONTINUUM-2120] - Unable to build project after scm error -
    • -
  • [CONTINUUM-2124] - NPE when building Shell or Ant project -
    • -
  • [CONTINUUM-2126] - Edit Project Group moving a project to other project group fail -
    • -
  • [CONTINUUM-2129] - ClassNotFoundException when using the XML-RPC client -
    • -
  • [CONTINUUM-2130] - Unable to notify latest committers only -
    • -
  • [CONTINUUM-2134] - Deleting a project group-level notifier with recipient latest committers prompts Are you sure you want to delete the mail notifier with recipient ""? -
    • -
  • [CONTINUUM-2135] - Missing confirmation when deleting a project-level notifier from the group-level Notifiers tab -
    • -
  • [CONTINUUM-2139] - Creating a Mail notifier incorrectly allows only spaces in the email address -
    • -
  • [CONTINUUM-2140] - Some continuum objects are missing during backup/restore -
    • -
+

Improvement +

+
    +
  • [CONTINUUM-493] - Allow to add all developpers address in a notifier without duplicate developpers addresses +
    • +
  • [CONTINUUM-565] - Forced builds should say who (which continuum user) forced the build +
    • +
  • [CONTINUUM-2160] - Upgrade to last scm version (1.2) and last release-manager version +
    • +
  • [CONTINUUM-2373] - Distributed Master needs more detailed logging +
    • +
  • [CONTINUUM-2458] - Continuum Release should do a checkout if there is no working copy +
    • +
-

Improvement -

-
    -
  • [CONTINUUM-1321] - Improve error message when perform release fails due to missing distributionManagement -
    • -
  • [CONTINUUM-1726] - Project description (as given in POM) should be visible -
    • -
  • [CONTINUUM-1823] - Fewer notifications when Subversion server is unreachable -
    • -
  • [CONTINUUM-2005] - Go the "Project Build tab" from the "Build Queue" page -
    • -
  • [CONTINUUM-2020] - Remove the local repository column from the project groups page -
    • -
  • [CONTINUUM-2027] - The i18n patch for zh_CN -
    • -
  • [CONTINUUM-2028] - Continuum release prepare should use maven-release-plugin scmCommentPrefix configuration in pom -
    • -
  • [CONTINUUM-2042] - Ability to control which projects build on which agents -
    • -
  • [CONTINUUM-2043] - Release should happen on a build agent rather than on the master -
    • -
  • [CONTINUUM-2051] - Add confirmation upon deletion in Parallel Build Queue -
    • -
  • [CONTINUUM-2052] - Delete Confirmation Pages for Installation, Build Definition Templates -
    • -
  • [CONTINUUM-2061] - Typo on Project Groups's message prompts -
    • -
  • [CONTINUUM-2070] - add a check if project should build or not -
    • -
  • [CONTINUUM-2087] - Viewing of working copy from build agent -
    • -
  • [CONTINUUM-2109] - [Roles] Change continuum-manage-purging and continuum-manage-repositories user role names to Continuum Manage Purging and Continuum Manage Local Repositories -
    • -
  • [CONTINUUM-2125] - add security audit log -
    • -
  • [CONTINUUM-2127] - Configuration for Distributed Build should be visible only if Distributed Build is enabled -
    • -
  • [CONTINUUM-2136] - Show error message when build agent is removed or disabled -
    • -
+

New Feature +

+ -

New Feature -

-
    -
  • [CONTINUUM-2054] - Ability to configure the scm comment prefix through the web UI for release prepare -
    • -
  • [CONTINUUM-2068] - Build Agent group functionality -
    • -
+

Task +

+ -

Task -

-
    -
  • [CONTINUUM-2116] - Upgrade to Redback 1.2 release -
    • -
  • [CONTINUUM-2137] - Update documentation for new Build Agent Group functionality -
    • -
- -Have Fun ! -

---
-The Apache Continuum Team +

Test +

+
    +
  • [CONTINUUM-2073] - Revive the automated Selenium integration tests +
    • +
  • [CONTINUUM-2268] - Continuum Webapp Tests Capture Screenshot for AbstractSeleniumTest.java +
    • +
  • [CONTINUUM-2271] - Continuum Build Agent Tests and Improvement on Build Queue Test +
    • +
  • [CONTINUUM-2378] - Selenium Test for deleting projects and project groups +
    • +
  • [CONTINUUM-2467] - Selenium test: check for project group SCM update when building projects +
    • +
  • [CONTINUUM-2482] - Replace the use of Thread.sleep to Selenium waitForCondition +
    • +
- \ No newline at end of file + Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/xdoc/release-notes.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-flat-multi-module/continuum-jetty/ ('svn:mergeinfo' removed) Modified: continuum/branches/continuum-flat-multi-module/continuum-jetty/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-jetty/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-jetty/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-jetty/pom.xml Thu May 6 09:23:13 2010 @@ -22,7 +22,7 @@ under the License. continuum org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT continuum-jetty pom @@ -49,12 +49,7 @@ under the License. org.mortbay.jetty - servlet-api-2.5 - runtime - - - org.mortbay.jetty - jsp-api-2.0 + jsp-2.1-jetty runtime @@ -72,43 +67,6 @@ under the License. mail runtime - - ant - ant - runtime - - - commons-el - commons-el - runtime - - - tomcat - jasper-compiler - runtime - - - tomcat - jasper-runtime - runtime - - - tomcat - jasper-compiler-jdt - runtime - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - - org.slf4j - jcl-over-slf4j - @@ -122,7 +80,6 @@ under the License. org.mortbay.start.Main conf/jetty.xml - conf/jetty-logging.xml jsw @@ -145,15 +102,15 @@ under the License. wrapper.logfile - %CONTINUUM_BASE%/logs/wrapper.log + %CONTINUUM_BASE%/logs/wrapper.YYYYMMDD.log - wrapper.app.parameter.2 - %CONTINUUM_BASE%/conf/jetty.xml + wrapper.logfile.rollmode + DATE - wrapper.app.parameter.3 - %CONTINUUM_BASE%/conf/jetty-logging.xml + wrapper.app.parameter.2 + %CONTINUUM_BASE%/conf/jetty.xml app.base.envvar Modified: continuum/branches/continuum-flat-multi-module/continuum-model/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-model/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-model/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-model/pom.xml Thu May 6 09:23:13 2010 @@ -21,7 +21,7 @@ under the License. continuum org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT 4.0.0 continuum-model @@ -39,33 +39,16 @@ under the License. java stax-reader stax-writer - jpox-metadata-class - - jpox-jdo-mapping - - jpox-jdo-mapping - - - ${basedir}/target/classes/META-INF - - - - jpox-jdo-mapping-replication - - jpox-jdo-mapping - - - ${basedir}/target/classes/META-INF - true - - 1.4.0 false - src/main/mdo/continuum.xml + + src/main/mdo/continuum.xml + + true @@ -79,6 +62,24 @@ under the License. + + maven-antrun-plugin + + + copy-resources + process-resources + + + + + + + + run + + + + Modified: continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml Thu May 6 09:23:13 2010 @@ -317,12 +317,6 @@ 1.1.0+ String - - checkedOutInSingleDirectory - 1.4.0+ - boolean - false - buildResults 1.0.9+ @@ -591,6 +585,11 @@ 1.0.9 int + + username + 1.4.0+ + String + state 1.1.0+ @@ -1031,7 +1030,13 @@ true if this buildDefinition is a template - + + + updatePolicy + 1.4.0+ + int + 0 + @@ -1646,6 +1651,11 @@ 1.1.2+ String + + username + 1.4.0+ + String + Modified: continuum/branches/continuum-flat-multi-module/continuum-model/src/main/resources/package-default.orm URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-model/src/main/resources/package-default.orm?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-model/src/main/resources/package-default.orm (original) +++ continuum/branches/continuum-flat-multi-module/continuum-model/src/main/resources/package-default.orm Thu May 6 09:23:13 2010 @@ -17,11 +17,4 @@ - - - - - - - Propchange: continuum/branches/continuum-flat-multi-module/continuum-model/src/main/resources/package-default.orm ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 6 09:23:13 2010 @@ -1 +1 @@ -/continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm:766120-766121,766641,766645,766669,766977,767397,767792,767796,768222 +/continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm:760767-766105,766107-900271,915354,915760,915848-915864,916073-916074 Modified: continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-api/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-api/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-api/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-api/pom.xml Thu May 6 09:23:13 2010 @@ -21,7 +21,7 @@ under the License. continuum-notifiers org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT 4.0.0 continuum-notifier-api Modified: continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java Thu May 6 09:23:13 2010 @@ -49,6 +49,8 @@ public abstract class AbstractContinuumN public static final String COMMITTER_FIELD = "committers"; + public static final String DEVELOPER_FIELD = "developers"; + private static final Logger log = LoggerFactory.getLogger( AbstractContinuumNotifier.class ); @Resource Modified: continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-irc/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-irc/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-irc/pom.xml Thu May 6 09:23:13 2010 @@ -21,7 +21,7 @@ under the License. continuum-notifiers org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT 4.0.0 continuum-notifier-irc Modified: continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-jabber/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-jabber/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-jabber/pom.xml Thu May 6 09:23:13 2010 @@ -21,7 +21,7 @@ under the License. continuum-notifiers org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT 4.0.0 continuum-notifier-jabber Modified: continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-msn/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-msn/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-msn/pom.xml Thu May 6 09:23:13 2010 @@ -21,7 +21,7 @@ under the License. continuum-notifiers org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT 4.0.0 continuum-notifier-msn Modified: continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-wagon/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-wagon/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-wagon/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-notifiers/continuum-notifier-wagon/pom.xml Thu May 6 09:23:13 2010 @@ -21,7 +21,7 @@ under the License. continuum-notifiers org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT 4.0.0 continuum-notifier-wagon Modified: continuum/branches/continuum-flat-multi-module/continuum-notifiers/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-notifiers/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-notifiers/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-notifiers/pom.xml Thu May 6 09:23:13 2010 @@ -21,7 +21,7 @@ under the License. continuum org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT 4.0.0 continuum-notifiers Modified: continuum/branches/continuum-flat-multi-module/continuum-purge/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-purge/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-purge/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-purge/pom.xml Thu May 6 09:23:13 2010 @@ -22,7 +22,7 @@ under the License. continuum org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT continuum-purge Continuum :: Purge System @@ -134,12 +134,21 @@ under the License. generate + generate-resources descriptor merge + process-resources + + + ${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml + ${project.build.outputDirectory}/META-INF/plexus/components.xml + + ${project.build.outputDirectory}/META-INF/plexus/components.xml + merge-descriptors Modified: continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java Thu May 6 09:23:13 2010 @@ -209,6 +209,11 @@ public class DefaultPurgeConfigurationSe { return directoryPurgeConfigurationDao.getDirectoryPurgeConfigurationsBySchedule( scheduleId ); } + + public List getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId ) + { + return directoryPurgeConfigurationDao.getEnableDirectoryPurgeConfigurationsBySchedule( scheduleId ); + } public List getRepositoryPurgeConfigurationsByRepository( int repositoryId ) { @@ -219,6 +224,11 @@ public class DefaultPurgeConfigurationSe { return repositoryPurgeConfigurationDao.getRepositoryPurgeConfigurationsBySchedule( scheduleId ); } + + public List getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId ) + { + return repositoryPurgeConfigurationDao.getEnableRepositoryPurgeConfigurationsBySchedule( scheduleId ); + } public void removeDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfig ) throws PurgeConfigurationServiceException Modified: continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java Thu May 6 09:23:13 2010 @@ -38,8 +38,8 @@ import org.slf4j.LoggerFactory; public abstract class AbstractContinuumPurgeExecutor implements ContinuumPurgeExecutor { - private Logger log = LoggerFactory.getLogger( AbstractContinuumPurgeExecutor.class ); - + private static final Logger log = LoggerFactory.getLogger( AbstractContinuumPurgeExecutor.class ); + public void purge( Set references, RepositoryManagedContent repository ) { if ( references != null && !references.isEmpty() ) Modified: continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java Thu May 6 09:23:13 2010 @@ -151,8 +151,8 @@ public class DaysOldDirectoryPurgeExecut { try { - FileUtils.deleteDirectory( buildDir ); log.info( ContinuumPurgeConstants.PURGE_DIR_CONTENTS + " - " + buildDir.getName() ); + FileUtils.deleteDirectory( buildDir ); File logFile = new File( buildDir.getAbsoluteFile() + ".log.txt" ); if ( logFile.exists() ) Modified: continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java Thu May 6 09:23:13 2010 @@ -25,6 +25,11 @@ import java.util.Collections; import java.util.List; import org.apache.continuum.purge.ContinuumPurgeConstants; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.apache.continuum.purge.repository.content.RepositoryManagedContent; import org.apache.maven.archiva.common.utils.VersionComparator; import org.apache.maven.archiva.common.utils.VersionUtil; Modified: continuum/branches/continuum-flat-multi-module/continuum-release/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-release/pom.xml?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-release/pom.xml (original) +++ continuum/branches/continuum-flat-multi-module/continuum-release/pom.xml Thu May 6 09:23:13 2010 @@ -22,7 +22,7 @@ under the License. continuum org.apache.continuum - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT continuum-release Continuum :: Release System @@ -121,7 +121,8 @@ under the License. src/main/mdo/prepared-releases.mdo - 1.0.0 + 1.4.0 + true Modified: continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java Thu May 6 09:23:13 2010 @@ -82,6 +82,7 @@ public class ContinuumPropertiesReleaseD releaseDescriptor.setAdditionalArguments( properties.getProperty( "exec.additionalArguments" ) ); releaseDescriptor.setPomFileName( properties.getProperty( "exec.pomFileName" ) ); releaseDescriptor.setPreparationGoals( properties.getProperty( "preparationGoals" ) ); + releaseDescriptor.setExecutable( properties.getProperty( "build.executable" ) ); loadResolvedDependencies( properties, releaseDescriptor ); @@ -247,6 +248,12 @@ public class ContinuumPropertiesReleaseD processResolvedDependencies( properties, config.getResolvedSnapshotDependencies() ); } + // executables + if ( config.getExecutable() != null ) + { + properties.setProperty( "build.executable", config.getExecutable() ); + } + OutputStream outStream = null; //noinspection OverlyBroadCatchBlock try Modified: continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java Thu May 6 09:23:13 2010 @@ -75,7 +75,7 @@ public abstract class AbstractContinuumR executable = ( (ContinuumReleaseDescriptor) releaseDescriptor).getExecutable(); } shellCommandHelper.executeGoals( determineWorkingDirectory( workingDirectory, - releaseDescriptor.getScmRelativePathProjectDirectory(), releaseDescriptor.getRootProjectPath() ), + releaseDescriptor.getScmRelativePathProjectDirectory() ), executable, goals, releaseDescriptor.isInteractive(), additionalArguments, result, environments ); } Modified: continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Thu May 6 09:23:13 2010 @@ -41,6 +41,7 @@ import org.apache.maven.shared.release.c import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.TaskQueue; import org.codehaus.plexus.taskqueue.TaskQueueException; +import org.codehaus.plexus.util.StringUtils; /** * @author Jason van Zyl @@ -252,8 +253,17 @@ public class DefaultContinuumReleaseMana if ( repository != null ) { - descriptor.setAdditionalArguments( descriptor.getAdditionalArguments() + " \"-Dmaven.repo.local=" + repository.getLocation() + "\"" ); - //descriptor.setAdditionalArguments( "\"-Dmaven.repo.local=" + repository.getLocation() + "\"" ); + String args = descriptor.getAdditionalArguments(); + + if ( StringUtils.isNotEmpty( args ) ) + { + descriptor.setAdditionalArguments( args + + " \"-Dmaven.repo.local=" + repository.getLocation() + "\"" ); + } + else + { + descriptor.setAdditionalArguments( "\"-Dmaven.repo.local=" + repository.getLocation() + "\"" ); + } } //other properties Modified: continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java Thu May 6 09:23:13 2010 @@ -43,6 +43,8 @@ public class DefaultReleaseManagerListen private String error; private int state; + + private String username; public void goalStart( String name, List phases ) { @@ -110,4 +112,14 @@ public class DefaultReleaseManagerListen { return state; } + + public void setUsername( String username ) + { + this.username = username; + } + + public String getUsername() + { + return username; + } } Modified: continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java Thu May 6 09:23:13 2010 @@ -41,7 +41,6 @@ import org.apache.maven.settings.Setting import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.config.ReleaseDescriptor; -import org.apache.maven.shared.release.util.ReleaseUtil; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.context.Context; @@ -84,55 +83,76 @@ public class PerformReleaseTaskExecutor repository = performTask.getLocalRepository(); - List reactorProjects = null; - MavenProject mavenProject = null; - + List reactorProjects = getReactorProjects( performTask ); + + ReleaseResult result = releaseManager.performWithResult( descriptor, settings, reactorProjects, listener ); + + //override to show the actual start time + result.setStartTime( getStartTime() ); + + if ( result.getResultCode() == ReleaseResult.SUCCESS ) + { + continuumReleaseManager.getPreparedReleases().remove( performTask.getReleaseId() ); + } + + continuumReleaseManager.getReleaseResults().put( performTask.getReleaseId(), result ); + } + + protected List getReactorProjects( PerformReleaseProjectTask releaseTask ) + throws TaskExecutionException + { + List reactorProjects; + ReleaseDescriptor descriptor = releaseTask.getDescriptor(); + + if ( StringUtils.isEmpty( descriptor.getWorkingDirectory() ) ) + { + //Perform with provided release parameters (CONTINUUM-1541) + descriptor.setCheckoutDirectory( releaseTask.getBuildDirectory().getAbsolutePath() ); + return null; + } + try { - mavenProject = getMavenProject( performTask ); - if( mavenProject != null ) - { - descriptor.setRootProjectPath( ReleaseUtil.getRootProjectPath( mavenProject ) ); - reactorProjects = getReactorProjects( descriptor, mavenProject ); - } + reactorProjects = getReactorProjects( descriptor ); } - catch ( ContinuumReleaseException e ) + catch ( ContinuumReleaseException e ) { ReleaseResult result = createReleaseResult(); result.appendError( e ); - continuumReleaseManager.getReleaseResults().put( performTask.getReleaseId(), result ); + continuumReleaseManager.getReleaseResults().put( releaseTask.getReleaseId(), result ); - performTask.getListener().error( e.getMessage() ); + releaseTask.getListener().error( e.getMessage() ); throw new TaskExecutionException( "Failed to build reactor projects.", e ); } - ReleaseResult result = releaseManager.performWithResult( descriptor, settings, reactorProjects, listener ); - - //override to show the actual start time - result.setStartTime( getStartTime() ); - - if ( result.getResultCode() == ReleaseResult.SUCCESS ) - { - continuumReleaseManager.getPreparedReleases().remove( performTask.getReleaseId() ); - } - - continuumReleaseManager.getReleaseResults().put( performTask.getReleaseId(), result ); + return reactorProjects; } /** * @todo remove and use generate-reactor-projects phase */ - protected List getReactorProjects( ReleaseDescriptor descriptor, MavenProject project ) + protected List getReactorProjects( ReleaseDescriptor descriptor ) throws ContinuumReleaseException { List reactorProjects = new ArrayList(); - - reactorProjects.add( project ); - addModules( reactorProjects, project ); + MavenProject project; + try + { + project = projectBuilder.build( getProjectDescriptorFile( descriptor ), getLocalRepository(), + getProfileManager( settings ) ); + + reactorProjects.add( project ); + + addModules( reactorProjects, project ); + } + catch ( ProjectBuildingException e ) + { + throw new ContinuumReleaseException( "Failed to build project.", e ); + } try { @@ -218,30 +238,4 @@ public class PerformReleaseTaskExecutor { container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY ); } - - protected MavenProject getMavenProject( PerformReleaseProjectTask releaseTask ) - throws ContinuumReleaseException - { - ReleaseDescriptor descriptor = releaseTask.getDescriptor(); - - if ( StringUtils.isEmpty( descriptor.getWorkingDirectory() ) ) - { - //Perform with provided release parameters (CONTINUUM-1541) - descriptor.setCheckoutDirectory( releaseTask.getBuildDirectory().getAbsolutePath() ); - return null; - } - - MavenProject project; - try - { - project = projectBuilder.build( getProjectDescriptorFile( descriptor ), getLocalRepository(), - getProfileManager( settings ) ); - } - catch ( ProjectBuildingException e ) - { - throw new ContinuumReleaseException( "Failed to build project.", e ); - } - - return project; - } }