continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r723487 - in /continuum/branches/continuum-1.2.x: continuum-release/src/main/java/org/apache/maven/continuum/release/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ continuum-webapp/src/main/resources/localization/ co...
Date Thu, 04 Dec 2008 23:13:18 GMT
Author: olamy
Date: Thu Dec  4 15:13:16 2008
New Revision: 723487

URL: http://svn.apache.org/viewvc?rev=723487&view=rev
Log:
[CONTINUUM-1958] useEditMode option when releasing 
Submitted by Mateus Pimenta


Modified:
    continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp

Modified: continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=723487&r1=723486&r2=723487&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
Thu Dec  4 15:13:16 2008
@@ -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 @@
         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 )

Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=723487&r1=723486&r2=723487&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
Thu Dec  4 15:13:16 2008
@@ -70,6 +70,8 @@
 
     private String scmTagBase;
 
+    private boolean scmUseEditMode = false;
+    
     private List projects = new ArrayList();
 
     private List projectKeys;
@@ -382,6 +384,7 @@
 
         p.setProperty( "tag", scmTag );
         p.setProperty( "prepareGoals", prepareGoals );
+        p.setProperty( "useEditMode", Boolean.toString( scmUseEditMode ) );
 
         return p;
     }
@@ -560,4 +563,16 @@
     {
         this.profileId = profileId;
     }
+
+	public boolean isScmUseEditMode() 
+	{
+		return scmUseEditMode;
+	}
+
+	public void setScmUseEditMode(boolean scmUseEditMode) 
+	{
+		this.scmUseEditMode = scmUseEditMode;
+	}
+    
+    
 }

Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=723487&r1=723486&r2=723487&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/resources/localization/Continuum.properties
Thu Dec  4 15:13:16 2008
@@ -663,6 +663,7 @@
 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

Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=723487&r1=723486&r2=723487&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
Thu Dec  4 15:13:16 2008
@@ -41,6 +41,7 @@
             <ww:textfield label="%{getText('releasePrepare.prepareGoals.label')}" name="prepareGoals"
required="true"/>
             <ww:select label="%{getText('releasePrepare.buildEnvironment.label')}" name="profileId"
list="profiles" listValue="name" 
                        listKey="id" headerKey="-1" headerValue=""/>
+			<ww:checkbox label="%{getText('releasePrepare.useEditMode.label')}" name="scmUseEditMode"
fieldValue="false"/>
           </table>
         </div>
 



Mime
View raw message