continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r447307 - in /maven/continuum/branches/continuum-acegi: ./ continuum-api/src/main/java/org/apache/maven/continuum/execution/ continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ continuum-core/ continuum-core/src/main/jav...
Date Mon, 18 Sep 2006 07:41:22 GMT
Author: carlos
Date: Mon Sep 18 00:41:20 2006
New Revision: 447307

URL: http://svn.apache.org/viewvc?view=rev&rev=447307
Log:
Merged rev# 446409-447304 from trunk

Added:
    maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildCancelledException.java
      - copied unchanged from r447304, maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildCancelledException.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/images/cancelbuild.gif
      - copied unchanged from r447304, maven/continuum/trunk/continuum-webapp/src/main/webapp/images/cancelbuild.gif
Removed:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/releaseResult.jsp
Modified:
    maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
    maven/continuum/branches/continuum-acegi/continuum-core/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
    maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.xml
    maven/continuum/branches/continuum-acegi/continuum-release/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performRelease.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareRelease.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/releaseProject.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
    maven/continuum/branches/continuum-acegi/pom.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
Mon Sep 18 00:41:20 2006
@@ -93,6 +93,8 @@
         File continuumTmpDir = new File( TMP_DIR, "continuum" );
 
         File uploadDirectory = new File( continuumTmpDir, baseDirectory );
+        // resolve any '..' as it will cause issues
+        uploadDirectory = uploadDirectory.getCanonicalFile();
 
         uploadDirectory.mkdirs();
 

Modified: maven/continuum/branches/continuum-acegi/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/pom.xml?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/pom.xml Mon Sep 18 00:41:20 2006
@@ -133,7 +133,6 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-taskqueue</artifactId>
-      <version>1.0-alpha-4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>jpox</groupId>
@@ -160,7 +159,6 @@
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-release</artifactId>
-      <version>1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <profiles>

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
Mon Sep 18 00:41:20 2006
@@ -29,6 +29,7 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineException;
 
 import java.io.File;
 import java.util.Iterator;
@@ -192,6 +193,20 @@
             getLogger().info( "Exit code: " + result.getExitCode() );
 
             return new ContinuumBuildExecutionResult( FileUtils.fileRead( output ), result.getExitCode()
);
+        }
+        catch ( CommandLineException e )
+        {
+            if ( e.getCause() instanceof InterruptedException )
+            {
+                throw new ContinuumBuildCancelledException( "The build was cancelled", e
);
+            }
+            else
+            {
+                throw new ContinuumBuildExecutorException(
+                    "Error while executing shell command. The most common error is that '"
+ executable + "' "
+                        + "is not in your path.",
+                    e );
+            }
         }
         catch ( Exception e )
         {

Modified: maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.xml?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.xml Mon
Sep 18 00:41:20 2006
@@ -22,6 +22,7 @@
         <field>
           <name>id</name>
           <version>1.0.0+</version>
+          <required>true</required>
           <type>int</type>
           <identifier>true</identifier>
         </field>

Modified: maven/continuum/branches/continuum-acegi/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-release/pom.xml?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-release/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-release/pom.xml Mon Sep 18 00:41:20
2006
@@ -16,12 +16,10 @@
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
@@ -31,14 +29,13 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-taskqueue</artifactId>
-      <version>1.0-alpha-3</version>
     </dependency>
   </dependencies>
   <build>
     <testResources>
       <testResource>
         <directory>src/test/scm</directory>
-        <targetPath>scm-src</targetPath>
+        <targetPath>../scm-src</targetPath>
       </testResource>
     </testResources>
   </build>

Modified: maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
Mon Sep 18 00:41:20 2006
@@ -32,6 +32,8 @@
 
     private ReleaseManagerListener listener;
 
+    private long maxExecutionTime;
+
     public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor,
                                        ReleaseManagerListener listener )
     {
@@ -68,5 +70,15 @@
     public void setListener( ReleaseManagerListener listener )
     {
         this.listener = listener;
+    }
+
+    public long getMaxExecutionTime()
+    {
+         return maxExecutionTime;
+    }
+
+    public void setMaxExecutionTime( long maxTime )
+    {
+        this.maxExecutionTime = maxTime;
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
Mon Sep 18 00:41:20 2006
@@ -67,7 +67,7 @@
     public void testReleaseSimpleProject()
         throws Exception
     {
-        String scmPath = new File( getBasedir(), "target/test-classes/scm-src" ).getAbsolutePath().replace(
'\\', '/' );
+        String scmPath = new File( getBasedir(), "target/scm-src" ).getAbsolutePath().replace(
'\\', '/' );
         File workDir = new File( getBasedir(), "target/test-classes/work-dir" );
         FileUtils.deleteDirectory( workDir );
         File testDir = new File( getBasedir(), "target/test-classes/test-dir" );
@@ -101,7 +101,7 @@
     public void testReleaseSimpleProjectWithNextVersion()
         throws Exception
     {
-        String scmPath = new File( getBasedir(), "target/test-classes/scm-src" ).getAbsolutePath().replace(
'\\', '/' );
+        String scmPath = new File( getBasedir(), "target/scm-src" ).getAbsolutePath().replace(
'\\', '/' );
         File workDir = new File( getBasedir(), "target/test-classes/work-dir" );
         FileUtils.deleteDirectory( workDir );
         File testDir = new File( getBasedir(), "target/test-classes/test-dir" );

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
Mon Sep 18 00:41:20 2006
@@ -120,7 +120,7 @@
 
         releaseManager.perform( releaseId, performDirectory, goals, useReleaseProfile, listener
);
 
-        return "initialized";
+        return checkProgress();
     }
 
     public String checkProgress()
@@ -136,17 +136,9 @@
         {
             status = "initialized";
         }
-        else if ( listener.getState() == ContinuumReleaseManagerListener.LISTENING )
-        {
-            status = "inProgress";
-        }
         else
         {
-            releaseManager.getListeners().remove( releaseId );
-
-            result = (ReleaseResult) releaseManager.getReleaseResults().get( releaseId );
-
-            status = "finished";
+            status = "inProgress";
         }
 
         return status;

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
Mon Sep 18 00:41:20 2006
@@ -117,7 +117,7 @@
         releaseId = releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(),
                                             getDevVersionMap(), listener );
 
-        return "initialized";
+        return checkProgress();
     }
 
     public String viewResult()
@@ -145,13 +145,9 @@
 
             status = "finished";
         }
