PR: CONTINUUM-727

progress for using the execAndWait interceptor git-svn-id: https://svn.apache.org/repos/asf/maven/continuum/branches/release-integration@443243 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 14, 2006 · 2375708 · 2375708
1 parent c6a317f
commit 2375708
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/...nuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java b/...nuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
@@ -104,7 +104,13 @@ public String doPrepare()
         releaseId = releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(),
                                             getDevVersionMap(), listener );
 
-        return "initialized";
+        //wait for executor to finish, use the listener
+        while ( listener.getState() != ContinuumReleaseManagerListener.FINISHED )
+        {
+            Thread.sleep( 10 );
+        }
+
+        return "finished";
     }
 
     public String viewResult()

diff --git a/continuum/continuum-webapp/src/main/resources/xwork.xml b/continuum/continuum-webapp/src/main/resources/xwork.xml
@@ -310,16 +310,16 @@
       </result>
     </action>
 
+    <action name="doPrepare" class="prepareRelease" method="doPrepare">
+      <interceptor-ref name="execAndWait">
+        <param name="delay">1000</param>
+      </interceptor-ref>
+      <result name="wait">prepareReleaseProgress.jsp</result>
+      <result name="finished">prepareReleaseFinish.jsp</result>
+    </action>
+
     <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">

diff --git a/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp b/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
@@ -9,7 +9,7 @@
     </head>
     <body>
       <h2>Prepare Project Release</h2>
-      <ww:form action="prepareRelease!doPrepare.action" method="post">
+      <ww:form action="doPrepare" method="post">
         <h3>Release Parameters</h3>
         <input type="hidden" name="projectId" value="<ww:property value="projectId"/>"/>
         <div class="axial">