You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/04/17 19:28:47 UTC

svn commit: r1674357 - in /continuum/trunk/continuum-webapp: pom.xml src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java src/main/mdo/view-models.mdo src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp

Author: batkinson
Date: Fri Apr 17 17:28:47 2015
New Revision: 1674357

URL: http://svn.apache.org/r1674357
Log:
[CONTINUUM-2435] Added capability to see the trigger when using distributed builds.

Modified:
    continuum/trunk/continuum-webapp/pom.xml
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
    continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=1674357&r1=1674356&r2=1674357&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Fri Apr 17 17:28:47 2015
@@ -94,7 +94,7 @@
               <models>
                 <model>src/main/mdo/view-models.mdo</model>
               </models>
-              <version>1.4.1</version>
+              <version>1.5.0</version>
             </configuration>
             <goals>
               <goal>java</goal>

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java?rev=1674357&r1=1674356&r2=1674357&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java Fri Apr 17 17:28:47 2015
@@ -240,6 +240,7 @@ public class QueuesAction
                 summary.setBuildDefinitionLabel( task.getBuildDefinitionLabel() );
                 summary.setHashCode( task.getHashCode() );
                 summary.setBuildAgentUrl( url );
+                summary.setTriggeredBy( task.getBuildTrigger().getTriggeredBy() );
 
                 currentDistributedBuilds.add( summary );
             }
@@ -285,6 +286,7 @@ public class QueuesAction
                     summary.setBuildDefinitionLabel( task.getBuildDefinitionLabel() );
                     summary.setHashCode( task.getHashCode() );
                     summary.setBuildAgentUrl( url );
+                    summary.setTriggeredBy( task.getBuildTrigger().getTriggeredBy() );
 
                     distributedBuildQueues.add( summary );
                 }

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=1674357&r1=1674356&r2=1674357&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Fri Apr 17 17:28:47 2015
@@ -626,6 +626,12 @@
           <required>true</required>
           <type>int</type>
         </field>
+        <field>
+          <name>triggeredBy</name>
+          <version>1.5.0+</version>
+          <required>true</required>
+          <type>String</type>
+        </field>
       </fields>
     </class>
     <class>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp?rev=1674357&r1=1674356&r2=1674357&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp Fri Apr 17 17:28:47 2015
@@ -59,6 +59,7 @@
                 </ec:column>
                 <ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
                 <ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
+                <ec:column property="triggeredBy" title="buildQueue.triggeredBy" />
                 <ec:column property="buildAgentUrl" title="distributedBuild.table.buildAgentUrl"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <s:url id="cancelUrl" action="cancelDistributedBuild" namespace="/">
@@ -108,6 +109,7 @@
                 </ec:column>
                 <ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
                 <ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
+                <ec:column property="triggeredBy" title="buildQueue.triggeredBy" />
                 <ec:column property="buildAgentUrl" title="distributedBuild.table.buildAgentUrl"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">