You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/12/05 00:34:06 UTC
svn commit: r723493 - in /continuum/trunk: ./ continuum-docs/src/site/xdoc/
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/lo...
Author: olamy
Date: Thu Dec 4 15:34:05 2008
New Revision: 723493
URL: http://svn.apache.org/viewvc?rev=723493&view=rev
Log:
merge -r 723486:723487 from 1.2.x branch
Modified:
continuum/trunk/ (props changed)
continuum/trunk/continuum-docs/src/site/xdoc/ (props changed)
continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
Propchange: continuum/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 4 15:34:05 2008
@@ -1 +1 @@
-/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119
+/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487
Propchange: continuum/trunk/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 4 15:34:05 2008
@@ -1,2 +1,2 @@
-/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
+/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
/continuum/trunk/continuum-docs/src/site/xdoc:690494-690520
Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=723493&r1=723492&r2=723493&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Thu Dec 4 15:34:05 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/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=723493&r1=723492&r2=723493&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 Dec 4 15:34:05 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/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=723493&r1=723492&r2=723493&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Thu Dec 4 15:34:05 2008
@@ -666,6 +666,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/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=723493&r1=723492&r2=723493&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Thu Dec 4 15:34:05 2008
@@ -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>