merge -r 723486:723487 from 1.2.x branch

git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk@723493 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 4, 2008 · bafb38b · bafb38b
1 parent a298487
commit bafb38b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/...ease/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java b/...ease/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.continuum.model.repository.LocalRepository;
 import org.apache.continuum.release.config.ContinuumReleaseDescriptor;
 import org.apache.maven.continuum.installation.InstallationService;
@@ -269,6 +270,12 @@ private ReleaseDescriptor getReleaseDescriptor( Project project, Properties rele
         descriptor.setDevelopmentVersions( devVersions );
         descriptor.setPreparationGoals( releaseProperties.getProperty( "prepareGoals" ) );
 
+        String useEditMode = releaseProperties.getProperty( "useEditMode" );
+        if ( BooleanUtils.toBoolean( useEditMode ) )
+        {
+            descriptor.setScmUseEditMode( Boolean.valueOf( useEditMode ) );
+        } 
+
         LocalRepository repository = project.getProjectGroup().getLocalRepository();
 
         if ( repository != null )

diff --git a/...nuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java b/...nuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
@@ -70,6 +70,8 @@ public class ReleasePrepareAction
 
     private String scmTagBase;
 
+    private boolean scmUseEditMode = false;
+
     private List projects = new ArrayList();
 
     private List projectKeys;
@@ -382,6 +384,7 @@ private Properties getReleaseProperties()
 
         p.setProperty( "tag", scmTag );
         p.setProperty( "prepareGoals", prepareGoals );
+        p.setProperty( "useEditMode", Boolean.toString( scmUseEditMode ) );
 
         return p;
     }
@@ -560,4 +563,16 @@ public void setProfileId( int profileId )
     {
         this.profileId = profileId;
     }
+
+	public boolean isScmUseEditMode() 
+	{
+		return scmUseEditMode;
+	}
+
+	public void setScmUseEditMode(boolean scmUseEditMode) 
+	{
+		this.scmUseEditMode = scmUseEditMode;
+	}
+
+
 }
diff --git a/continuum-webapp/src/main/resources/localization/Continuum.properties b/continuum-webapp/src/main/resources/localization/Continuum.properties
@@ -666,6 +666,7 @@ releasePrepare.scmTag.label=SCM Tag
 releasePrepare.scmTagBase.label=SCM Tag Base
 releasePrepare.prepareGoals.label=Preparation Goals
 releasePrepare.buildEnvironment.label=Build Environment
+releasePrepare.useEditMode.label=Use edit mode
 releasePerformFromScm.scmUrl.label=SCM Connection URL
 releasePerformFromScm.scmUsername.label=SCM Username
 releasePerformFromScm.scmPassword.label=SCM Password

diff --git a/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp b/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
@@ -41,6 +41,7 @@
             <s:textfield label="%{getText('releasePrepare.prepareGoals.label')}" name="prepareGoals" required="true"/>
             <s:select label="%{getText('releasePrepare.buildEnvironment.label')}" name="profileId" list="profiles" listValue="name"
                        listKey="id" headerKey="-1" headerValue=""/>
+			      <s:checkbox label="%{getText('releasePrepare.useEditMode.label')}" name="scmUseEditMode" fieldValue="false"/>
           </table>
         </div>