continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From epunza...@apache.org
Subject svn commit: r443243 - in /maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java resources/xwork.xml webapp/prepareRelease.jsp
Date Thu, 14 Sep 2006 05:42:23 GMT
Author: epunzalan
Date: Wed Sep 13 22:42:22 2006
New Revision: 443243

URL: http://svn.apache.org/viewvc?view=rev&rev=443243
Log:
PR: CONTINUUM-727

progress for using the execAndWait interceptor

Modified:
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java?view=diff&rev=443243&r1=443242&r2=443243
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
Wed Sep 13 22:42:22 2006
@@ -104,7 +104,13 @@
         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()

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=443243&r1=443242&r2=443243
==============================================================================
--- 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
Wed Sep 13 22:42:22 2006
@@ -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">

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp?view=diff&rev=443243&r1=443242&r2=443243
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
Wed Sep 13 22:42:22 2006
@@ -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">



Mime
View raw message