continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From epunza...@apache.org
Subject svn commit: r442050 - in /maven/continuum/branches/release-integration/continuum: continuum-api/src/main/java/org/apache/maven/continuum/release/ continuum-plexus-application/src/conf/ continuum-release/src/main/java/org/apache/maven/continuum/release/...
Date Mon, 11 Sep 2006 00:39:52 GMT
Author: epunzalan
Date: Sun Sep 10 17:39:51 2006
New Revision: 442050

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

allowed release prepare and perform in continuum

Added:
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp   (with props)
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp   (with props)
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseResult.jsp   (with props)
Modified:
    maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
    maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java
    maven/continuum/branches/release-integration/continuum/continuum-plexus-application/src/conf/application.xml
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
    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/META-INF/plexus/application.xml
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performRelease.jsp
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp

Modified: maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java Sun Sep 10 17:39:51 2006
@@ -39,7 +39,7 @@
      * @param releaseProperties
      * @throws ContinuumReleaseException
      */
-    void prepare( Project project, Properties releaseProperties, Map releaseVersions,
+    String prepare( Project project, Properties releaseProperties, Map releaseVersions,
                     Map developmentVersions, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException;
 
@@ -53,7 +53,7 @@
      * @throws ContinuumReleaseException
      */
     void perform( String releaseId, File buildDirectory,
-                  String goals, boolean useReleaseProfile )
+                  String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException;
 
     /**
@@ -63,10 +63,12 @@
      * @throws ContinuumReleaseException
      */
     void perform( String releaseId, File descriptorFile, File buildDirectory,
-                  String goals, boolean useReleaseProfile )
+                  String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException;
 
     void setPreparedReleases( Map preparedReleases );
 
     Map getPreparedReleases();
+
+    Map getListeners();
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java Sun Sep 10 17:39:51 2006
@@ -23,7 +23,17 @@
  */
 public interface ContinuumReleaseManagerListener
 {
+    int INITIALIZED = 0, LISTENING = 1, FINISHED = 3;
+
     List getCompletedPhases();
 
     String getInProgress();
+
+    String getGoalName();
+
+    List getPhases();
+
+    String getError();
+
+    int getState();
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-plexus-application/src/conf/application.xml?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-plexus-application/src/conf/application.xml Sun Sep 10 17:39:51 2006
@@ -12,6 +12,14 @@
       <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
       <role-hint>check-out-project</role-hint>
     </component>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+      <role-hint>prepare-release</role-hint>
+    </component>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+      <role-hint>perform-release</role-hint>
+    </component>
     <!--
     <component>
       <role>org.codehaus.xfire.plexus.config.ConfigurationService</role>

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Sun Sep 10 17:39:51 2006
@@ -21,6 +21,7 @@
 import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask;
 import org.apache.maven.plugins.release.config.ReleaseDescriptor;
 import org.apache.maven.plugins.release.config.io.xpp3.ReleaseDescriptorXpp3Reader;
+import org.apache.maven.plugins.release.ReleaseManagerListener;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -31,6 +32,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Collections;
+import java.util.Hashtable;
 
 /**
  * @author Jason van Zyl
@@ -56,7 +59,7 @@
      */
     private Map preparedReleases;
 
-    public void prepare( Project project, Properties releaseProperties, Map relVersions,
+    public String prepare( Project project, Properties releaseProperties, Map relVersions,
                            Map devVersions, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
@@ -64,30 +67,35 @@
 
         ReleaseDescriptor descriptor = getReleaseDescriptor( project, releaseProperties, relVersions, devVersions );
 
+        getListeners().put( releaseId, listener );
+
         try
         {
-            prepareReleaseQueue.put( new PrepareReleaseProjectTask( releaseId, descriptor, listener ) );
+            prepareReleaseQueue.put( new PrepareReleaseProjectTask( releaseId, descriptor,
+                                                                    (ReleaseManagerListener) listener ) );
 
-            System.out.println( "Added to Prepare Queue" );
         }
         catch ( TaskQueueException e )
         {
             throw new ContinuumReleaseException( "Failed to add prepare release task in queue.", e );
         }
+
+        return releaseId;
     }
 
-    public void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile )
+    public void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile,
+                         ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
         ReleaseDescriptor descriptor = (ReleaseDescriptor) preparedReleases.get( releaseId );
         if ( descriptor != null )
         {
-            perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile );
+            perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener );
         }
     }
 
     public void perform( String releaseId, File descriptorFile, File buildDirectory,
-                         String goals, boolean useReleaseProfile )
+                         String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
         ReleaseDescriptor descriptor;
