You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ep...@apache.org on 2006/09/25 11:39:22 UTC
svn commit: r449625 - in
/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ resources/
resources/localization/ resources/org/apache/maven/continuum/web/action/
webapp/
Author: epunzalan
Date: Mon Sep 25 02:39:21 2006
New Revision: 449625
URL: http://svn.apache.org/viewvc?view=rev&rev=449625
Log:
PR: CONTINUUM-904
- showed prompt for tagBase only when scm provider is svn
- added validation properties file for the release
- removed validation for username/password in release:perform part
Added:
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction.properties (with props)
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties (with props)
Modified:
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerform-validation.xml
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerformFromScm-validation.xml
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInProgress.jsp
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInitialized.jsp
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerform.jsp
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerformFromScm.jsp
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePrepare.jsp
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp
maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseViewResult.jsp
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java Mon Sep 25 02:39:21 2006
@@ -22,6 +22,7 @@
import org.apache.maven.continuum.release.DefaultReleaseManagerListener;
import org.apache.maven.plugins.release.ReleaseResult;
import org.apache.maven.plugins.release.config.ReleaseDescriptor;
+import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import java.io.File;
@@ -112,42 +113,23 @@
return execute();
}
- public String checkProgress()
+ private void populateFromProject()
throws Exception
{
- String status;
-
- ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
+ Project project = getContinuum().getProjectWithAllDetails( projectId );
- listener = (ContinuumReleaseManagerListener) releaseManager.getListeners().get( releaseId );
+ scmUrl = project.getScmUrl();
+ scmUsername = project.getScmUsername();
+ scmPassword = project.getScmPassword();
- if ( listener != null )
+ if ( scmUrl.startsWith( "scm:svn:" ) )
{
- if ( listener.getState() == ContinuumReleaseManagerListener.FINISHED )
- {
- status = "finished";
- }
- else
- {
- status = "inProgress";
- }
+ scmTagBase = new SvnScmProviderRepository( scmUrl, scmUsername, scmPassword ).getTagBase();
}
else
{
- throw new Exception( "There is no release on-going or finished with id: " + releaseId );
+ scmTagBase = "";
}
-
- return status;
- }
-
- private void populateFromProject()
- throws Exception
- {
- Project project = getContinuum().getProjectWithAllDetails( projectId );
-
- scmUrl = project.getScmUrl();
- scmUsername = project.getScmUsername();
- scmPassword = project.getScmPassword();
releaseId = "";
}
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Mon Sep 25 02:39:21 2006
@@ -26,6 +26,7 @@
import org.apache.maven.plugins.release.ReleaseResult;
import org.apache.maven.plugins.release.versions.DefaultVersionInfo;
import org.apache.maven.plugins.release.versions.VersionInfo;
+import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -83,20 +84,17 @@
scmUsername = project.getScmUsername();
scmPassword = project.getScmPassword();
scmTag = project.getScmTag();
- String scmUrl = project.getScmUrl();
-
- //skip scm:provider in scm url
- int idx = scmUrl.indexOf( ":", 4 ) + 1;
- scmUrl = scmUrl.substring( idx );
- if ( scmUrl.endsWith( "/trunk" ) )
+ String scmUrl = project.getScmUrl();
+ if ( scmUrl.startsWith( "scm:svn:" ) )
{
- scmTagBase = scmUrl.substring( 0 , scmUrl.lastIndexOf( "/trunk" ) ) + "/branches";
+ scmTagBase = new SvnScmProviderRepository( scmUrl, scmUsername, scmPassword ).getTagBase();
}
else
{
- scmTagBase = scmUrl.substring( idx );
+ scmTagBase = "";
}
+
prepareGoals = "clean integration-test";
getReleasePluginParameters( project.getWorkingDirectory(), "pom.xml" );
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties Mon Sep 25 02:39:21 2006
@@ -384,29 +384,27 @@
# ----------------------------------------------------------------------
# Page: Continuum Release Support
# ----------------------------------------------------------------------
-releaseProject.page.title=Continuum - Release Project
+release.page.title=Continuum - Release Project
releaseProject.section.title=Choose Release Goal for {0}
-
-prepareRelease.section.title=Prepare Project Release
-prepareRelease.releaseParameters=Release Parameters
-prepareRelease.releaseVersion=Release Version*
-prepareRelease.nextDevelopmentVersion=Next Development Version*
-
-prepareReleaseProgress.section.title=Executing Prepare Project Release
-prepareReleaseFinished.section.title=Prepare Project Release Result
-
-performReleaseProgress.section.title=Executing Perform Project Release
-performReleaseFinished.section.title=Perform Project Release Result
-
releaseProject.prepareReleaseOption=Prepare project for release
releaseProject.performReleaseOption=Perform project release
releaseProject.provideReleaseParameters=Provide Release Parameters
-releaseProject.status=Status
-releaseProject.phase=Phase
-releaseProject.viewOutput=View Output
-
-viewReleaseResult.section.title=View Project Release Summary
-viewReleaseResult.summary=Release Project Details
-viewReleaseResult.success=SUCCESSFUL
-viewReleaseResult.error=ERROR
-viewReleaseResult.output=Release Execution Output
\ No newline at end of file
+releasePrepare.section.title=Prepare Project for Release
+releasePrepare.parameters=Release Prepare Parameters
+releasePrepare.releaseVersion=Release Version*
+releasePrepare.nextDevelopmentVersion=Next Development Version*
+releasePerform.section.title=Perform Project Release
+releasePerform.parameters=Release Perform Parameters
+releaseInProgress.section.title=Executing Release Goal
+releaseInProgress.status=Status
+releaseInProgress.phase=Release Phase
+releaseInProgress.viewOutput=View Output
+releaseViewResult.section.title=Project Release Summary
+releaseViewResult.summary=Release Project Details
+releaseViewResult.startTime=Start Time
+releaseViewResult.endTime=End Time
+releaseViewResult.state=State
+releaseViewResult.success=SUCCESSFUL
+releaseViewResult.error=ERROR
+releaseViewResult.output=Release Execution Output
+releaseViewResult.noOutput=No Output
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerform-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerform-validation.xml?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerform-validation.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerform-validation.xml Mon Sep 25 02:39:21 2006
@@ -5,7 +5,7 @@
<validators>
<field name="goals">
<field-validator type="requiredstring">
- <message key="releasePrepareAction.prepareGoals.required"/>
+ <message key="releasePerformAction.goals.required"/>
</field-validator>
</field>
</validators>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerformFromScm-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerformFromScm-validation.xml?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerformFromScm-validation.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerformFromScm-validation.xml Mon Sep 25 02:39:21 2006
@@ -5,32 +5,17 @@
<validators>
<field name="scmUrl">
<field-validator type="requiredstring">
- <message key="releasePrepareAction.scmUrl.required"/>
- </field-validator>
- </field>
- <field name="scmUsername">
- <field-validator type="requiredstring">
- <message key="releasePrepareAction.scmUsername.required"/>
- </field-validator>
- </field>
- <field name="scmPassword">
- <field-validator type="requiredstring">
- <message key="releasePrepareAction.scmPassword.required"/>
+ <message key="releasePerformAction.scmUrl.required"/>
</field-validator>
</field>
<field name="scmTag">
<field-validator type="requiredstring">
- <message key="releasePrepareAction.scmTag.required"/>
- </field-validator>
- </field>
- <field name="scmTagBase">
- <field-validator type="requiredstring">
- <message key="releasePrepareAction.scmTagBase.required"/>
+ <message key="releasePerformAction.scmTag.required"/>
</field-validator>
</field>
<field name="goals">
<field-validator type="requiredstring">
- <message key="releasePrepareAction.prepareGoals.required"/>
+ <message key="releasePerformAction.goals.required"/>
</field-validator>
</field>
</validators>
Added: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction.properties?view=auto&rev=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction.properties (added)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction.properties Mon Sep 25 02:39:21 2006
@@ -0,0 +1,3 @@
+releasePerformAction.scmUrl.required=SCM Url of the project to release is required.
+releasePerformAction.scmTag.required=SCM tag or release label to use for this release is required.
+releasePerformAction.goals.required=The maven goal(s) to execute to perform the release is required.
Propchange: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml Mon Sep 25 02:39:21 2006
@@ -18,11 +18,6 @@
<message key="releasePrepareAction.scmTag.required"/>
</field-validator>
</field>
- <field name="scmTagBase">
- <field-validator type="requiredstring">
- <message key="releasePrepareAction.scmTagBase.required"/>
- </field-validator>
- </field>
<field name="prepareGoals">
<field-validator type="requiredstring">
<message key="releasePrepareAction.prepareGoals.required"/>
Added: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties?view=auto&rev=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties (added)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties Mon Sep 25 02:39:21 2006
@@ -0,0 +1,4 @@
+releasePrepareAction.scmUsername.required=SCM username with commit rights is required for release.
+releasePrepareAction.scmPassword.required=SCM password for the username above is required.
+releasePrepareAction.scmTag.required=SCM tag or release label to use for this release is required.
+releasePrepareAction.prepareGoals.required=The maven release preparation goal(s) is required.
Propchange: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml Mon Sep 25 02:39:21 2006
@@ -327,7 +327,7 @@
</action>
<action name="releasePrepare" class="releasePrepare">
- <result name="input" type="chain">prepareReleaseInput</result>
+ <result name="input" type="chain">releasePrepareInput</result>
<result name="success" type="redirect-action">
<param name="actionName">releaseInProgress</param>
<param name="releaseId">${releaseId}</param>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp Mon Sep 25 02:39:21 2006
@@ -5,7 +5,7 @@
<title><ww:text name="releaseProject.page.title"/></title>
</head>
<body>
- <h2><ww:text name="prepareReleaseFinished.section.title"/></h2>
+ <h2><ww:text name="releaseInProgress.section.title"/></h2>
<h3><ww:property value="name"/></h3>
<ww:form action="releaseCleanup" method="post">
<ww:hidden name="projectId"/>
@@ -13,8 +13,8 @@
<div class="axial">
<table width="100%">
<tr>
- <th><ww:text name="releaseProject.status"/></th>
- <th width="100%"><ww:text name="releaseProject.phase"/></th>
+ <th><ww:text name="releaseInProgress.status"/></th>
+ <th width="100%"><ww:text name="releaseInProgress.phase"/></th>
</tr>
<ww:iterator value="listener.phases">
<tr>
@@ -48,7 +48,7 @@
<ww:url id="releaseViewResultUrl" action="releaseViewResult" namespace="/">
<ww:param name="releaseId" value="releaseId"/>
</ww:url>
- <ww:a href="%{releaseViewResultUrl}"><ww:text name="releaseProject.viewOutput"/></ww:a>
+ <ww:a href="%{releaseViewResultUrl}"><ww:text name="releaseInProgress.viewOutput"/></ww:a>
</p>
<ww:submit value="Done"/>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInProgress.jsp?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInProgress.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInProgress.jsp Mon Sep 25 02:39:21 2006
@@ -6,7 +6,7 @@
<meta http-equiv="refresh" content="10;url=<ww:url includeParams="all" />"/>
</head>
<body>
- <h2><ww:text name="prepareReleaseProgress.section.title"/></h2>
+ <h2><ww:text name="releaseInProgress.section.title"/></h2>
<h3><ww:property value="name"/></h3>
<ww:form action="releaseInProgress" method="get">
<ww:hidden name="projectId"/>
@@ -14,8 +14,8 @@
<div class="axial">
<table width="100%">
<tr>
- <th><ww:text name="releaseProject.status"/></th>
- <th width="100%"><ww:text name="releaseProject.phase"/></th>
+ <th><ww:text name="releaseInProgress.status"/></th>
+ <th width="100%"><ww:text name="releaseInProgress.phase"/></th>
</tr>
<ww:iterator value="listener.phases">
<tr>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInitialized.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInitialized.jsp?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInitialized.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInitialized.jsp Mon Sep 25 02:39:21 2006
@@ -2,11 +2,11 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title><ww:text name="releaseProject.page.title"/></title>
+ <title><ww:text name="release.page.title"/></title>
<meta http-equiv="refresh" content="10;url=<ww:url includeParams="all" />"/>
</head>
<body>
- <h2><ww:text name="prepareReleaseProgress.section.title"/></h2>
+ <h2><ww:text name="releaseInProgress.section.title"/></h2>
<h3><ww:property value="name"/></h3>
<ww:form action="releaseInProgress" method="get">
<ww:hidden name="projectId"/>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerform.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerform.jsp?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerform.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerform.jsp Mon Sep 25 02:39:21 2006
@@ -2,12 +2,12 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title><ww:text name="releaseProject.page.title"/></title>
+ <title><ww:text name="release.page.title"/></title>
</head>
<body>
- <h2>Perform Project Release</h2>
+ <h2><ww:text name="releasePerform.section.title"/></h2>
<ww:form action="releasePerform" method="post" validate="true">
- <h3>Release Perform Parameters</h3>
+ <h3><ww:text name="releasePerform.parameters"/></h3>
<ww:hidden name="projectId"/>
<ww:hidden name="releaseId"/>
<div class="axial">
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerformFromScm.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerformFromScm.jsp?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerformFromScm.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerformFromScm.jsp Mon Sep 25 02:39:21 2006
@@ -3,7 +3,7 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title><ww:text name="releaseProject.page.title"/></title>
+ <title><ww:text name="release.page.title"/></title>
</head>
<body>
<h2>Perform Project Release</h2>
@@ -16,7 +16,9 @@
<ww:textfield label="SCM Username" name="scmUsername"/>
<ww:textfield label="SCM Password" name="scmPassword"/>
<ww:textfield label="SCM Tag" name="scmTag"/>
- <ww:textfield label="SCM Tag Base" name="scmTagBase"/>
+ <c:if test="${!empty(scmTagBase)}">
+ <ww:textfield label="SCM Tag Base" name="scmTagBase"/>
+ </c:if>
<ww:textfield label="Maven Arguments" name="goals" value="clean deploy"/>
<ww:checkbox label="Use Release Profile" name="useReleaseProfile" value="true"/>
</table>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePrepare.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePrepare.jsp?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePrepare.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePrepare.jsp Mon Sep 25 02:39:21 2006
@@ -1,21 +1,24 @@
<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title><ww:text name="releaseProject.page.title"/></title>
+ <title><ww:text name="release.page.title"/></title>
<ww:head />
</head>
<body>
- <h2><ww:text name="prepareRelease.section.title"/></h2>
+ <h2><ww:text name="releasePrepare.section.title"/></h2>
<ww:form action="releasePrepare" method="post" validate="true">
- <h3><ww:text name="prepareRelease.releaseParameters"/></h3>
+ <h3><ww:text name="releasePrepare.parameters"/></h3>
<input type="hidden" name="projectId" value="<ww:property value="projectId"/>"/>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<ww:textfield label="SCM Username" name="scmUsername"/>
<ww:textfield label="SCM Password" name="scmPassword"/>
<ww:textfield label="SCM Tag" name="scmTag"/>
- <ww:textfield label="SCM Tag Base" name="scmTagBase"/>
+ <c:if test="${!empty(scmTagBase)}">
+ <ww:textfield label="SCM Tag Base" name="scmTagBase"/>
+ </c:if>
<ww:textfield label="Preparation Goals" name="prepareGoals"/>
</table>
</div>
@@ -26,14 +29,14 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
- <th><ww:text name="prepareRelease.releaseVersion"/></th>
+ <th><ww:text name="releasePrepare.releaseVersion"/></th>
<td>
<input type=text name="relVersions"
value="<ww:property value="release"/>" size="100">
</td>
</tr>
<tr>
- <th><ww:text name="prepareRelease.nextDevelopmentVersion"/></th>
+ <th><ww:text name="releasePrepare.nextDevelopmentVersion"/></th>
<td>
<input type=text name="devVersions"
value="<ww:property value="dev"/>" size="100">
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp Mon Sep 25 02:39:21 2006
@@ -2,7 +2,7 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title><ww:text name="releaseProject.page.title"/></title>
+ <title><ww:text name="release.page.title"/></title>
</head>
<body>
<h3>
Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseViewResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseViewResult.jsp?view=diff&rev=449625&r1=449624&r2=449625
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseViewResult.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseViewResult.jsp Mon Sep 25 02:39:21 2006
@@ -3,37 +3,37 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title><ww:text name="releaseProject.page.title"/></title>
+ <title><ww:text name="release.page.title"/></title>
</head>
<body>
- <h2><ww:text name="viewReleaseResult.section.title"/></h2>
+ <h2><ww:text name="releaseViewResult.section.title"/></h2>
- <h4><ww:text name="viewReleaseResult.summary"/></h4>
+ <h4><ww:text name="releaseViewResult.summary"/></h4>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('buildResult.startTime')}">
+ <c1:data label="%{getText('releaseViewResult.startTime')}">
<ww:param name="after"><c1:date name="result.startTime"/></ww:param>
</c1:data>
- <c1:data label="%{getText('buildResult.endTime')}">
+ <c1:data label="%{getText('releaseViewResult.endTime')}">
<ww:param name="after"><c1:date name="result.endTime"/></ww:param>
</c1:data>
- <c1:data label="%{getText('buildResult.state')}">
+ <c1:data label="%{getText('releaseViewResult.state')}">
<ww:param name="after">
<ww:if test="result.resultCode == 0">
- <ww:text name="viewReleaseResult.success"/>
+ <ww:text name="releaseViewResult.success"/>
</ww:if>
<ww:else>
- <ww:text name="viewReleaseResult.error"/>
+ <ww:text name="releaseViewResult.error"/>
</ww:else>
</ww:param>
</c1:data>
</table>
</div>
- <h4><ww:text name="viewReleaseResult.output"/></h4>
+ <h4><ww:text name="releaseViewResult.output"/></h4>
<p>
<ww:if test="result.output == ''">
- <ww:text name="buildResult.noOutput"/>
+ <ww:text name="releaseViewResult.noOutput"/>
</ww:if>
<ww:else>
<div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">