You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2010/11/18 16:52:10 UTC
svn commit: r1036502 - in /continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action: ReleasePerformAction.java ReleasePrepareAction.java

Author: ctan
Date: Thu Nov 18 15:52:10 2010
New Revision: 1036502

URL: http://svn.apache.org/viewvc?rev=1036502&view=rev
Log:
[CONTINUUM-2420] display default values on the release input page when distributed builds is enabled

Modified:
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=1036502&r1=1036501&r2=1036502&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java Thu Nov 18 15:52:10 2010
@@ -40,6 +40,7 @@ import org.apache.maven.model.io.xpp3.Ma
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.shared.release.ReleaseResult;
 import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
@@ -341,9 +342,15 @@ public class ReleasePerformAction
     {
         useReleaseProfile = DistributedReleaseUtil.getUseReleaseProfile( context, useReleaseProfile );
 
-        goals = DistributedReleaseUtil.getPerformGoals( context, goals );
+        if ( StringUtils.isNotEmpty( DistributedReleaseUtil.getPerformGoals( context, goals ) ) )
+        {
+            goals = DistributedReleaseUtil.getPerformGoals( context, goals );
+        }
 
-        arguments = DistributedReleaseUtil.getArguments( context, "" );
+        if ( StringUtils.isNotEmpty( DistributedReleaseUtil.getArguments( context, "" ) ) )
+        {
+            arguments = DistributedReleaseUtil.getArguments( context, "" );
+        }
     }
 
     public String getReleaseId()

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=1036502&r1=1036501&r2=1036502&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Thu Nov 18 15:52:10 2010
@@ -583,15 +583,30 @@ public class ReleasePrepareAction
 
     private void getReleasePluginParameters( Map context )
     {
-        scmTag = DistributedReleaseUtil.getScmTag( context, scmTag );
+        if ( StringUtils.isNotEmpty( DistributedReleaseUtil.getScmTag( context, scmTag ) ) )
+        {
+            scmTag = DistributedReleaseUtil.getScmTag( context, scmTag );
+        }
 
-        scmTagBase = DistributedReleaseUtil.getScmTagBase( context, scmTagBase );
+        if ( StringUtils.isNotEmpty( DistributedReleaseUtil.getScmTagBase( context, scmTagBase ) ) )
+        {
+            scmTagBase = DistributedReleaseUtil.getScmTagBase( context, scmTagBase );
+        }
 
-        prepareGoals = DistributedReleaseUtil.getPrepareGoals( context, prepareGoals );
+        if ( StringUtils.isNotEmpty( DistributedReleaseUtil.getPrepareGoals( context, prepareGoals ) ) )
+        {
+            prepareGoals = DistributedReleaseUtil.getPrepareGoals( context, prepareGoals );
+        }
 
-        arguments = DistributedReleaseUtil.getArguments( context, "" );
+        if ( StringUtils.isNotEmpty( DistributedReleaseUtil.getArguments( context, "" ) ) )
+        {
+            arguments = DistributedReleaseUtil.getArguments( context, "" );
+        }
 
-        scmCommentPrefix = DistributedReleaseUtil.getScmCommentPrefix( context, "" );
+        if ( StringUtils.isNotEmpty( DistributedReleaseUtil.getScmCommentPrefix( context, "" ) ) )
+        {
+            scmCommentPrefix = DistributedReleaseUtil.getScmCommentPrefix( context, "" );
+        }
 
         autoVersionSubmodules = DistributedReleaseUtil.getAutoVersionSubmodules( context, false );