@@ -104,20 +112,20 @@
             throw new ContinuumReleaseException( "Failed to parse descriptor file.", e );
         }
 
-        perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile );
+        perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener );
     }
 
     private void perform( String releaseId, ReleaseDescriptor descriptor, File buildDirectory,
-                          String goals, boolean useReleaseProfile )
+                          String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
         try
         {
-            DefaultReleaseManagerListener listener = new DefaultReleaseManagerListener();
-            listeners.put( releaseId, listener );
+            getListeners().put( releaseId, listener );
 
             performReleaseQueue.put( new PerformReleaseProjectTask( releaseId, descriptor, buildDirectory,
-                                                                    goals, useReleaseProfile, listener ) );
+                                                                    goals, useReleaseProfile,
+                                                                    (ReleaseManagerListener) listener ) );
         }
         catch ( TaskQueueException e )
         {
@@ -175,7 +183,7 @@
     {
         if ( listeners == null )
         {
-            listeners = new HashMap();
+            listeners = Collections.synchronizedMap( new Hashtable() );
         }
 
         return listeners;

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java Sun Sep 10 17:39:51 2006
@@ -28,46 +28,63 @@
 public class DefaultReleaseManagerListener
     implements ReleaseManagerListener, ContinuumReleaseManagerListener
 {
-    private List completed;
+    private String goalName;
+
+    private List completedPhases;
 
     private String inProgress;
 
     private List phases;
 
+    private String error;
+
+    private int state;
+
     public void goalStart( String name, List phases )
     {
+        System.out.println( "Goal started: " + name + "; phases: " + phases.size() );
+        state = LISTENING;
+        goalName = name;
         this.phases = phases;
-        completed = Collections.synchronizedList( new ArrayList() );
+        completedPhases = Collections.synchronizedList( new ArrayList() );
         inProgress = null;
     }
 
     public void phaseStart( String name )
     {
+        System.out.println( goalName + ":" + name + " started." );
         inProgress = name;
     }
 
     public void phaseEnd()
     {
-        completed.add( inProgress );
+        completedPhases.add( inProgress );
+
         inProgress = null;
     }
 
     public void phaseSkip( String name )
     {
-        completed.add( name );
+        System.out.println( goalName + ":" + name + " skipped." );
+        completedPhases.add( name );
     }
 
     public void goalEnd()
     {
+        state = FINISHED;
+        System.out.println( goalName + " finished." );
     }
 
     public void error( String message )
     {
+        System.out.println( goalName + " error occurred: " + message );
+        error = message;
+        goalEnd();
     }
 
     public List getCompletedPhases()
     {
-        return completed;
+        return completedPhases;
     }
 
     public String getInProgress()
@@ -80,8 +97,18 @@
         return phases;
     }
 
-    public void setPhases( List phases )
+    public String getGoalName()
     {
-        this.phases = phases;
+        return goalName;
+    }
+
+    public String getError()
+    {
+        return error;
+    }
+
+    public int getState()
+    {
+        return state;
     }
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java Sun Sep 10 17:39:51 2006
@@ -19,6 +19,8 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.continuum.release.ContinuumReleaseException;
 import org.apache.maven.continuum.release.ContinuumReleaseManager;
 import org.apache.maven.plugins.release.ReleaseManager;
@@ -34,7 +36,6 @@
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
@@ -51,7 +52,7 @@
  * @author Edwin Punzalan
  */
 public abstract class AbstractReleaseTaskExecutor
-    implements ReleaseTaskExecutor, TaskExecutor, Contextualizable
+    implements ReleaseTaskExecutor, Contextualizable
 {
     /**
      * @plexus.requirement
@@ -94,12 +95,20 @@
         MavenProject project;
         try
         {
-            project = projectBuilder.build( getProjectDescriptorFile( descriptor ),
+            project = projectBuilder.buildWithDependencies( getProjectDescriptorFile( descriptor ),
                                             getLocalRepository(), getProfileManager( settings ) );
 
             reactorProjects.add( project );
         }
         catch ( ProjectBuildingException e )
+        {
+            throw new ContinuumReleaseException( "Failed to build project.", e );
+        }
+        catch ( ArtifactNotFoundException e )
+        {
+            throw new ContinuumReleaseException( "Failed to build project.", e );
+        }
+        catch ( ArtifactResolutionException e )
         {
             throw new ContinuumReleaseException( "Failed to build project.", e );
         }

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java Sun Sep 10 17:39:51 2006
@@ -20,6 +20,7 @@
 import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask;
 import org.apache.maven.plugins.release.ReleaseExecutionException;
 import org.apache.maven.plugins.release.ReleaseFailureException;
+import org.apache.maven.plugins.release.ReleaseManagerListener;
 import org.apache.maven.plugins.release.config.ReleaseDescriptor;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
@@ -39,9 +40,11 @@
 
             ReleaseDescriptor descriptor = performTask.getDescriptor();
 
+            ReleaseManagerListener listener = performTask.getListener();
+
             releasePluginManager.perform( descriptor, getSettings(), getReactorProjects( descriptor ),
                                           performTask.getBuildDirectory(), performTask.getGoals(),
-                                          performTask.isUseReleaseProfile() );
+                                          performTask.isUseReleaseProfile(), listener );
 
             continuumReleaseManager.getPreparedReleases().remove( performTask.getReleaseId() );
         }

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java Sun Sep 10 17:39:51 2006
@@ -20,6 +20,7 @@
 import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask;
 import org.apache.maven.plugins.release.ReleaseExecutionException;
 import org.apache.maven.plugins.release.ReleaseFailureException;
+import org.apache.maven.plugins.release.ReleaseManagerListener;
 import org.apache.maven.plugins.release.config.ReleaseDescriptor;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
@@ -39,7 +40,10 @@
 
             ReleaseDescriptor descriptor = prepareTask.getDescriptor();
 
-            releasePluginManager.prepare( descriptor, getSettings(), getReactorProjects( descriptor ), false, false );
+            ReleaseManagerListener listener = prepareTask.getListener();
+
+            releasePluginManager.prepare( descriptor, getSettings(), getReactorProjects( descriptor ),
+                                          false, false, listener );
 
             continuumReleaseManager.getPreparedReleases().put( prepareTask.getReleaseId(), descriptor );
         }

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java Sun Sep 10 17:39:51 2006
@@ -16,10 +16,13 @@
  * limitations under the License.
  */
 
+import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
+
 /**
  * @author Edwin Punzalan
  */
 public interface ReleaseTaskExecutor
+    extends TaskExecutor
 {
-    String ROLE = ReleaseTaskExecutor.class.getName();
+    String ROLE = TaskExecutor.class.getName();
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java Sun Sep 10 17:39:51 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.plugins.release.ReleaseManagerListener;
 import org.apache.maven.plugins.release.config.ReleaseDescriptor;
-import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
 import org.codehaus.plexus.taskqueue.Task;
 
 /**
@@ -30,13 +30,14 @@
 
     private ReleaseDescriptor descriptor;
 
-    private ContinuumReleaseManagerListener listener;
+    private ReleaseManagerListener listener;
 
     public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor,
-                                       ContinuumReleaseManagerListener listener )
+                                       ReleaseManagerListener listener )
     {
         this.releaseId = releaseId;
         this.descriptor = descriptor;
+        this.listener = listener;
     }
 
     public ReleaseDescriptor getDescriptor()
@@ -57,5 +58,15 @@
     public void setReleaseId( String releaseId )
     {
         this.releaseId = releaseId;
+    }
+
+    public ReleaseManagerListener getListener()
+    {
+        return listener;
+    }
+
+    public void setListener( ReleaseManagerListener listener )
+    {
+        this.listener = listener;
     }
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java Sun Sep 10 17:39:51 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.plugins.release.ReleaseManagerListener;
 import org.apache.maven.plugins.release.config.ReleaseDescriptor;
-import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
 
 import java.io.File;
 
@@ -34,7 +34,7 @@
     private boolean useReleaseProfile = true;
 
     public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory,
-                                      String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
+                                      String goals, boolean useReleaseProfile, ReleaseManagerListener listener )
     {
         super( releaseId, descriptor, listener );
         setBuildDirectory( buildDirectory );

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java Sun Sep 10 17:39:51 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.plugins.release.ReleaseManagerListener;
 import org.apache.maven.plugins.release.config.ReleaseDescriptor;
-import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
 
 /**
  * @author Edwin Punzalan
@@ -26,7 +26,7 @@
     extends AbstractReleaseProjectTask
 {
     public PrepareReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor,
-                                      ContinuumReleaseManagerListener listener )
+                                      ReleaseManagerListener listener )
     {
         super( releaseId, descriptor, listener );
     }

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/resources/META-INF/plexus/components.xml Sun Sep 10 17:39:51 2006
@@ -40,7 +40,7 @@
     </component>
 
     <component>
-      <role>org.apache.maven.continuum.release.executors.ReleaseTaskExecutor</role>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
       <role-hint>prepare-release</role-hint>
       <implementation>org.apache.maven.continuum.release.executors.PrepareReleaseTaskExecutor</implementation>
       <requirements>
@@ -103,7 +103,7 @@
     </component>
 
     <component>
-      <role>org.apache.maven.continuum.release.executors.ReleaseTaskExecutor</role>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
       <role-hint>perform-release</role-hint>
       <implementation>org.apache.maven.continuum.release.executors.PerformReleaseTaskExecutor</implementation>
       <requirements>

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java Sun Sep 10 17:39:51 2006
@@ -55,12 +55,12 @@
 
         if ( prepareExec == null )
         {
-            prepareExec = (TaskExecutor) lookup( ReleaseTaskExecutor.ROLE, "prepare-release" );
+            prepareExec = (TaskExecutor) lookup( TaskExecutor.class.getName(), "prepare-release" );
         }
 
         if ( performExec == null )
         {
-            performExec = (TaskExecutor) lookup( ReleaseTaskExecutor.ROLE, "perform-release" );
+            performExec = (TaskExecutor) lookup( TaskExecutor.class.getName(), "perform-release" );
         }
     }
 
@@ -138,14 +138,14 @@
 
     private Task getPrepareTask( String releaseId, ReleaseDescriptor descriptor )
     {
-        Task task = new PrepareReleaseProjectTask( releaseId, descriptor );
+        Task task = new PrepareReleaseProjectTask( releaseId, descriptor, null );
 
         return task;
     }
 
     private Task getPerformTask( String releaseId, ReleaseDescriptor descriptor, File buildDir )
     {
-        Task task = new PerformReleaseProjectTask( releaseId, descriptor, buildDir, "package", true );
+        Task task = new PerformReleaseProjectTask( releaseId, descriptor, buildDir, "package", true, null );
 
         return task;
     }

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java Sun Sep 10 17:39:51 2006
@@ -17,6 +17,10 @@
  */
 
 import org.apache.maven.continuum.release.ContinuumReleaseManager;
+import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
+import org.apache.maven.continuum.release.DefaultReleaseManagerListener;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
+import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
 
@@ -46,19 +50,151 @@
 
     private boolean useReleaseProfile;
 
+    private ContinuumReleaseManagerListener listener;
+
     public String execute()
         throws Exception
     {
+        if ( StringUtils.isNotEmpty( releaseId ) )
+        {
+            ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
+            ReleaseDescriptor descriptor = (ReleaseDescriptor) releaseManager.getPreparedReleases().get( releaseId );
+            scmUrl = descriptor.getScmSourceUrl();
+        }
+
         return "prompt";
     }
 
     public String doPerform()
         throws Exception
     {
+        listener = new DefaultReleaseManagerListener();
+
         ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
 
-        releaseManager.perform( releaseId, File.createTempFile( "", "" ), goals, useReleaseProfile );
+        File performDirectory = new File( getContinuum().getConfiguration().getWorkingDirectory(),
+                                          "releases-" + System.currentTimeMillis() );
+        performDirectory.mkdirs();
+
+        releaseManager.perform( releaseId, performDirectory, goals, useReleaseProfile, listener );
+
+        return "initialized";
+    }
+
+    public String checkProgress()
+        throws Exception
+    {
+        String status;
+
+        ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
+
+        listener = (ContinuumReleaseManagerListener) releaseManager.getListeners().get( releaseId );
+
+        if ( listener.getState() == ContinuumReleaseManagerListener.INITIALIZED )
+        {
+            status = "initialized";
+        }
+        else if ( listener.getState() == ContinuumReleaseManagerListener.LISTENING )
+        {
+            status = "inProgress";
+        }
+        else
+        {
+            releaseManager.getListeners().remove( releaseId );
+
+            return "finished";
+        }
+
+        return status;
+    }
+
+    public String getReleaseId()
+    {
+        return releaseId;
+    }
+
+    public void setReleaseId( String releaseId )
+    {
+        this.releaseId = releaseId;
+    }
+
+    public String getScmUrl()
+    {
+        return scmUrl;
+    }
+
+    public void setScmUrl( String scmUrl )
+    {
+        this.scmUrl = scmUrl;
+    }
+
+    public String getScmUsername()
+    {
+        return scmUsername;
+    }
+
+    public void setScmUsername( String scmUsername )
+    {
+        this.scmUsername = scmUsername;
+    }
+
+    public String getScmPassword()
+    {
+        return scmPassword;
+    }
+
+    public void setScmPassword( String scmPassword )
+    {
+        this.scmPassword = scmPassword;
+    }
+
+    public String getScmTag()
+    {
+        return scmTag;
+    }
+
+    public void setScmTag( String scmTag )
+    {
+        this.scmTag = scmTag;
+    }
+
+    public String getScmTagBase()
+    {
+        return scmTagBase;
+    }
+
+    public void setScmTagBase( String scmTagBase )
+    {
+        this.scmTagBase = scmTagBase;
+    }
+
+    public String getGoals()
+    {
+        return goals;
+    }
 
-        return SUCCESS;
+    public void setGoals( String goals )
+    {
+        this.goals = goals;
+    }
+
+    public boolean isUseReleaseProfile()
+    {
+        return useReleaseProfile;
+    }
+
+    public void setUseReleaseProfile( boolean useReleaseProfile )
+    {
+        this.useReleaseProfile = useReleaseProfile;
+    }
+
+    public ContinuumReleaseManagerListener getListener()
+    {
+        return listener;
+    }
+
+    public void setListener( ContinuumReleaseManagerListener listener )
+    {
+        this.listener = listener;
     }
 }

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=442050&r1=442049&r2=442050
==============================================================================
--- 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 Sun Sep 10 17:39:51 2006
@@ -19,6 +19,7 @@
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.release.ContinuumReleaseManager;
 import org.apache.maven.continuum.release.DefaultReleaseManagerListener;
+import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.model.Model;
 import org.apache.maven.plugins.release.versions.VersionInfo;
@@ -46,6 +47,8 @@
 {
     private int projectId;
 
+    private String releaseId;
+
     private String name;
 
     private String scmUsername;
@@ -64,7 +67,7 @@
 
     private List relVersions;
 
-    private DefaultReleaseManagerListener listener;
+    private ContinuumReleaseManagerListener listener;
 
     public String execute()
         throws Exception
@@ -77,7 +80,7 @@
 
         processProject( project.getWorkingDirectory(), "pom.xml" );
 
-        return "prepareRelease";
+        return "prompt";
     }
 
     public String doPrepare()
@@ -88,12 +91,44 @@
         Project project = getContinuum().getProject( projectId );
 
         name = project.getName();
+        if ( name == null )
+        {
+            name = project.getArtifactId();
+        }
 
         ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
 
-        releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(), getDevVersionMap(), listener );
+        releaseId = releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(),
+                                            getDevVersionMap(), listener );
 
-        return SUCCESS;
+        return "initialized";
+    }
+
+    public String checkProgress()
+        throws Exception
+    {
+        String status;
+
+        ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
+
+        listener = (ContinuumReleaseManagerListener) releaseManager.getListeners().get( releaseId );
+
+        if ( listener.getState() == ContinuumReleaseManagerListener.INITIALIZED )
+        {
+            status = "initialized";
+        }
+        else if ( listener.getState() == ContinuumReleaseManagerListener.LISTENING )
+        {
+            status = "inProgress";
+        }
+        else
+        {
+            releaseManager.getListeners().remove( releaseId );
+
+            return "finished";
+        }
+
+        return status;
     }
 
     private void processProject( String workingDirectory, String pomFilename )
