continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
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 GMT
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 <<<scm>>> entry
+    The source code control system you use must be specified in your POM file in an <<<\<scm\>>>> entry
     similar to the one shown here:
-    
-+----------------------------------------------------------------------------------+       
+
++----------------------------------------------------------------------------------+
         <scm>
           <connection>
             scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk
@@ -46,19 +49,26 @@ Releasing Projects
           <url>http://svn.apache.org/viewcvs.cgi/maven/components/trunk</url>
         </scm>
 +---------------------------------------------------------------------------------+
-    
-    To determine what to enter for your connection URL (the "<<< \<connection\> >>>" tag) go to the link
+
+    To determine what to enter for your connection URL (the <<<\<connection\>>>> 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:<scm_provider><delimiter><provider_specific_part> >>>
-    
-    In the example above, the <<<scm_provider>>> is "<<<svn>>>" (Subversion). The <<<delimiter>>> is a colon.
-    And the rest of the line is the "<<<provider_specific_part>>>".
-    
+
+    In the example above, the <<<scm_provider>>> is <<<svn>>> (Subversion). The <<<delimiter>>> is a colon.
+    And the rest of the line is the <<<provider_specific_part>>>.
+
     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 <<Releases>> button under the <<Distributed Builds>> 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 <<Perform Release>> and the version number
 
 [../../images/release-choose-perform-goal.png]
 
- Fill in the form and click Submit
+ Fill in the form and click <<Submit>>
+
+ To specify a different Maven goal to execute during the release, fill in the <<Perform Goals>> field with another goal.
+ By default, the goal for this field is <<<clean deploy>>>.
+
+ To specify additional arguments during execution, fill in the <<Arguments>> field.
 
 [../../images/release-perform-parameters.png]
 
- Wait for the process to complete, then click Done.
+ Wait for the process to complete, then click <<Done>>.
 
 [../../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 <<Project Group Summary>> and click the <<Release>> button or icon.
 
 [../../images/release-project-group-summary.png] Release
 
- Choose "Prepare project for release" and click "Submit"
+ Choose <<Prepare project for release>> and click <<Submit>>.
 
 [../../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 <<Use edit mode>> checkbox if you are using an SCM system that requires you to obtain a lock before editing.
 
- Click Submit.
+ Click <<Submit>>.
+ 
+ <<Note:>> When releasing in a {{{../../administrator_guides/distributed-builds.html} distributed builds}} setup, a <<Build environment>>
+ 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 <<Done>>.
+
+ <<Note:>> Hitting the <<Rollback>> button does not roll back or delete the SCM tag created during the <<<scm-tag>>> 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
 
-    <<Release Results>> tab from the <<Project Information>> page displays all the release results of a
-    project when executing release goals prepare and perform.
+    The <<Release Results>> tab from the <<Project Information>> 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 <<View Result>> link in-line with the release goal being executed.
+    
+    The <<Triggered by>> 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 <<Delete>>.
\ No newline at end of file
+    To delete release results, select the boxes beside the project name then click <<Delete>>.

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 <<Queues>> link under the <<Administration>> section
+  Click the <<Queues>> link under the <<Administration>> 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 @@
 <document outputName="apache-continuum">
 
  <meta>
-   <title>Apache Continuum</title>
+   <title>Apache Continuum ${project.version}</title>
    <author>The Apache Continuum Project</author>
  </meta>
 
@@ -34,14 +34,9 @@
        <item name="Installation" ref="installation/installation.html"/>
          <item name="Standalone" ref="installation/standalone.html"/>
          <item name="Tomcat" ref="installation/tomcat.html"/>
-         <item name="JBoss" ref="installation/jboss.html"/>
-         <item name="Jetty" ref="installation/jetty.html"/>
-         <item name="Geronimo" ref="installation/geronimo.html"/>
-         <item name="Glassfish" ref="installation/glassfish.html"/>
-       <item name="Release Notes" ref="installation/release-notes.html"/>
        <item name="Upgrade" ref="installation/upgrade.html"/>
 
-     <item name="User's Guides" collapse="true" ref="user_guides/index.html"/>
+     <item name="User's Guides" ref="user_guides/index.html"/>
        <item name="Managing Projects" ref="user_guides/managing_project/index.html"/>
          <item name="Add a Project" ref="user_guides/managing_project/addProject.html"/>
          <item name="Edit a Project" ref="user_guides/managing_project/editProject.html"/>
@@ -56,13 +51,19 @@
          <item name="MSN Notification" ref="user_guides/notification/msn.html"/>
          <item name="Wagon Notification" ref="user_guides/notification/wagon.html"/>
        <item name="Building a project" ref="user_guides/building_project/index.html"/>
+         <item name="Scheduled Build" ref="user_guides/building_project/schedule_build.html"/>
+         <item name="Forced Build" ref="user_guides/building_project/forced_build.html"/>
+         <item name="Build Results Management" ref="user_guides/building_project/build_results.html"/>
        <item name="Release Management" ref="user_guides/release/index.html"/>
+         <item name="Prepare Project Release" ref="user_guides/release/prepare.html"/>
+         <item name="Perform Project Release" ref="user_guides/release/perform.html"/>
+         <item name="Release Results Management" ref="user_guides/release/release_results.html"/>
 
      <item name="Administrator's Guides" ref="administrator_guides/index.html"/>
        <item name="Managing Users and Security" ref="administrator_guides/security/index.html"/>
          <item name="Security Configuration" ref="administrator_guides/security/customising-security.html"/>
          <item name="LDAP Configuration" ref="administrator_guides/security/ldap.html"/>
-       <item name="Adding Project Group" ref="administrator_guides/projectgroup.html"/>
+       <item name="Managing Project Groups" ref="administrator_guides/projectgroup.html"/>
        <item name="Managing Builders" ref="administrator_guides/builder.html"/>
        <item name="Managing JDKs" ref="administrator_guides/jdk.html"/>
        <item name="Managing Build Environments" ref="administrator_guides/profiles.html"/>
@@ -71,11 +72,20 @@
        <item name="Managing Local Repositories" ref="administrator_guides/localRepository.html"/>
        <item name="Managing Purge Configuration" ref="administrator_guides/purgeConfiguration.html"/>
        <item name="Managing Parallel Builds" ref="administrator_guides/parallelBuilds.html"/>
+       <item name="Managing Build Queues" ref="administrator_guides/buildQueue.html"/>
+       <item name="Managing Build Agents" ref="administrator_guides/build-agents.html"/>
+       <item name="Managing Build Agent Groups" ref="administrator_guides/build-agent-groups.html"/>
+       <item name="Managing Project Queues" ref="administrator_guides/queues.html"/>
        <item name="External databases" ref="administrator_guides/external-db.html"/>
        <item name="Monitoring Continuum" ref="administrator_guides/monitoring.html"/>
+       <item name="Log Files" ref="administrator_guides/logging.html"/>
+         <item name="Audit Logs" ref="administrator_guides/audit-logs.html"/>
+         <item name="Continuum Logs" ref="administrator_guides/continuum-logs.html"/>
+         <item name="Security Logs" ref="administrator_guides/security-logs.html"/>
        <item name="Appearance Configuration" ref="administrator_guides/appearance.html"/>
        <item name="Build Definition Template" ref="administrator_guides/builddefTemplate.html"/>
        <item name="Shutdown Continuum" ref="administrator_guides/shutdown.html"/>
+       <item name="Understanding Distributed Builds" ref="administrator_guides/distributed-builds.html"/>
 
      <item name="Developer's Guides" ref="developer_guides/index.html"/>
        <item name="Building Continuum" ref="developer_guides/building.html"/>

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 @@
 <project name="Apache Continuum">
   <body>
     <breadcrumbs>
-      <item name="1.3.2" href="/" />
+      <item name="${project.version}" href="/" />
     </breadcrumbs>
+
     <menu name="Documentation">
       <item name="Index (category)" href="index.html"/>
       <item name="Getting Started" href="getting-started.html"/>
+
       <item name="Installation/Upgrade Guides" href="installation/index.html" collapse="true">
         <item name="System Requirements" href="installation/requirements.html"/>
         <item name="Installation" href="installation/installation.html" collapse="true">
           <item name="Standalone" href="installation/standalone.html"/>
           <item name="Tomcat" href="installation/tomcat.html"/>
-          <item name="JBoss" href="installation/jboss.html"/>
-          <item name="Jetty" href="installation/jetty.html"/>
-          <item name="Geronimo" href="installation/geronimo.html"/>
-          <item name="Glassfish" href="installation/glassfish.html"/>
         </item>
-        <item name="Release Notes" href="installation/release-notes.html"/>
+        <item name="Release Notes" href="release-notes.html"/>
         <item name="Upgrade" href="installation/upgrade.html"/>
       </item>
+
       <item name="User's Guides" collapse="true" href="user_guides/index.html">
-        <item name="Getting Started" href="getting-started.html"/>
         <item name="Managing Projects" href="user_guides/managing_project/index.html" collapse="true">
           <item name="Add a Project" href="user_guides/managing_project/addProject.html"/>
           <item name="Edit a Project" href="user_guides/managing_project/editProject.html"/>
           <item name="Remove a Project" href="user_guides/managing_project/removeProject.html"/>
+          <item name="Working Copy" href="user_guides/managing_project/workingCopy.html"/>
           <!-- item name="SCM security hints"/ -->
         </item>
         <item name="Managing Build Definitions" href="user_guides/managing_builddef/index.html" collapse="true">
@@ -71,35 +70,47 @@
           <item name="Release Results Management" href="user_guides/release/release_results.html"/>
         </item>
       </item>
+
       <item name="Administrator's Guides" href="administrator_guides/index.html" collapse="true">
         <item name="Managing Users and Security" href="administrator_guides/security/index.html" collapse="true">
           <item name="Security Configuration" href="administrator_guides/security/customising-security.html"/>
           <item name="LDAP Configuration" href="administrator_guides/security/ldap.html"/>
         </item>
-        <item name="Adding Project Group" href="administrator_guides/projectgroup.html"/>
+        <item name="Managing Project Groups" href="administrator_guides/projectgroup.html"/>
         <item name="Managing Builders" href="administrator_guides/builder.html"/>
         <item name="Managing JDKs" href="administrator_guides/jdk.html"/>
-        <item name="Managing Build Environments" href="administrator_guides/profiles.html"/>
+        <item name="Managing Build Environments" href="administrator_guides/buildEnvironment.html"/>
         <item name="Managing Schedules" href="administrator_guides/schedules.html"/>
         <item name="Managing General Configuration" href="administrator_guides/configuration.html"/> <!-- (configuration and appearance) -->
         <item name="Managing Local Repositories" href="administrator_guides/localRepository.html"/>
         <item name="Managing Purge Configuration" href="administrator_guides/purgeConfiguration.html"/>
-        <item name="Managing Parallel Builds" href="administrator_guides/parallelBuilds.html"/>
+        <item name="Managing Parallel Builds" href="administrator_guides/parallelBuilds.html">
+        </item>
+        <item name="Managing Build Queues" href="administrator_guides/buildQueue.html"/>
         <item name="Managing Build Agents" href="administrator_guides/build-agents.html"/>
         <item name="Managing Build Agent Groups" href="administrator_guides/build-agent-groups.html"/>
+        <item name="Managing Project Queues" href="administrator_guides/queues.html"/>
         <item name="External databases" href="administrator_guides/external-db.html"/>
         <item name="Monitoring Continuum" href="administrator_guides/monitoring.html"/>
+        <item name="Log Files" href="administrator_guides/logging.html" collapse="true">
+          <item name="Audit Logs" href="administrator_guides/audit-logs.html" />
+          <item name="Continuum Logs" href="administrator_guides/continuum-logs.html" />
+          <item name="Security Logs" href="administrator_guides/security-logs.html" />
+        </item>
         <item name="Appearance Configuration" href="administrator_guides/appearance.html"/>
-        <item name="Build Definition Template" href="administrator_guides/builddefTemplate.html"/>        
+        <item name="Build Definition Template" href="administrator_guides/builddefTemplate.html"/>
         <item name="Shutdown Continuum" href="administrator_guides/shutdown.html"/>
         <item name="Understanding Distributed Builds" href="administrator_guides/distributed-builds.html"/>
       </item>
+
       <item name="Developer's Guides" href="developer_guides/index.html" collapse="true">
         <!-- item name="SVN repository structure" href="developer_guides/svn.html"/ -->
         <item name="Building Continuum" href="developer_guides/building.html"/>
         <!-- item name="Design" href="developer_guides/design.html"/ -->
         <item name="XML-RPC" href="developer_guides/xmlrpc.html"/>
       </item>
+
+      <item name="PDF" href="apache-continuum.pdf"/>
     </menu>
   </body>
 </project>

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 @@
   </properties>  
 <body>
 
-  <h2>Apache Continuum 1.3.2 Release Notes</h2>
+  <h2>Apache Continuum 1.4.0 Release Notes</h2>
   
-  <p>The Apache Continuum team is pleased to announce Apache Continuum 1.3.2.</p>
+  <p>The Apache Continuum team is pleased to announce Apache Continuum 1.4.0.</p>
 
-  <p>Apache Continuum 1.3.2 includes the following new features:</p>
+  <p>This release includes the following new features:</p>
 
-  <p><b>Scm Comment Prefix for Release Prepare</b> -- Ability to configure the scm comment prefix through the web UI for release prepare.</p>
-
-  <p><b>Build Agent Group</b> -- Build agents can now be assigned to a specific project build.</p>
+  <p><b>Improved user recognition</b> - information on who executed releases and forced builds, and better handling of sending notifications to developers who made a change</p>
 
   <p>To learn more about how the Continuum dev team versions releases, see our
       <a href="http://continuum.apache.org/development/release.html">release guidelines</a>.</p>  
 
-  <h2>Release Notes - Continuum - Version 1.3.2</h2>
-
-  <h2>        Sub-task
-  </h2>
-  <ul>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1499'>CONTINUUM-1499</a>] -         Translate to Brazilian Portuguese
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2057'>CONTINUUM-2057</a>] -         Update Project From Working Copy
-  </li>
-  </ul>
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1578'>CONTINUUM-1578</a>] -         No output after a successful perform release
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2114'>CONTINUUM-2114</a>] -         cannot login with perforce scm until new version of scm is included
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2170'>CONTINUUM-2170</a>] -         No such object error when forcing a build from the group-level Build Definitions tab
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2267'>CONTINUUM-2267</a>] -         Error with backslash in Windows path for inatallation tests
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2270'>CONTINUUM-2270</a>] -         Selenium tests fail when run with JDK 1.6
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2285'>CONTINUUM-2285</a>] -         Queues page turns to blank if build queues are not empty
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2349'>CONTINUUM-2349</a>] -         Project should only build in agents that are in the Build agent group assigned to it
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2371'>CONTINUUM-2371</a>] -         Unable to view queues after loss of build agent
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2381'>CONTINUUM-2381</a>] -         Project is not building even when there is an enabled build agent configured
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2386'>CONTINUUM-2386</a>] -         Build environment selection is ignored when releasing with distributed build enabled
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2391'>CONTINUUM-2391</a>] -         Master should not pass full path to local repository to the agent
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2395'>CONTINUUM-2395</a>] -         Build Environment accepts duplicate name during edit
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2397'>CONTINUUM-2397</a>] -         Unable to edit the added local repository
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2440'>CONTINUUM-2440</a>] -         Unable to download html file from working copy
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2450'>CONTINUUM-2450</a>] -         Intermittent error when releasing in a distributed build
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2451'>CONTINUUM-2451</a>] -         Unable to release a project using the &quot;provide parameters&quot; option with distributed builds
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2466'>CONTINUUM-2466</a>] -         authorization failed when building ant / shell projects
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2474'>CONTINUUM-2474</a>] -         Fix selenium failing test in windows
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2476'>CONTINUUM-2476</a>] -         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
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2479'>CONTINUUM-2479</a>] -         Link to cron-help is wrong
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2487'>CONTINUUM-2487</a>] -         Selenium tests fail if run at certain times crossing the 'on the hour' default schedule trigger
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2490'>CONTINUUM-2490</a>] -         Getting permission denied when running selenium tests in IE
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2493'>CONTINUUM-2493</a>] -         &quot;Users Wiki&quot; link on home page points at old wiki
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2494'>CONTINUUM-2494</a>] -         Unable to build a project even though the build agent is there.
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2504'>CONTINUUM-2504</a>] -         Queues page shows distributedBuild.table.agentUrl for the Agent URL field instead of the actual value
+</li>
+</ul>
     
-  <h2>        Bug
-  </h2>
-  <ul>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1503'>CONTINUUM-1503</a>] -         scm release tag default should match what the release plugin uses
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1504'>CONTINUUM-1504</a>] -         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
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1505'>CONTINUUM-1505</a>] -         release perform page does not use defaults specified in pom for release plugin for goals and useReleaseProfile
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1887'>CONTINUUM-1887</a>] -         Release rollback hangs when the release failed at the scm-check-modifications phase
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1909'>CONTINUUM-1909</a>] -         login and password ignored in checkout operation
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1918'>CONTINUUM-1918</a>] -         Username and Password should be optional on project release form (Subversion projects)
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1972'>CONTINUUM-1972</a>] -         Error attempting to delete project group
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2015'>CONTINUUM-2015</a>] -         Deleting Purge Configuration doesn't ask for confirmation upon deletion
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2038'>CONTINUUM-2038</a>] -         Some dojo js files are missing
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2047'>CONTINUUM-2047</a>] -         Can't edit or delete PROJECT build Definition
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2048'>CONTINUUM-2048</a>] -         Parallel Build Queue Name accepts null value
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2050'>CONTINUUM-2050</a>] -         Available Templates has &quot;false&quot; on top of delete icon
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2053'>CONTINUUM-2053</a>] -         Problem with french characters
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2055'>CONTINUUM-2055</a>] -         link to data management cli broken in migration doc
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2058'>CONTINUUM-2058</a>] -         Editing an Installation , page dont change
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2059'>CONTINUUM-2059</a>] -         Dont validate envirotment name when create installation with 'Create a Build Environment Installation with the name'
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2064'>CONTINUUM-2064</a>] -         Default Build Enviroment List don't show installations
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2065'>CONTINUUM-2065</a>] -         Wrong content in Other Changes Since Last Success section of build results
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2067'>CONTINUUM-2067</a>] -         Error while deleting project caused by SCM RESULT dependency foreign key constraint violation
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2072'>CONTINUUM-2072</a>] -         Take care of the platform's default encoding when building continuum
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2077'>CONTINUUM-2077</a>] -         Project Scm Root is not deleted even when you delete the projects.
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2090'>CONTINUUM-2090</a>] -         Stack Overflow error when preparing project for release
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2102'>CONTINUUM-2102</a>] -         Unable to configure subject line for email notifications
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2107'>CONTINUUM-2107</a>] -         Send on SCM Failure is duplicated on the Add/Edit Mail Notifier page
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2112'>CONTINUUM-2112</a>] -         Incorrect title page of Add/Edit Parallel Build Queue
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2118'>CONTINUUM-2118</a>] -         update code that checks isLocked() to also check isPasswordChangeRequired() as well
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2120'>CONTINUUM-2120</a>] -         Unable to build project after scm error
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2124'>CONTINUUM-2124</a>] -         NPE when building Shell or Ant project
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2126'>CONTINUUM-2126</a>] -         Edit Project Group moving a project to other project group fail
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2129'>CONTINUUM-2129</a>] -         ClassNotFoundException when using the XML-RPC client
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2130'>CONTINUUM-2130</a>] -         Unable to notify latest committers only
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2134'>CONTINUUM-2134</a>] -         Deleting a project group-level notifier with recipient latest committers prompts Are you sure you want to delete the mail notifier with recipient &quot;&quot;? 
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2135'>CONTINUUM-2135</a>] -         Missing confirmation when deleting a project-level notifier from the group-level Notifiers tab
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2139'>CONTINUUM-2139</a>] -         Creating a Mail notifier incorrectly allows only spaces in the email address
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2140'>CONTINUUM-2140</a>] -         Some continuum objects are missing during backup/restore
-  </li>
-  </ul>
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-493'>CONTINUUM-493</a>] -         Allow to add all developpers address in a notifier without duplicate developpers addresses
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-565'>CONTINUUM-565</a>] -         Forced builds should say who (which continuum user) forced the build
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2160'>CONTINUUM-2160</a>] -         Upgrade to last scm version (1.2) and last release-manager version
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2373'>CONTINUUM-2373</a>] -         Distributed Master needs more detailed logging
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2458'>CONTINUUM-2458</a>] -         Continuum Release should do a checkout if there is no working copy
+</li>
+</ul>
     
-  <h2>        Improvement
-  </h2>
-  <ul>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1321'>CONTINUUM-1321</a>] -         Improve error message when perform release fails due to missing distributionManagement
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1726'>CONTINUUM-1726</a>] -         Project description (as given in POM) should be visible
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1823'>CONTINUUM-1823</a>] -         Fewer notifications when Subversion server is unreachable 
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2005'>CONTINUUM-2005</a>] -         Go the &quot;Project Build tab&quot; from the &quot;Build Queue&quot; page
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2020'>CONTINUUM-2020</a>] -         Remove the local repository column from the project groups page
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2027'>CONTINUUM-2027</a>] -         The i18n patch for zh_CN
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2028'>CONTINUUM-2028</a>] -         Continuum release prepare should use maven-release-plugin scmCommentPrefix configuration in pom
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2042'>CONTINUUM-2042</a>] -         Ability to control which projects build on which agents
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2043'>CONTINUUM-2043</a>] -         Release should happen on a build agent rather than on the master
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2051'>CONTINUUM-2051</a>] -         Add  confirmation upon deletion in Parallel Build Queue 
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2052'>CONTINUUM-2052</a>] -         Delete Confirmation Pages for Installation, Build Definition Templates
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2061'>CONTINUUM-2061</a>] -         Typo on Project Groups's message prompts
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2070'>CONTINUUM-2070</a>] -         add a check if project should build or not
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2087'>CONTINUUM-2087</a>] -         Viewing of working copy from build agent
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2109'>CONTINUUM-2109</a>] -         [Roles] Change continuum-manage-purging and continuum-manage-repositories user role names to Continuum Manage Purging and Continuum Manage Local Repositories
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2125'>CONTINUUM-2125</a>] -         add security audit log
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2127'>CONTINUUM-2127</a>] -         Configuration for Distributed Build should be visible only if Distributed Build is enabled
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2136'>CONTINUUM-2136</a>] -         Show error message when build agent is removed or disabled
-  </li>
-  </ul>
+<h2>        New Feature
+</h2>
+<ul>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2265'>CONTINUUM-2265</a>] -         Need information on who executed a release
+</li>
+</ul>
     
-  <h2>        New Feature
-  </h2>
-  <ul>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2054'>CONTINUUM-2054</a>] -         Ability to configure the scm comment prefix through the web UI for release prepare
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2068'>CONTINUUM-2068</a>] -         Build Agent group functionality
-  </li>
-  </ul>
+<h2>        Task
+</h2>
+<ul>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2252'>CONTINUUM-2252</a>] -         Add documentation for Selenium tests
+</li>
+</ul>
     
-  <h2>        Task
-  </h2>
-  <ul>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2116'>CONTINUUM-2116</a>] -         Upgrade to Redback 1.2 release
-  </li>
-  <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2137'>CONTINUUM-2137</a>] -         Update documentation for new Build Agent Group functionality
-  </li>
-  </ul>
-
-Have Fun !
-<br/><br/>
---<br/>
-The Apache Continuum Team  
+<h2>        Test
+</h2>
+<ul>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2073'>CONTINUUM-2073</a>] -         Revive the automated Selenium integration tests
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2268'>CONTINUUM-2268</a>] -         Continuum Webapp Tests Capture Screenshot for AbstractSeleniumTest.java
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2271'>CONTINUUM-2271</a>] -         Continuum Build Agent Tests and Improvement on Build Queue Test
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2378'>CONTINUUM-2378</a>] -         Selenium Test for deleting projects and project groups
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2467'>CONTINUUM-2467</a>] -         Selenium test: check for project group SCM update when building projects
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2482'>CONTINUUM-2482</a>] -         Replace the use of Thread.sleep to Selenium waitForCondition
+</li>
+</ul>
 
 </body>
-</document>
\ No newline at end of file
+</document>

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.
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-jetty</artifactId>
   <packaging>pom</packaging>
@@ -49,12 +49,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api-2.5</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.0</artifactId>
+      <artifactId>jsp-2.1-jetty</artifactId>
       <scope>runtime</scope>
     </dependency>    
     <dependency>
@@ -72,43 +67,6 @@ under the License.
       <artifactId>mail</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-compiler</artifactId>
-      <scope>runtime</scope>
-    </dependency>    
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-runtime</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-compiler-jdt</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>      
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -122,7 +80,6 @@ under the License.
               <mainClass>org.mortbay.start.Main</mainClass>
               <commandLineArguments>
                 <commandLineArgument>conf/jetty.xml</commandLineArgument>
-                <commandLineArgument>conf/jetty-logging.xml</commandLineArgument> 
               </commandLineArguments>
               <platforms>
                 <platform>jsw</platform>
@@ -145,15 +102,15 @@ under the License.
                     </property>
                     <property>
                       <name>wrapper.logfile</name>
-                      <value>%CONTINUUM_BASE%/logs/wrapper.log</value>
+                      <value>%CONTINUUM_BASE%/logs/wrapper.YYYYMMDD.log</value>
                     </property>
                     <property>
-                      <name>wrapper.app.parameter.2</name>
-                      <value>%CONTINUUM_BASE%/conf/jetty.xml</value>
+                      <name>wrapper.logfile.rollmode</name>
+                      <value>DATE</value>
                     </property>
                     <property>
-                      <name>wrapper.app.parameter.3</name>
-                      <value>%CONTINUUM_BASE%/conf/jetty-logging.xml</value>
+                      <name>wrapper.app.parameter.2</name>
+                      <value>%CONTINUUM_BASE%/conf/jetty.xml</value>
                     </property>
                     <property>
                       <name>app.base.envvar</name>

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.
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-model</artifactId>
@@ -39,33 +39,16 @@ under the License.
               <goal>java</goal>
               <goal>stax-reader</goal>
               <goal>stax-writer</goal>
-              <goal>jpox-metadata-class</goal>
             </goals>
           </execution>
-          <execution>
-            <id>jpox-jdo-mapping</id>
-            <goals>
-              <goal>jpox-jdo-mapping</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>jpox-jdo-mapping-replication</id>
-            <goals>
-              <goal>jpox-jdo-mapping</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
-              <replicationParameters>true</replicationParameters>
-            </configuration>
-          </execution>
         </executions>
         <configuration>
           <version>1.4.0</version>
           <packageWithVersion>false</packageWithVersion>
-          <model>src/main/mdo/continuum.xml</model>
+          <models>
+            <model>src/main/mdo/continuum.xml</model>
+          </models>
+          <useJava5>true</useJava5>
         </configuration>
       </plugin>
       <plugin>
@@ -79,6 +62,24 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <copy file="target/classes/META-INF/package.jdorepl" todir="target/classes" />
+                <copy file="target/classes/META-INF/package.jdo" todir="target/classes" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

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 @@
           <version>1.1.0+</version>
           <type>String</type>
         </field>
-        <field>
-          <name>checkedOutInSingleDirectory</name>
-          <version>1.4.0+</version>
-          <type>boolean</type>
-          <defaultValue>false</defaultValue>
-        </field>
         <field jpox.mapped-by="project" jpox.fetch-groups="project-with-builds">
           <name>buildResults</name>
           <version>1.0.9+</version>
@@ -591,6 +585,11 @@
           <version>1.0.9</version>
           <type>int</type>
         </field>
+        <field>
+          <name>username</name>
+          <version>1.4.0+</version>
+          <type>String</type>
+        </field>
         <field jpox.column="resultstate">
           <name>state</name>
           <version>1.1.0+</version>
@@ -1031,7 +1030,13 @@
           <description>
             true if this buildDefinition is a template
           </description>
-        </field>        
+        </field>
+        <field jpox.null-value="default">
+          <name>updatePolicy</name>
+          <version>1.4.0+</version>
+          <type>int</type>
+          <defaultValue>0</defaultValue>
+        </field>
       </fields>
     </class>
     <class>
@@ -1646,6 +1651,11 @@
           <version>1.1.2+</version>
           <type>String</type>
         </field>
+        <field>
+          <name>username</name>
+          <version>1.4.0+</version>
+          <type>String</type>
+        </field>
       </fields>
     </class> 
 

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 @@
       </field>
     </class>
   </package>
-  <package name="org.apache.maven.continuum.model.project">
-    <class name="Project">
-      <field name="checkedOutInSingleDirectory" null-value="default">
-        <column jdbc-type="CHAR" default-value="N" />
-      </field>
-    </class>
-  </package>
 </orm>

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.
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-api</artifactId>

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.
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-irc</artifactId>

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.
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-jabber</artifactId>

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.
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-msn</artifactId>

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.
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-wagon</artifactId>

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.
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifiers</artifactId>

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.
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-purge</artifactId>
   <name>Continuum :: Purge System</name>
@@ -134,12 +134,21 @@ under the License.
         <executions>
           <execution>
             <id>generate</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>
           </execution>
           <execution>
             <id>merge</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
+                <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
+              </descriptors>
+              <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
+            </configuration>
             <goals>
               <goal>merge-descriptors</goal>
             </goals>

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<DirectoryPurgeConfiguration> getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId )
+    {
+        return directoryPurgeConfigurationDao.getEnableDirectoryPurgeConfigurationsBySchedule( scheduleId );
+    }
 
     public List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsByRepository( int repositoryId )
     {
@@ -219,6 +224,11 @@ public class DefaultPurgeConfigurationSe
     {
         return repositoryPurgeConfigurationDao.getRepositoryPurgeConfigurationsBySchedule( scheduleId );
     }
+    
+    public List<RepositoryPurgeConfiguration> 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<ArtifactReference> 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.
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-release</artifactId>
   <name>Continuum :: Release System</name>
@@ -121,7 +121,8 @@ under the License.
           <models>
             <model>src/main/mdo/prepared-releases.mdo</model>
           </models>
-          <version>1.0.0</version>
+          <version>1.4.0</version>
+          <useJava5>true</useJava5>
         </configuration>
         <executions>
           <execution>

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<MavenProject> 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<MavenProject> getReactorProjects( PerformReleaseProjectTask releaseTask )
+        throws TaskExecutionException
+    {
+        List<MavenProject> 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<MavenProject> getReactorProjects( ReleaseDescriptor descriptor, MavenProject project )
+    protected List<MavenProject> getReactorProjects( ReleaseDescriptor descriptor )
         throws ContinuumReleaseException
     {
         List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
-         
-        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;
-    }    
 }



Mime
View raw message