continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r365639 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/BuildResultAction.java resources/localization/Continuum.properties webapp/buildResult.jsp
Date Tue, 03 Jan 2006 14:21:32 GMT
Author: evenisse
Date: Tue Jan  3 06:21:26 2006
New Revision: 365639

URL: http://svn.apache.org/viewcvs?rev=365639&view=rev
Log:
Add change set

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=365639&r1=365638&r2=365639&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
Tue Jan  3 06:21:26 2006
@@ -23,6 +23,7 @@
 import com.opensymphony.xwork.ActionSupport;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -41,11 +42,15 @@
 
     private String projectName;
 
+    private List changeSet;
+
     public String execute()
     {
         try
         {
             buildResult = continuum.getBuildResult( buildId );
+
+            changeSet = continuum.getChangesSinceLastSuccess( projectId, buildId );
         }
         catch ( ContinuumException e )
         {
@@ -92,5 +97,10 @@
     public BuildResult getBuildResult()
     {
         return buildResult;
+    }
+
+    public List getChangesSinceLastSuccess()
+    {
+        return changeSet;
     }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=365639&r1=365638&r2=365639&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Tue Jan  3 06:21:26 2006
@@ -264,6 +264,12 @@
 buildResult.buildError = Build Error
 buildResult.buildOutput = Output
 buildResult.noOutput = No output.
+buildResult.changes = Changes
+buildResult.changes.author = Author
+buildResult.changes.date = Date
+buildResult.changes.comment = Comment
+buildResult.changes.files = Files
+buildResult.changesSinceLastSuccess = Other Changes Since Last Success
 
 // ----------------------------------------------------------------------
 // Page: WorkingCopy

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp?rev=365639&r1=365638&r2=365639&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp Tue Jan  3 06:21:26
2006
@@ -54,6 +54,53 @@
           </table>
         </div>
 
+        <h4><ww:text name="buildResult.changes"/></h4>
+        <ww:if test="buildResult.scmResult.changes != null && buildResult.scmResult.changes.size()
> 0">
+            <ww:set name="changes" value="buildResult.scmResult.changes" scope="request"/>
+            <ec:table items="changes"
+                      var="change"
+                      showExports="false"
+                      showPagination="false"
+                      showStatusBar="false"
+                      filterable="false">
+              <ec:row>
+                <ec:column property="author" title="buildResult.changes.author"/>
+                <ec:column property="date" title="buildResult.changes.date" cell="date"/>
+                <ec:column property="comment" title="buildResult.changes.comment" sortable="false"/>
+                <ec:column property="files" title="buildResult.changes.files" sortable="false">
+                    <c:forEach var="scmFile" items="${pageScope.change.files}">
+                        <c:out value="${scmFile.name}"/><br />
+                    </c:forEach>
+                </ec:column>
+              </ec:row>
+            </ec:table>
+        </ww:if>
+        <ww:else>
+          <b><ww:text name="buildResult.noChanges"/></b>
+        </ww:else>
+
+        <ww:if test="changesSinceLastSuccess != null && changesSinceLastSuccess.size()
> 0">
+            <h4><ww:text name="buildResult.changesSinceLastSuccess"/></h4>
+            <ww:set name="changes" value="changesSinceLastSuccess" scope="request"/>
+            <ec:table items="changes"
+                      var="change"
+                      showExports="false"
+                      showPagination="false"
+                      showStatusBar="false"
+                      filterable="false">
+              <ec:row>
+                <ec:column property="author" title="buildResult.changes.author"/>
+                <ec:column property="date" title="buildResult.changes.date" cell="date"/>
+                <ec:column property="comment" title="buildResult.changes.comment" sortable="false"/>
+                <ec:column property="files" title="buildResult.changes.files" sortable="false">
+                    <c:forEach var="scmFile" items="${pageScope.change.files}">
+                        <c:out value="${scmFile.name}"/><br />
+                    </c:forEach>
+                </ec:column>
+              </ec:row>
+            </ec:table>
+        </ww:if>
+
         <ww:if test="buildResult.state == 4">
           <h4><ww:text name="buildResult.buildError"/></h4>
           <p>



Mime
View raw message