-        else if ( listener.getState() == ContinuumReleaseManagerListener.LISTENING )
-        {
-            status = "inProgress";
-        }
         else
         {
-            status = "initialized";
+            status = "inProgress";
         }
 
         return status;

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
Mon Sep 18 00:41:20 2006
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.extremecomponents.table.bean.Column;
 import org.extremecomponents.table.cell.DisplayCell;
@@ -39,17 +40,43 @@
 
         String contextPath = tableModel.getContext().getContextPath();
 
-        if ( !project.isInQueue() && ( project.getState() == 1 || project.getState()
== 2 || project.getState() == 3 ||
-            project.getState() == 4 ) )
+        if ( project.isInQueue() )
         {
-            return "<a href=\"" + contextPath + "/buildProject.action?projectId=" + project.getId()
+ "\"><img src=\"" +
-                contextPath +
-                "/images/buildnow.gif\" alt=\"Build Now\" title=\"Build Now\" border=\"0\"></a>";
+            return image( contextPath, "In Queue", "buildnow_disabled.gif" );
         }
-        else
+
+        switch ( project.getState() )
         {
-            return "<img src=\"" + contextPath +
-                "/images/buildnow_disabled.gif\" alt=\"Build Now\" title=\"Build Now\" border=\"0\">";
+            case ContinuumProjectState.NEW:
+            case ContinuumProjectState.OK:
+            case ContinuumProjectState.FAILED:
+            case ContinuumProjectState.ERROR:
+            {
+                return createActionLink( contextPath, project, "buildProject", "Build Now",
"buildnow.gif" );
+            }
+
+            case ContinuumProjectState.BUILDING:
+            {
+                return createActionLink( contextPath, project, "cancelBuild", "Cancel Build",
"cancelbuild.gif" );
+            }
+
+            default:
+            {
+                return image( contextPath, "Build Now", "buildnow_disabled.gif" );
+            }
         }
+    }
+
+    private static String createActionLink( String contextPath, ProjectSummary project, String
action, String label,
+                                            String image )
+    {
+        return "<a href='" + contextPath + "/" + action + ".action?projectId=" + project.getId()
+ "'>"
+            + image( contextPath, label, image ) + "</a>";
+    }
+
+    private static String image( String contextPath, String label, String image )
+    {
+        return "<img src='" + contextPath + "/images/" + image + "' alt=' " + label +
"' title='" + image
+            + "' border='0' />";
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
Mon Sep 18 00:41:20 2006
@@ -50,6 +50,7 @@
             case ContinuumProjectState.OK:
             case ContinuumProjectState.FAILED:
             case ContinuumProjectState.ERROR:
+            case ContinuumProjectState.BUILDING:
             {
                 String state = StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath()
);
 
@@ -61,13 +62,6 @@
                 {
                     return state;
                 }
-            }
-
-            case ContinuumProjectState.BUILDING:
-            {
-                return StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath()
);
-                // TODO enable cancel button
-                // + " " + createActionLink( "cancelBuild", project, "(cancel)" );
             }
 
             default:

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
Mon Sep 18 00:41:20 2006
@@ -274,23 +274,12 @@
 
     <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">
       <result name="prompt">performRelease.jsp</result>
