continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r689665 - in /continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ mdo/ webapp/WEB-INF/jsp/components/
Date Wed, 27 Aug 2008 23:32:26 GMT
Author: ctan
Date: Wed Aug 27 16:32:26 2008
New Revision: 689665

URL: http://svn.apache.org/viewvc?rev=689665&view=rev
Log:
[CONTINUUM-1371]
- for group release: can only release group with maven2 projects only
- for project release: disable release icon if not maven2 project

Modified:
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
    continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=689665&r1=689664&r2=689665&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
Wed Aug 27 16:32:26 2008
@@ -500,6 +500,8 @@
 
         boolean allBuildsOk = true;
 
+        boolean allMavenTwo = true;
+        
         projectList = getContinuum().getProjectsInGroupWithDependencies( projectGroupId );
 
         if ( projectList != null )
@@ -529,6 +531,11 @@
                         return INPUT;
                     }
                 }
+                
+                if ( !"maven2".equals( p.getExecutorId() ) )
+                {
+                    allMavenTwo = false;
+                }
             }
         }
 
@@ -540,7 +547,7 @@
 
         releaseProjectId = parent.getId();
 
-        if ( allBuildsOk )
+        if ( allBuildsOk && allMavenTwo )
         {
             return SUCCESS;
         }

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=689665&r1=689664&r2=689665&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
Wed Aug 27 16:32:26 2008
@@ -100,6 +100,8 @@
 
             model.setProjectGroupName( project.getProjectGroup().getName() );
 
+            model.setProjectType( project.getExecutorId() );
+            
             if ( getContinuum().isInBuildingQueue( project.getId() ) )
             {
                 model.setInBuildingQueue( true );

Modified: continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo?rev=689665&r1=689664&r2=689665&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Wed Aug 27 16:32:26 2008
@@ -157,6 +157,13 @@
           <description>last build duration of the project</description>
           <type>String</type>
         </field>
+        <field>
+          <name>projectType</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <description>type of the project</description>
+          <type>String</type>
+        </field>
       </fields>
     </class>
     <class>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=689665&r1=689664&r2=689665&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Wed Aug 27 16:32:26 2008
@@ -187,7 +187,7 @@
       <ec:column property="releaseAction" title="&nbsp;" width="1%" sortable="false">
         <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
         <c:choose>
-          <c:when test="${pageScope.project.state == 2}">
+          <c:when test="${pageScope.project.state == 2 && pageScope.project.projectType
== 'maven2'}">
             <ww:url id="releaseProjectUrl" action="releasePromptGoal" namespace="/">
               <ww:param name="projectId" value="${project.id}"/>
             </ww:url>



Mime
View raw message