continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r576872 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/execution/ continuum-webapp/src/main/webapp/WEB-INF/jsp/components/
Date Tue, 18 Sep 2007 12:52:07 GMT
Author: evenisse
Date: Tue Sep 18 05:52:07 2007
New Revision: 576872

URL: http://svn.apache.org/viewvc?rev=576872&view=rev
Log:
Fix some state icons

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=576872&r1=576871&r2=576872&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Tue Sep 18 05:52:07 2007
@@ -854,7 +854,7 @@
     /**
      * fire off a build for all of the projects in a project group using their default builds.
      *
-     * @param projectGroupId the project group id
+     * @param projectGroupId    the project group id
      * @param buildDefinitionId the build definition id to use
      * @throws ContinuumException
      */
@@ -1108,7 +1108,7 @@
             {
                 ContinuumBuildExecutor executor = executorManager.getBuildExecutor( project.getExecutorId()
);
 
-                if ( executor.isBuilding( project ) )
+                if ( executor.isBuilding( project ) || project.getState() == ContinuumProjectState.UPDATING
)
                 {
                     // project is building
                     getLogger().info( "Project '" + project.getName() + "' already being
built." );

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=576872&r1=576871&r2=576872&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
Tue Sep 18 05:52:07 2007
@@ -25,6 +25,7 @@
 import org.apache.maven.continuum.model.scm.TestResult;
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.Profile;
+import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
 import org.apache.maven.continuum.utils.shell.ExecutionResult;
 import org.apache.maven.continuum.utils.shell.ShellCommandHelper;
@@ -278,7 +279,7 @@
 
     public boolean isBuilding( Project project )
     {
-        return shellCommandHelper.isRunning( project.getId() );
+        return project.getState() == ContinuumProjectState.BUILDING || shellCommandHelper.isRunning(
project.getId() );
     }
 
     public void killProcess( Project project )

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=576872&r1=576871&r2=576872&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Tue Sep 18 05:52:07 2007
@@ -58,7 +58,7 @@
       <c:set var="project" value="${pageScope.project}" scope="request"/>
 
       <%-- placed here for reusability --%>
-      <c:set var="projectIdle" value="${!project.inBuildingQueue and !project.inCheckoutQueue
and ( ( ( project.state gt 0 ) and ( project.state lt 5 ) ) or project.state == 10 ) }" scope="request"/>
+      <c:set var="projectIdle" value="${!project.inBuildingQueue and ( ( ( project.state
gt 0 ) and ( project.state lt 5 ) ) or project.state == 7 or project.state gt 8 ) }" scope="request"/>
 
       <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
         <ec:column alias="checkbox" title=" " style="width:5px" filterable="false" sortable="false"
width="1%">
@@ -97,7 +97,7 @@
       <ec:column property="projectGroupName" title="summary.projectTable.group" width="30%"/>

       <ec:column property="buildNowAction" title="&nbsp;" width="1%">
         <c:choose>
-          <c:when test="${project.inBuildingQueue or project.inCheckoutQueue}">
+          <c:when test="${project.inBuildingQueue}">
             <img src="<ww:url value='/images/inqueue.gif'/>" alt="In Queue" title="In
Queue" border="0">
           </c:when>
           <c:otherwise>



Mime
View raw message