-      <!-- should be exec and wait -->
-      <result name="initialized" type="redirect-action">
-        <param name="actionName">performRelease!checkProgress.action</param>
-        <param name="releaseId">${releaseId}</param>
-      </result>
       <result name="inProgress">performReleaseProgress.jsp</result>
       <result name="finished">performReleaseFinished.jsp</result>
     </action>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performRelease.jsp?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performRelease.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performRelease.jsp
Mon Sep 18 00:41:20 2006
@@ -1,7 +1,4 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" 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>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseFinished.jsp?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
Mon Sep 18 00:41:20 2006
@@ -1,7 +1,4 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" 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>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseProgress.jsp?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
Mon Sep 18 00:41:20 2006
@@ -1,7 +1,4 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" 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>
@@ -11,42 +8,49 @@
     <body>
       <h2><ww:text name="performReleaseProgress.section.title"/></h2>
       <h3><ww:property value="name"/></h3>
-      <ww:form action="performRelease!checkProgress.action" method="post">
+      <ww:form action="performRelease!checkProgress.action" method="get">
         <ww:hidden name="projectId"/>
         <ww:hidden name="releaseId"/>
-        <div class="axial">
-          <table width="100%">
-            <tr>
-              <th><ww:text name="releaseProject.status"/></th>
-              <th width="100%"><ww:text name="releaseProject.phase"/></th>
-            </tr>
-            <ww:iterator value="listener.phases">
+        <ww:if test="listener.phases.size == 0">
+          <p>
+            The release goal is currently initializing... Please wait while server prepares
your project for release.
+          </p>
+        </ww:if>
+        <ww:else>
+          <div class="axial">
+            <table width="100%">
               <tr>
-                <td>
-                <ww:if test="listener.completedPhases.contains( top )">
-                  <img src="<ww:url value='/images/icon_success_sml.gif'/>"
-                       alt="Done" title="Done" border="0">
-                </ww:if>
-                <ww:elseif test="listener.inProgress.equals( top )">
-                  <ww:if test="listener.error == null">
-                    <img src="<ww:url value='/images/building.gif'/>"
-                         alt="In Progress" title="In Progress" border="0">
+                <th><ww:text name="releaseProject.status"/></th>
+                <th width="100%"><ww:text name="releaseProject.phase"/></th>
+              </tr>
+              <ww:iterator value="listener.phases">
+                <tr>
+                  <td>
+                  <ww:if test="listener.completedPhases.contains( top )">
+                    <img src="<ww:url value='/images/icon_success_sml.gif'/>"
+                         alt="Done" title="Done" border="0">
                   </ww:if>
+                  <ww:elseif test="listener.inProgress.equals( top )">
+                    <ww:if test="listener.error == null">
+                      <img src="<ww:url value='/images/building.gif'/>"
+                           alt="In Progress" title="In Progress" border="0">
+                    </ww:if>
+                    <ww:else>
+                      <img src="<ww:url value='/images/icon_error_sml.gif'/>"
+                           alt="Error" title="Error" border="0">
+                    </ww:else>
+                  </ww:elseif>
                   <ww:else>
-                    <img src="<ww:url value='/images/icon_error_sml.gif'/>"
-                         alt="Error" title="Error" border="0">
+                    <img src="<ww:url value='/images/inqueue.gif'/>"
+                         alt="Queued" title="Queued" border="0">
                   </ww:else>
-                </ww:elseif>
-                <ww:else>
-                  <img src="<ww:url value='/images/inqueue.gif'/>"
-                       alt="Queued" title="Queued" border="0">
-                </ww:else>
-                </td>
-                <td><ww:property/></td>
-              </tr>
-            </ww:iterator>
-          </table>
-        </div>
+                  </td>
+                  <td><ww:property/></td>
+                </tr>
+              </ww:iterator>
+            </table>
+          </div>
+        </ww:else>
         <ww:submit value="Refresh"/>
       </ww:form>
     </body>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareRelease.jsp?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareRelease.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareRelease.jsp
