You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2007/09/14 23:10:50 UTC
svn commit: r575794 - in /maven/continuum/trunk:
continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/
continuum-webapp/src/main/resources/localization/
continuum-webapp/src/main/webapp/WEB-INF/jsp/
Author: olamy
Date: Fri Sep 14 14:10:50 2007
New Revision: 575794
URL: http://svn.apache.org/viewvc?rev=575794&view=rev
Log:
[CONTINUUM-1279] add "Build Information" to the build result reports and notification.
Modified:
maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
Modified: maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm?rev=575794&r1=575793&r2=575794&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Fri Sep 14 14:10:50 2007
@@ -121,6 +121,32 @@
#end
#end
#end
+
+#if ( $build.buildDefinition )
+****************************************************************************
+Build Defintion:
+****************************************************************************
+#if ( $build.buildDefinition.type == 'ant' )
+Ant build filename: $build.buildDefinition.buildFile
+Goals: $build.buildDefinition.goals
+#elseif ( $build.buildDefinition.type == 'shell' )
+shell: $build.buildDefinition.buildFile
+#else
+POM filename: $build.buildDefinition.buildFile
+Goals: $build.buildDefinition.goals
+#end
+Arguments: $build.buildDefinition.arguments
+Build Fresh: $build.buildDefinition.buildFresh
+Always Build: $build.buildDefinition.alwaysBuild
+Default Build Definition: $build.buildDefinition.defaultForProject
+Schedule: $build.buildDefinition.schedule.name
+#if ( $build.buildDefinition.profile )
+Profile Name: $build.buildDefinition.profile.name
+#end
+Description: $build.buildDefinition.description
+#end
+
+
#if ( $build.testResult )
****************************************************************************
Test Summary:
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=575794&r1=575793&r2=575794&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 Fri Sep 14 14:10:50 2007
@@ -485,6 +485,18 @@
buildResult.generatedReports.title = Generated Reports
buildResult.generatedReports.surefire = Surefire Report
buildResult.buildOutput.text = Download as Text
+buildResult.buildDefinition = Build Definition Used
+buildResult.buildDefinition.ant.label = Ant build filename
+buildResult.buildDefinition.shell.label = Shell executable
+buildResult.buildDefinition.maven.label = POM filename
+buildResult.buildDefinition.goals = Goals
+buildResult.buildDefinition.arguments = Arguments
+buildResult.buildDefinition.buildFresh = Build Fresh
+buildResult.buildDefinition.alwaysBuild = Always Build
+buildResult.buildDefinition.defaultForProject = Is it default ?
+buildResult.buildDefinition.schedule = Schedule
+buildResult.buildDefinition.profileName = Profile
+buildResult.buildDefinition.description = Description
# From ContinuumProjectState
buildResult.trigger.0 = Scheduled
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=575794&r1=575793&r2=575794&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Fri Sep 14 14:10:50 2007
@@ -155,6 +155,64 @@
<ww:else>
<b><ww:text name="buildResult.dependencies.noChanges"/></b>
</ww:else>
+
+ <h4><ww:text name="buildResult.buildDefinition"/></h4>
+ <table border="1" cellspacing="2" cellpadding="3" width="80%">
+ <tbody>
+ <ww:if test="buildResult.buildDefinition.type='ant'">
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.ant.label"/></th>
+ <td><ww:property value="buildResult.buildDefinition.buildFile"/></td>
+ </tr>
+ </ww:if>
+ <ww:elseif test="buildResult.buildDefinition.type='shell'">
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.shell.label"/></th>
+ <td><ww:property value="buildResult.buildDefinition.buildFile"/></td>
+ </tr>
+ </ww:elseif>
+ <ww:else>
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.maven.label"/></th>
+ <td><ww:property value="buildResult.buildDefinition.buildFile"/></td>
+ </tr>
+ </ww:else>
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.goals"/></th>
+ <td><ww:property value="buildResult.buildDefinition.goals"/></td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.arguments"/></th>
+ <td><ww:property value="buildResult.buildDefinition.arguments"/></td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.buildFresh"/></th>
+ <td><ww:property value="buildResult.buildDefinition.buildFresh"/></td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.alwaysBuild"/></th>
+ <td><ww:property value="buildResult.buildDefinition.alwaysBuild"/></td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.defaultForProject"/></th>
+ <td><ww:property value="buildResult.buildDefinition.defaultForProject"/></td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.schedule"/></th>
+ <td><ww:property value="buildResult.buildDefinition.schedule.name"/></td>
+ </tr>
+ <ww:if test="buildResult.buildDefinition.profile != null">
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.profileName"/></th>
+ <td><ww:property value="buildResult.buildDefinition.profile.name"/></td>
+ </tr>
+ </ww:if>
+ <tr class="b">
+ <th><ww:text name="buildResult.buildDefinition.description"/></th>
+ <td><ww:property value="buildResult.buildDefinition.description"/></td>
+ </tr>
+ </tbody>
+ </table>
<ww:if test="hasSurefireResults">
<h4><ww:text name="buildResult.generatedReports.title"/></h4>