You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/09/18 09:28:43 UTC
svn commit: r447304 - in /maven/continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ resources/ webapp/
Author: carlos
Date: Mon Sep 18 00:28:42 2006
New Revision: 447304
URL: http://svn.apache.org/viewvc?view=rev&rev=447304
Log:
[CONTINUUM-904, CONTINUUM-908] Merged rev# 443312-447294 from https://svn.apache.org/repos/asf/maven/continuum/branches/release-integration/continuum
Removed:
maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseResult.jsp
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java Mon Sep 18 00:28:42 2006
@@ -120,7 +120,7 @@
releaseManager.perform( releaseId, performDirectory, goals, useReleaseProfile, listener );
- return "initialized";
+ return checkProgress();
}
public String checkProgress()
@@ -136,17 +136,9 @@
{
status = "initialized";
}
- else if ( listener.getState() == ContinuumReleaseManagerListener.LISTENING )
- {
- status = "inProgress";
- }
else
{
- releaseManager.getListeners().remove( releaseId );
-
- result = (ReleaseResult) releaseManager.getReleaseResults().get( releaseId );
-
- status = "finished";
+ status = "inProgress";
}
return status;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java Mon Sep 18 00:28:42 2006
@@ -117,7 +117,7 @@
releaseId = releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(),
getDevVersionMap(), listener );
- return "initialized";
+ return checkProgress();
}
public String viewResult()
@@ -145,13 +145,9 @@
status = "finished";
}
- else if ( listener.getState() == ContinuumReleaseManagerListener.LISTENING )
- {
- status = "inProgress";
- }
else
{
- status = "initialized";
+ status = "inProgress";
}
return status;
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Sep 18 00:28:42 2006
@@ -320,23 +320,12 @@
<action name="prepareRelease" class="prepareRelease">
<result name="prompt">prepareRelease.jsp</result>
- <!-- should be exec and wait -->
- <result name="initialized" type="redirect-action">
- <param name="actionName">prepareRelease!checkProgress.action</param>
- <param name="releaseId">${releaseId}</param>
- <param name="projectId">${projectId}</param>
- </result>
<result name="inProgress">prepareReleaseProgress.jsp</result>
<result name="finished">prepareReleaseFinished.jsp</result>
</action>
<action name="performRelease" class="performRelease">
<result name="prompt">performRelease.jsp</result>
- <!-- should be exec and wait -->
- <result name="initialized" type="redirect-action">
- <param name="actionName">performRelease!checkProgress.action</param>
- <param name="releaseId">${releaseId}</param>
- </result>
<result name="inProgress">performReleaseProgress.jsp</result>
<result name="finished">performReleaseFinished.jsp</result>
</action>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp Mon Sep 18 00:28:42 2006
@@ -1,7 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseFinished.jsp?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseFinished.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseFinished.jsp Mon Sep 18 00:28:42 2006
@@ -1,7 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseProgress.jsp?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseProgress.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseProgress.jsp Mon Sep 18 00:28:42 2006
@@ -1,7 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
@@ -11,42 +8,49 @@
<body>
<h2><ww:text name="performReleaseProgress.section.title"/></h2>
<h3><ww:property value="name"/></h3>
- <ww:form action="performRelease!checkProgress.action" method="post">
+ <ww:form action="performRelease!checkProgress.action" method="get">
<ww:hidden name="projectId"/>
<ww:hidden name="releaseId"/>
- <div class="axial">
- <table width="100%">
- <tr>
- <th><ww:text name="releaseProject.status"/></th>
- <th width="100%"><ww:text name="releaseProject.phase"/></th>
- </tr>
- <ww:iterator value="listener.phases">
+ <ww:if test="listener.phases.size == 0">
+ <p>
+ The release goal is currently initializing... Please wait while server prepares your project for release.
+ </p>
+ </ww:if>
+ <ww:else>
+ <div class="axial">
+ <table width="100%">
<tr>
- <td>
- <ww:if test="listener.completedPhases.contains( top )">
- <img src="<ww:url value='/images/icon_success_sml.gif'/>"
- alt="Done" title="Done" border="0">
- </ww:if>
- <ww:elseif test="listener.inProgress.equals( top )">
- <ww:if test="listener.error == null">
- <img src="<ww:url value='/images/building.gif'/>"
- alt="In Progress" title="In Progress" border="0">
+ <th><ww:text name="releaseProject.status"/></th>
+ <th width="100%"><ww:text name="releaseProject.phase"/></th>
+ </tr>
+ <ww:iterator value="listener.phases">
+ <tr>
+ <td>
+ <ww:if test="listener.completedPhases.contains( top )">
+ <img src="<ww:url value='/images/icon_success_sml.gif'/>"
+ alt="Done" title="Done" border="0">
</ww:if>
+ <ww:elseif test="listener.inProgress.equals( top )">
+ <ww:if test="listener.error == null">
+ <img src="<ww:url value='/images/building.gif'/>"
+ alt="In Progress" title="In Progress" border="0">
+ </ww:if>
+ <ww:else>
+ <img src="<ww:url value='/images/icon_error_sml.gif'/>"
+ alt="Error" title="Error" border="0">
+ </ww:else>
+ </ww:elseif>
<ww:else>
- <img src="<ww:url value='/images/icon_error_sml.gif'/>"
- alt="Error" title="Error" border="0">
+ <img src="<ww:url value='/images/inqueue.gif'/>"
+ alt="Queued" title="Queued" border="0">
</ww:else>
- </ww:elseif>
- <ww:else>
- <img src="<ww:url value='/images/inqueue.gif'/>"
- alt="Queued" title="Queued" border="0">
- </ww:else>
- </td>
- <td><ww:property/></td>
- </tr>
- </ww:iterator>
- </table>
- </div>
+ </td>
+ <td><ww:property/></td>
+ </tr>
+ </ww:iterator>
+ </table>
+ </div>
+ </ww:else>
<ww:submit value="Refresh"/>
</ww:form>
</body>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp Mon Sep 18 00:28:42 2006
@@ -1,7 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp Mon Sep 18 00:28:42 2006
@@ -1,7 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp Mon Sep 18 00:28:42 2006
@@ -1,7 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
@@ -11,42 +8,49 @@
<body>
<h2><ww:text name="prepareReleaseProgress.section.title"/></h2>
<h3><ww:property value="name"/></h3>
- <ww:form action="prepareRelease!checkProgress.action" method="post">
+ <ww:form action="prepareRelease!checkProgress.action" method="get">
<ww:hidden name="projectId"/>
<ww:hidden name="releaseId"/>
- <div class="axial">
- <table width="100%">
- <tr>
- <th><ww:text name="releaseProject.status"/></th>
- <th width="100%"><ww:text name="releaseProject.phase"/></th>
- </tr>
- <ww:iterator value="listener.phases">
+ <ww:if test="listener.phases.size == 0">
+ <p>
+ The release goal is currently initializing... Please wait while server prepares your project for release.
+ </p>
+ </ww:if>
+ <ww:else>
+ <div class="axial">
+ <table width="100%">
<tr>
- <td>
- <ww:if test="listener.completedPhases.contains( top )">
- <img src="<ww:url value='/images/icon_success_sml.gif'/>"
- alt="Done" title="Done" border="0">
- </ww:if>
- <ww:elseif test="listener.inProgress.equals( top )">
- <ww:if test="listener.error == null">
- <img src="<ww:url value='/images/building.gif'/>"
- alt="In Progress" title="In Progress" border="0">
+ <th><ww:text name="releaseProject.status"/></th>
+ <th width="100%"><ww:text name="releaseProject.phase"/></th>
+ </tr>
+ <ww:iterator value="listener.phases">
+ <tr>
+ <td>
+ <ww:if test="listener.completedPhases.contains( top )">
+ <img src="<ww:url value='/images/icon_success_sml.gif'/>"
+ alt="Done" title="Done" border="0">
</ww:if>
+ <ww:elseif test="listener.inProgress.equals( top )">
+ <ww:if test="listener.error == null">
+ <img src="<ww:url value='/images/building.gif'/>"
+ alt="In Progress" title="In Progress" border="0">
+ </ww:if>
+ <ww:else>
+ <img src="<ww:url value='/images/icon_error_sml.gif'/>"
+ alt="Error" title="Error" border="0">
+ </ww:else>
+ </ww:elseif>
<ww:else>
- <img src="<ww:url value='/images/icon_error_sml.gif'/>"
- alt="Error" title="Error" border="0">
+ <img src="<ww:url value='/images/inqueue.gif'/>"
+ alt="Queued" title="Queued" border="0">
</ww:else>
- </ww:elseif>
- <ww:else>
- <img src="<ww:url value='/images/inqueue.gif'/>"
- alt="Queued" title="Queued" border="0">
- </ww:else>
- </td>
- <td><ww:property/></td>
- </tr>
- </ww:iterator>
- </table>
- </div>
+ </td>
+ <td><ww:property/></td>
+ </tr>
+ </ww:iterator>
+ </table>
+ </div>
+ </ww:else>
<ww:submit value="Refresh"/>
</ww:form>
</body>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp Mon Sep 18 00:28:42 2006
@@ -1,7 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">
<head>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/viewReleaseResult.jsp?view=diff&rev=447304&r1=447303&r2=447304
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/viewReleaseResult.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/viewReleaseResult.jsp Mon Sep 18 00:28:42 2006
@@ -1,6 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
<ww:i18n name="localization.Continuum">