Mon Sep 18 00:41:20 2006
@@ -1,7 +1,4 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" 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>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
Mon Sep 18 00:41:20 2006
@@ -1,7 +1,4 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" 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>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
Mon Sep 18 00:41:20 2006
@@ -1,7 +1,4 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" 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>
@@ -11,42 +8,49 @@
     <body>
       <h2><ww:text name="prepareReleaseProgress.section.title"/></h2>
       <h3><ww:property value="name"/></h3>
-      <ww:form action="prepareRelease!checkProgress.action" method="post">
+      <ww:form action="prepareRelease!checkProgress.action" method="get">
         <ww:hidden name="projectId"/>
         <ww:hidden name="releaseId"/>
-        <div class="axial">
-          <table width="100%">
-            <tr>
-              <th><ww:text name="releaseProject.status"/></th>
-              <th width="100%"><ww:text name="releaseProject.phase"/></th>
-            </tr>
-            <ww:iterator value="listener.phases">
+        <ww:if test="listener.phases.size == 0">
+          <p>
+            The release goal is currently initializing... Please wait while server prepares
your project for release.
+          </p>
+        </ww:if>
+        <ww:else>
+          <div class="axial">
+            <table width="100%">
               <tr>
-                <td>
-                <ww:if test="listener.completedPhases.contains( top )">
-                  <img src="<ww:url value='/images/icon_success_sml.gif'/>"
-                       alt="Done" title="Done" border="0">
-                </ww:if>
-                <ww:elseif test="listener.inProgress.equals( top )">
-                  <ww:if test="listener.error == null">
-                    <img src="<ww:url value='/images/building.gif'/>"
-                         alt="In Progress" title="In Progress" border="0">
+                <th><ww:text name="releaseProject.status"/></th>
+                <th width="100%"><ww:text name="releaseProject.phase"/></th>
+              </tr>
+              <ww:iterator value="listener.phases">
+                <tr>
+                  <td>
+                  <ww:if test="listener.completedPhases.contains( top )">
+                    <img src="<ww:url value='/images/icon_success_sml.gif'/>"
+                         alt="Done" title="Done" border="0">
                   </ww:if>
+                  <ww:elseif test="listener.inProgress.equals( top )">
+                    <ww:if test="listener.error == null">
+                      <img src="<ww:url value='/images/building.gif'/>"
+                           alt="In Progress" title="In Progress" border="0">
+                    </ww:if>
+                    <ww:else>
+                      <img src="<ww:url value='/images/icon_error_sml.gif'/>"
+                           alt="Error" title="Error" border="0">
+                    </ww:else>
+                  </ww:elseif>
                   <ww:else>
-                    <img src="<ww:url value='/images/icon_error_sml.gif'/>"
-                         alt="Error" title="Error" border="0">
+                    <img src="<ww:url value='/images/inqueue.gif'/>"
+                         alt="Queued" title="Queued" border="0">
                   </ww:else>
-                </ww:elseif>
-                <ww:else>
-                  <img src="<ww:url value='/images/inqueue.gif'/>"
-                       alt="Queued" title="Queued" border="0">
-                </ww:else>
-                </td>
-                <td><ww:property/></td>
-              </tr>
-            </ww:iterator>
-          </table>
-        </div>
+                  </td>
+                  <td><ww:property/></td>
+                </tr>
+              </ww:iterator>
+            </table>
+          </div>
+        </ww:else>
         <ww:submit value="Refresh"/>
       </ww:form>
     </body>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/releaseProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/releaseProject.jsp?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/releaseProject.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/releaseProject.jsp
Mon Sep 18 00:41:20 2006
@@ -1,7 +1,4 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" 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>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/viewReleaseResult.jsp?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
Mon Sep 18 00:41:20 2006
@@ -1,6 +1,4 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <ww:i18n name="localization.Continuum">

Modified: maven/continuum/branches/continuum-acegi/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/pom.xml?view=diff&rev=447307&r1=447306&r2=447307
==============================================================================
--- maven/continuum/branches/continuum-acegi/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/pom.xml Mon Sep 18 00:41:20 2006
@@ -317,6 +317,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
+        <artifactId>continuum-release</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-webapp</artifactId>
         <version>${pom.version}</version>
         <type>war</type>
@@ -408,6 +413,11 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-notification</artifactId>
         <version>1.0-alpha-5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-taskqueue</artifactId>
+        <version>1.0-alpha-4-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>



Mime
View raw message