@@ -276,7 +311,7 @@
         this.projects = projects;
     }
 
-    public DefaultReleaseManagerListener getListener()
+    public ContinuumReleaseManagerListener getListener()
     {
         return listener;
     }
@@ -294,5 +329,15 @@
     public void setName( String name )
     {
         this.name = name;
+    }
+
+    public String getReleaseId()
+    {
+        return releaseId;
+    }
+
+    public void setReleaseId( String releaseId )
+    {
+        this.releaseId = releaseId;
     }
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Sun Sep 10 17:39:51 2006
@@ -11,6 +11,14 @@
       <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
       <role-hint>check-out-project</role-hint>
     </component>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+      <role-hint>prepare-release</role-hint>
+    </component>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+      <role-hint>perform-release</role-hint>
+    </component>
   </load-on-start>
 
   <components>

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=442050&r1=442049&r2=442050
==============================================================================
--- 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 Sun Sep 10 17:39:51 2006
@@ -305,27 +305,29 @@
       </result>
       <result name="performRelease">
         <param name="actionName">performRelease</param>
-        <param name="projectId">${projectId}</param>
       </result>
     </action>
 
     <action name="prepareRelease" class="prepareRelease">
-      <interceptor-ref name="execAndWait">
-        <param name="delay">5000</param>
-      </interceptor-ref>
-      <result name="wait">prepareReleaseProgress.jsp</result>
-      <result name="error">prepareReleaseFailure.jsp</result>
-      <result name="success">prepareReleaseFinished.jsp</result>
+      <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">releaseFinished.jsp</result>
     </action>
 
     <action name="performRelease" class="performRelease">
