Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 52127 invoked from network); 4 Dec 2008 23:34:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2008 23:34:28 -0000 Received: (qmail 88727 invoked by uid 500); 4 Dec 2008 23:34:40 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 88717 invoked by uid 500); 4 Dec 2008 23:34:40 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 88707 invoked by uid 99); 4 Dec 2008 23:34:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Dec 2008 15:34:40 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Dec 2008 23:33:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3B0D42388878; Thu, 4 Dec 2008 15:34:07 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Thu, 04 Dec 2008 23:34:06 -0000 To: commits@continuum.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081204233407.3B0D42388878@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ +