Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 67082 invoked from network); 14 Sep 2006 05:43:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Sep 2006 05:43:41 -0000 Received: (qmail 22162 invoked by uid 500); 14 Sep 2006 05:43:40 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 22141 invoked by uid 500); 14 Sep 2006 05:43:40 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 22128 invoked by uid 99); 14 Sep 2006 05:43:40 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Sep 2006 22:43:40 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=epunzalan@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from ([140.211.166.113:60029] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1 r(10620)) with ESMTP id 98/30-02709-1CBE8054 for ; Wed, 13 Sep 2006 22:43:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9E65A1A981A; Wed, 13 Sep 2006 22:42:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: continuum-commits@maven.apache.org From: epunzalan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060914054223.9E65A1A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ + + + 1000 + + prepareReleaseProgress.jsp + prepareReleaseFinish.jsp + + prepareRelease.jsp - - - prepareRelease!checkProgress.action - ${releaseId} - ${projectId} - - prepareReleaseProgress.jsp - prepareReleaseFinished.jsp 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 @@

Prepare Project Release

- +

Release Parameters

"/>