-      <interceptor-ref name="execAndWait">
-        <param name="delay">5000</param>
-        <param name="scmUrl">${scmUrl}</param>
-      </interceptor-ref>
-      <result name="wait">performReleaseProgress.jsp</result>
-      <result name="error">performReleaseFailure.jsp</result>
-      <result name="success">performReleaseFinished.jsp</result>
+      <result name="prompt">performRelease.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>
+      <result name="inProgress">performReleaseProgress.jsp</result>
+      <result name="finished">releaseFinished.jsp</result>
     </action>
 
   </package>

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performRelease.jsp?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performRelease.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performRelease.jsp Sun Sep 10 17:39:51 2006
@@ -8,7 +8,7 @@
         <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2>Prepare Project Release</h2>
+      <h2>Perform Project Release</h2>
       <ww:form action="performRelease!doPerform.action" method="post">
         <h3>Common Release Parameters</h3>
         <input type="hidden" name="projectId" value="<ww:property value="projectId"/>"/>

Added: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp?view=auto&rev=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp (added)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp Sun Sep 10 17:39:51 2006
@@ -0,0 +1,46 @@
+<%@ 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>
+        <title><ww:text name="releaseProject.page.title"/></title>
+    </head>
+    <body>
+      <h2>Continuum Release</h2>
+      <h3><ww:property value="name"/></h3>
+      <ww:form action="performRelease!checkProgress.action" method="post">
+        <ww:hidden name="releaseId"/>
+        <div class="axial">
+          <table width="100%">
+            <tr>
+              <th>Status</th>
+              <th>Phase</th>
+            </tr>
+            <ww:iterator value="listener.phases">
+              <tr>
+                <ww:if test="listener.completedPhases.contains( top )">
+                  <td>done</td>
+                </ww:if>
+                <ww:elseif test="listener.inProgress.equals( top )">
+                  <ww:if test="listener.error == null">
+                    <td>in progress</td>
+                  </ww:if>
+                  <ww:else>
+                    <td>error</td>
+                  </ww:else>
+                </ww:elseif>
+                <ww:else>
+                  <td>not done</td>
+                </ww:else>
+                <td><ww:property/></td>
+              </tr>
+            </ww:iterator>
+          </table>
+        </div>
+        <ww:submit value="Refresh"/>
+      </ww:form>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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=442050&r1=442049&r2=442050
==============================================================================
--- 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 Sun Sep 10 17:39:51 2006
@@ -8,13 +8,13 @@
         <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2>Perform Project Release</h2>
-      <ww:form action="performRelease!doPerform.action" method="post">
+      <h2>Prepare Project Release</h2>
+      <ww:form action="prepareRelease!doPrepare.action" method="post">
         <h3>Release Parameters</h3>
         <input type="hidden" name="projectId" value="<ww:property value="projectId"/>"/>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <ww:textfield label="SCM Url" name="scmUsername"/>
+            <ww:textfield label="SCM Username" name="scmUsername"/>
             <ww:textfield label="SCM Password" name="scmPassword"/>
             <ww:textfield label="SCM Tag" name="scmTag"/>
             <ww:textfield label="SCM Tag Base" name="scmTagBase"/>

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp?view=diff&rev=442050&r1=442049&r2=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp Sun Sep 10 17:39:51 2006
@@ -10,25 +10,38 @@
     <body>
       <h2>Continuum Release</h2>
       <h3><ww:property value="name"/></h3>
-      <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
-          <tr>
-            <th>&nbsp;</th>
-            <th>Phase</th>
-          </tr>
-          <ww:iterator value="listener.phases">
+      <ww:form action="prepareRelease!checkProgress.action" method="post">
+        <ww:hidden name="projectId"/>
+        <ww:hidden name="releaseId"/>
+        <div class="axial">
+          <table width="100%">
             <tr>
