continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r740864 - in /continuum/trunk: continuum-docs/src/site/resources/images/ 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/res...
Date Wed, 04 Feb 2009 20:29:53 GMT
Author: wsmoak
Date: Wed Feb  4 20:29:53 2009
New Revision: 740864

URL: http://svn.apache.org/viewvc?rev=740864&view=rev
Log:
[CONTINUUM-2054] Ability to configure the scm comment prefix through the web UI for release
prepare.  Add a new field on releasePrepare.jsp, and pass the value through to the release
manager.  Updated image for docs.

Modified:
    continuum/trunk/continuum-docs/src/site/resources/images/release-prepare-parameters.png
    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

Modified: continuum/trunk/continuum-docs/src/site/resources/images/release-prepare-parameters.png
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/resources/images/release-prepare-parameters.png?rev=740864&r1=740863&r2=740864&view=diff
==============================================================================
Binary files - no diff available.

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=740864&r1=740863&r2=740864&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
Wed Feb  4 20:29:53 2009
@@ -293,6 +293,10 @@
         {
             descriptor.setScmPassword( releaseProperties.getProperty( "password" ) );
         }
+        if ( releaseProperties.containsKey( "commentPrefix" ) )
+        {
+            descriptor.setScmCommentPrefix( releaseProperties.getProperty( "commentPrefix"
) );
+        }
 
         //forced properties
         descriptor.setInteractive( false );

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=740864&r1=740863&r2=740864&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
Wed Feb  4 20:29:53 2009
@@ -71,6 +71,8 @@
 
     private String scmTagBase;
 
+    private String scmCommentPrefix;
+
     private boolean scmUseEditMode = false;
     
     private List projects = new ArrayList();
@@ -383,6 +385,11 @@
             p.setProperty( "tagBase", scmTagBase );
         }
 
+        if ( StringUtils.isNotEmpty( scmCommentPrefix ))
+        {
+            p.setProperty( "commentPrefix", scmCommentPrefix );
+        }
+
         p.setProperty( "tag", scmTag );
         p.setProperty( "prepareGoals", prepareGoals );
         p.setProperty( "useEditMode", Boolean.toString( scmUseEditMode ) );
@@ -574,6 +581,11 @@
 	{
 		this.scmUseEditMode = scmUseEditMode;
 	}
+
+    public void setScmCommentPrefix( String scmCommentPrefix )
+    {
+        this.scmCommentPrefix = scmCommentPrefix;
+    }
     
     
 }

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=740864&r1=740863&r2=740864&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Wed Feb  4 20:29:53 2009
@@ -677,6 +677,7 @@
 releasePrepare.scmPassword.label=SCM Password
 releasePrepare.scmTag.label=SCM Tag
 releasePrepare.scmTagBase.label=SCM Tag Base
+releasePrepare.scmCommentPrefix.label=SCM Comment Prefix
 releasePrepare.prepareGoals.label=Preparation Goals
 releasePrepare.buildEnvironment.label=Build Environment
 releasePrepare.useEditMode.label=Use edit mode

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=740864&r1=740863&r2=740864&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 Wed Feb
 4 20:29:53 2009
@@ -38,6 +38,7 @@
             <c:if test="${!empty (scmTagBase)}">
               <s:textfield label="%{getText('releasePrepare.scmTagBase.label')}" name="scmTagBase"/>
             </c:if>
+            <s:textfield label="%{getText('releasePrepare.scmCommentPrefix.label')}" name="scmCommentPrefix"/>
             <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=""/>



Mime
View raw message