continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r449952 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ resources/localization/ resources/org/apache/maven/continuum/web/action/ webapp/ webapp/components/
Date Tue, 26 Sep 2006 08:58:26 GMT
Author: evenisse
Date: Tue Sep 26 01:58:20 2006
New Revision: 449952

URL: http://svn.apache.org/viewvc?view=rev&rev=449952
Log:
Merge with rev.449625 of release-integration branch

Added:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerform-validation.xml
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerform-validation.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerformFromScm-validation.xml
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction-releasePerformFromScm-validation.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction.properties
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePerformAction.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseFinished.jsp
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseInProgress.jsp
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInProgress.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseInitialized.jsp
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseInitialized.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/releasePerform.jsp
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerform.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/releasePerformFromScm.jsp
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePerformFromScm.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/releasePrepare.jsp
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releasePrepare.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseViewResult.jsp
      - copied unchanged from r449950, maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseViewResult.jsp
Removed:
    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/java/org/apache/maven/continuum/web/action/ViewReleaseResultAction.java
    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/releaseResult.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/ReleaseProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java?view=diff&rev=449952&r1=449951&r2=449952
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
Tue Sep 26 01:58:20 2006
@@ -71,7 +71,7 @@
 
         projectName = project.getName();
 
-        return "prompt";
+        return SUCCESS;
     }
 
     public String execute()
@@ -83,7 +83,14 @@
         }
         else if ( "perform".equals( goal ) )
         {
-            return "performRelease";
+            if ( "".equals( preparedReleaseId ) )
+            {
+                return "performReleaseFromScm";
+            }
+            else
+            {
+                return "performRelease";
+            }
         }
         else
         {

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=449952&r1=449951&r2=449952
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Tue Sep 26 01:58:20 2006
@@ -414,29 +414,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
+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/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=449952&r1=449951&r2=449952
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Tue Sep 26 01:58:20
2006
@@ -313,43 +313,77 @@
     <!--
     - continuum release
     -->
+    <action name="releasePromptGoal" class="releaseProject" method="promptReleaseGoal">
+      <result name="success">releaseProject.jsp</result>
+    </action>
+
     <action name="releaseProject" class="releaseProject">
-      <result name="prompt">releaseProject.jsp</result>
       <result name="prepareRelease" type="redirect-action">
-        <param name="actionName">prepareRelease</param>
+        <param name="actionName">releasePrepareInput</param>
         <param name="projectId">${projectId}</param>
       </result>
       <result name="performRelease" type="redirect-action">
-        <param name="actionName">performRelease</param>
+        <param name="actionName">releasePerformInput</param>
         <param name="projectId">${projectId}</param>
         <param name="releaseId">${preparedReleaseId}</param>
       </result>
+      <result name="performReleaseFromScm" type="redirect-action">
+        <param name="actionName">releasePerformFromScmInput</param>
+        <param name="projectId">${projectId}</param>
+      </result>
     </action>
 
-    <action name="prepareRelease" class="prepareRelease">
-      <result name="prompt">prepareRelease.jsp</result>
-      <result name="initialized" type="redirect-action">
-        <param name="actionName">prepareRelease!checkProgress.action</param>
+    <action name="releasePrepareInput" class="releasePrepare" method="input">
+      <result name="success">releasePrepare.jsp</result>
+    </action>
+
+    <action name="releasePrepare" class="releasePrepare">
+      <result name="input" type="chain">releasePrepareInput</result>
+      <result name="success" type="redirect-action">
+        <param name="actionName">releaseInProgress</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>
-      <result name="initialized" type="redirect-action">
-        <param name="actionName">performRelease!checkProgress.action</param>
+    <action name="releasePerformInput" class="releasePerform" method="input">
+      <result name="success">releasePerform.jsp</result>
+    </action>
+
+    <action name="releasePerform" class="releasePerform">
+      <result name="input" type="chain">releasePerformInput</result>
+      <result name="success" type="redirect-action">
+        <param name="actionName">releaseInProgress</param>
         <param name="releaseId">${releaseId}</param>
         <param name="projectId">${projectId}</param>
       </result>
-      <result name="inProgress">performReleaseProgress.jsp</result>
-      <result name="finished">performReleaseFinished.jsp</result>
     </action>
 
-    <action name="viewReleaseResult" class="viewReleaseResult">
-      <result name="success">viewReleaseResult.jsp</result>
+    <action name="releasePerformFromScmInput" class="releasePerform" method="inputFromScm">
+      <result name="success">releasePerformFromScm.jsp</result>
+    </action>
+
+    <action name="releasePerformFromScm" class="releasePerform" method="executeFromScm">
+      <result name="input" type="chain">releasePerformFromScmInput</result>
+      <result name="success" type="redirect-action">
+        <param name="actionName">releaseInProgress</param>
+        <param name="projectId">${projectId}</param>
+      </result>
+    </action>
+
+    <action name="releaseInProgress" class="releaseInProgress">
+      <result name="initialized">releaseInitialized.jsp</result>
+      <result name="inProgress">releaseInProgress.jsp</result>
+      <result name="success">releaseFinished.jsp</result>
+    </action>
+
+    <action name="releaseCleanup" class="releaseCleanup">
+      <result name="prepareFinished" type="chain">releasePromptGoal</result>
+      <result name="performFinished" type="chain">groupSummary</result>
+    </action>
+
+    <action name="releaseViewResult" class="releaseInProgress" method="viewResult">
+      <result name="success">releaseViewResult.jsp</result>
     </action>
 
   </package>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp?view=diff&rev=449952&r1=449951&r2=449952
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
Tue Sep 26 01:58:20 2006
@@ -61,22 +61,22 @@
           </c:otherwise>
         </c:choose>
       </ec:column>
-      <ec:column property="releaseAction" title="&nbsp;" width="1%">
-          <c:choose>
-            <c:when test="${pageScope.project.state == 2}">
-              <ww:url id="releaseProjectUrl" action="releaseProject!promptReleaseGoal.action"
namespace="/">
-                <ww:param name="projectId" value="${project.id}"/>
-              </ww:url>
-              <ww:a href="%{releaseProjectUrl}">
-                <img src="<ww:url value='/images/releaseproject.gif'/>" alt="Release
Project" title="Release Project"
-                  border="0"/>
-              </ww:a>
-            </c:when>
-            <c:otherwise>
-              <img src="<ww:url value='/images/releaseproject_disabled.gif'/>" alt="Release
Project"
-                title="Release Project" border="0"/>
-            </c:otherwise>
-          </c:choose>
+      <ec:column property="releaseAction" title="&nbsp;" width="1%" sortable="false">
+        <c:choose>
+          <c:when test="${pageScope.project.state == 2}">
+            <ww:url id="releaseProjectUrl" action="releasePromptGoal" namespace="/">
+              <ww:param name="projectId" value="${project.id}"/>
+            </ww:url>
+            <ww:a href="%{releaseProjectUrl}">
+              <img src="<ww:url value='/images/releaseproject.gif'/>" alt="Release
Project" title="Release Project"
+                border="0"/>
+            </ww:a>
+          </c:when>
+          <c:otherwise>
+            <img src="<ww:url value='/images/releaseproject_disabled.gif'/>" alt="Release
Project"
+              title="Release Project" border="0"/>
+          </c:otherwise>
+        </c:choose>
       </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%">
           <c:choose>

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=449952&r1=449951&r2=449952
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp Tue Sep 26 01:58:20
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>



Mime
View raw message