-              <ww:if test="listener.completedPhases.contains( listener.phases )">
-                <td>done</td>
-              </ww:if>
-              <ww:else>
-                <td>not done</td>
-              </ww:else>
-              <td><ww:property/></td>
+              <th>Status</th>
+              <th>Phase</th>
             </tr>
-          </ww:iterator>
-        </table>
-      </div>
+            <ww:iterator value="listener.phases">
+              <tr>
+                <ww:if test="listener.completedPhases.contains( top )">
+                  <td>done</td>
+                </ww:if>
+                <ww:elseif test="listener.inProgress.equals( top )">
+                  <ww:if test="listener.error == null">
+                    <td>in progress</td>
+                  </ww:if>
+                  <ww:else>
+                    <td>error</td>
+                  </ww:else>
+                </ww:elseif>
+                <ww:else>
+                  <td>not done</td>
+                </ww:else>
+                <td><ww:property/></td>
+              </tr>
+            </ww:iterator>
+          </table>
+        </div>
+        <ww:submit value="Refresh"/>
+      </ww:form>
     </body>
   </ww:i18n>
 </html>

Added: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp?view=auto&rev=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp (added)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp Sun Sep 10 17:39:51 2006
@@ -0,0 +1,46 @@
+<%@ 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>
+        <title><ww:text name="releaseProject.page.title"/></title>
+    </head>
+    <body>
+      <h2>Continuum Release</h2>
+      <h3><ww:property value="name"/></h3>
+      <ww:form action="releaseProject!promptReleaseGoal.action" method="post">
+        <ww:hidden name="projectId"/>
+        <div class="axial">
+          <table width="100%">
+            <tr>
+              <th>Status</th>
+              <th>Phase</th>
+            </tr>
+            <ww:iterator value="listener.phases">
+              <tr>
+                <ww:if test="listener.completedPhases.contains( top )">
+                  <td>done</td>
+                </ww:if>
+                <ww:elseif test="listener.inProgress.equals( top )">
+                  <ww:if test="listener.error == null">
+                    <td>in progress</td>
+                  </ww:if>
+                  <ww:else>
+                    <td>error</td>
+                  </ww:else>
+                </ww:elseif>
+                <ww:else>
+                  <td>not done</td>
+                </ww:else>
+                <td><ww:property/></td>
+              </tr>
+            </ww:iterator>
+          </table>
+        </div>
+        <ww:submit value="Done"/>
+      </ww:form>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseFinished.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseResult.jsp?view=auto&rev=442050
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseResult.jsp (added)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseResult.jsp Sun Sep 10 17:39:51 2006
@@ -0,0 +1,38 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib prefix="c1" uri="continuum" %>
+<html>
+  <ww:i18n name="localization.Continuum">
+    <head>
+        <title><ww:text name="releaseResult.page.title"/></title>
+    </head>
+    <body>
+      <div id="h3">
+        <h3>
+            <ww:text name="releaseResult.section.title">
+                <ww:param><ww:property value="projectName"/></ww:param>
+            </ww:text>
+        </h3>
+
+        <div class="axial">
+          <table border="1" cellspacing="2" cellpadding="3" width="100%">
+            <c1:data label="%{getText('releaseResult.startTime')}">
+                <ww:param name="after"><c1:date name="releaseResult.startTime"/></ww:param>
+            </c1:data>
+            <c1:data label="%{getText('releaseResult.endTime')}">
+                <ww:param name="after"><c1:date name="releaseResult.endTime"/></ww:param>
+            </c1:data>
+          </table>
+        </div>
+
+        <h4><ww:text name="releaseResult.buildError"/></h4>
+        <p>
+          <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
+          <code><pre><ww:property value="releaseResult.error"/></pre></code>
+          </div>
+        </p>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseResult.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message