continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r593584 - in /maven/continuum/trunk: continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java continuum-webapp/src/main/resources/xwork.xml
Date Fri, 09 Nov 2007 16:27:39 GMT
Author: evenisse
Date: Fri Nov  9 08:27:38 2007
New Revision: 593584

URL: http://svn.apache.org/viewvc?rev=593584&view=rev
Log:
[CONTINUUM-1541] Fix performed release with provided parameters

Modified:
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=593584&r1=593583&r2=593584&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
(original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
Fri Nov  9 08:27:38 2007
@@ -42,6 +42,7 @@
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 
 import java.io.File;
@@ -92,13 +93,22 @@
         continuumReleaseManager.getReleaseResults().put( performTask.getReleaseId(), result
);
     }
 
-    protected List getReactorProjects( ReleaseProjectTask releaseTask )
+    protected List<MavenProject> getReactorProjects( PerformReleaseProjectTask releaseTask
)
         throws TaskExecutionException
     {
-        List reactorProjects;
+        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
         {
-            reactorProjects = getReactorProjects( releaseTask.getDescriptor() );
+            reactorProjects = getReactorProjects( descriptor );
         }
         catch ( ContinuumReleaseException e )
         {
@@ -119,10 +129,10 @@
     /**
      * @todo remove and use generate-reactor-projects phase
      */
-    protected List getReactorProjects( ReleaseDescriptor descriptor )
+    protected List<MavenProject> getReactorProjects( ReleaseDescriptor descriptor )
         throws ContinuumReleaseException
     {
-        List reactorProjects = new ArrayList();
+        List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
 
         MavenProject project;
         try

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=593584&r1=593583&r2=593584&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Fri Nov  9 08:27:38
2007
@@ -464,6 +464,7 @@
       <result name="success" type="redirect-action">
         <param name="actionName">releaseInProgress</param>
         <param name="projectId">${projectId}</param>
+        <param name="releaseId">${releaseId}</param>
       </result>
     </action>
 



Mime
View raw message