maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vmas...@apache.org
Subject svn commit: r160015 - in maven/maven-1/plugins/trunk/dashboard: ./ src/plugin-test/ src/plugin-test/testIndividualReportsGeneratedByDashboard/ src/plugin-test/testIndividualReportsNotGeneratedByDashboard/ src/plugin-test/testWhenNoReportsGenerated/ xdocs/
Date Mon, 04 Apr 2005 09:27:00 GMT
Author: vmassol
Date: Mon Apr  4 02:26:59 2005
New Revision: 160015

URL: http://svn.apache.org/viewcvs?view=rev&rev=160015
Log:
Default values for <code>maven.dashboard.basedir</code>, <code>maven.dashboard.includes</code>,
<code>maven.dashboard.excludes</code> and <code>maven.dashboard.ignoreFailures</code>
are copied from the equivalent Multiproject properties. This should reduce the number of properties
you have to set to get going as you need now only set the Multiproject properties.

Removed:
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/.cvsignore
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/.cvsignore
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testWhenNoReportsGenerated/.cvsignore
Modified:
    maven/maven-1/plugins/trunk/dashboard/plugin.jelly
    maven/maven-1/plugins/trunk/dashboard/plugin.properties
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/
  (props changed)
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/
  (props changed)
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testWhenNoReportsGenerated/   (props
changed)
    maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml
    maven/maven-1/plugins/trunk/dashboard/xdocs/faq.fml
    maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/dashboard/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/plugin.jelly?view=diff&r1=160014&r2=160015
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dashboard/plugin.jelly Mon Apr  4 02:26:59 2005
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2003-2004 The Apache Software Foundation.
+ * Copyright 2003-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,31 +41,45 @@
   -->
   <goal name="dashboard:report" description="Generate a dashboard report">
 
+    <!-- Default reactor properties from the Multiproject plug-in -->
+
+    <m:get var="mBasedir" property="maven.multiproject.basedir" plugin="maven-multiproject-plugin"/>
+    <m:property var="dBasedir" name="mBaseDir" defaultValue="${basedir}"/>
+      
+    <m:get var="mIncludes" property="maven.multiproject.includes" plugin="maven-multiproject-plugin"/>
+    <m:property var="dIncludes" name="mIncludes" defaultValue="*/project.xml"/>
+
+    <m:get var="mExcludes" property="maven.multiproject.excludes" plugin="maven-multiproject-plugin"/>
+    <m:property var="dExcludes" name="mExcludes" defaultValue=""/>
+
+    <m:get var="mIgnoreFailures" property="maven.multiproject.ignoreFailures" plugin="maven-multiproject-plugin"/>
+    <m:property var="dIgnoreFailures" name="mIgnoreFailures" defaultValue="false"/>
+
     <!-- Generate dashboard data for all sub-projects if it is required -->
     <j:set var="runreactor" value="${maven.dashboard.runreactor}"/>
     <j:choose>
       <j:when test="${runreactor == 'true'}">
         <m:reactor
-            basedir="${maven.dashboard.basedir}"
+            basedir="${mBasedir}"
             banner="Generating dashboard data for"
-            includes="${maven.dashboard.includes}"
-            excludes="${maven.dashboard.excludes}"
+            includes="${mIncludes}"
+            excludes="${mExcludes}"
             postProcessing="true"
             goals="dashboard:report-single"
-            ignoreFailures="${maven.dashboard.ignoreFailures}"/>
+            ignoreFailures="${mIgnoreFailures}"/>
       </j:when>
       <j:otherwise>
         <!-- We need to run the reactor to gather the list of projects 
              because the reactor creates a reactorProjects jelly property
              that we need in the dashboard:aggregate goal. -->
         <m:reactor
-            basedir="${maven.dashboard.basedir}"
+            basedir="${mBasedir}"
             banner="Gathering project list for"
-            includes="${maven.dashboard.includes}"
-            excludes="${maven.dashboard.excludes}"
+            includes="${mIncludes}"
+            excludes="${mExcludes}"
             postProcessing="true"
             collectOnly="true"
-            ignoreFailures="${maven.dashboard.ignoreFailures}"/>
+            ignoreFailures="${mIgnoreFailures}"/>
       </j:otherwise>
     </j:choose>      
 

Modified: maven/maven-1/plugins/trunk/dashboard/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/plugin.properties?view=diff&r1=160014&r2=160015
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/dashboard/plugin.properties Mon Apr  4 02:26:59 2005
@@ -24,10 +24,13 @@
 # Properties for the dashboard reactor
 # ------------------------------------
 
-maven.dashboard.basedir=${basedir}
-maven.dashboard.includes=*/project.xml
-maven.dashboard.excludes=**/target/**/project.xml
-maven.dashboard.ignoreFailures=false
+# Location of subprojects to include in the dashboard report. By default
+# these properties have the same values as their Multiproject conterpart.
+# You can define them if you need to set different values.
+#maven.dashboard.basedir=${basedir}
+#maven.dashboard.includes=*/project.xml
+#maven.dashboard.excludes=
+#maven.dashboard.ignoreFailures=false
 
 # Generated dashboard xml data file
 maven.dashboard.report.xml = ${maven.build.dir}/dashboard-data.xml

Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml?view=diff&r1=160014&r2=160015
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml Mon Apr  4 02:26:59 2005
@@ -35,7 +35,6 @@
     <attainGoal name="clean"/>
 
     <!-- Call goal to test -->
-    <j:set var="maven.multiproject.site.goals" value="site,dashboard:report-single"/>
     <attainGoal name="multiproject:site"/>
 
   </goal>

Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties?view=diff&r1=160014&r2=160015
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties Mon Apr  4 02:26:59
2005
@@ -14,11 +14,9 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-# MUST specify these, even though they are the defaults, so we can run 
-# inside reactor where they were already set.
-maven.multiproject.basedir=${basedir}
-maven.multiproject.includes=*/project.xml
-maven.multiproject.excludes=common/project.xml
+# MUST specify these so we can run inside reactor where they were already set.
+maven.multiproject.basedir = ${basedir}
+maven.multiproject.includes = */project.xml
+maven.multiproject.excludes = common/project.xml
 
-# Ensure we don't build common/project.xml in the dashboard report
-maven.dashboard.excludes=**/target/**/project.xml,common/project.xml
+maven.multiproject.site.goals = site,dashboard:report-single

Propchange: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr  4 02:26:59 2005
@@ -1,3 +1,4 @@
 target
 maven.log
 jcoverage.ser
+target

Propchange: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr  4 02:26:59 2005
@@ -2,3 +2,4 @@
 maven.log
 velocity.log
 jcoverage.ser
+target

Propchange: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testWhenNoReportsGenerated/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr  4 02:26:59 2005
@@ -0,0 +1 @@
+target

Modified: maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml?view=diff&r1=160014&r2=160015
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/xdocs/changes.xml Mon Apr  4 02:26:59 2005
@@ -25,6 +25,14 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="in SVN">
+      <action dev="vmassol" type="update">
+        Default values for <code>maven.dashboard.basedir</code>,
+        <code>maven.dashboard.includes</code>, <code>maven.dashboard.excludes</code>
+        and <code>maven.dashboard.ignoreFailures</code> are copied from
+        the equivalent Multiproject properties. This should reduce the number of
+        properties you have to set to get going as you need now only set the
+        Multiproject properties.
+      </action>
       <action dev="vmassol" type="fix" issue="MPDASHBOARD-17" due-to="Philippe Kernevez">
         Prevent failure in <code><junitpassrate.jelly/code> due to a division

         by zero when there is a unit test source directory defined but no tests 

Modified: maven/maven-1/plugins/trunk/dashboard/xdocs/faq.fml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/xdocs/faq.fml?view=diff&r1=160014&r2=160015
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/xdocs/faq.fml (original)
+++ maven/maven-1/plugins/trunk/dashboard/xdocs/faq.fml Mon Apr  4 02:26:59 2005
@@ -42,6 +42,10 @@
 maven.dashboard.basedir=${basedir}
 maven.dashboard.includes=*/project.xml
 maven.dashboard.excludes=**/target/**/project.xml]]></source>
+        <p>
+          It's also possible to set the Multiproject properties as they are used by default
+          by the Dashboard plugin.
+        </p>
       </answer>
     </faq>
 

Modified: maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml?view=diff&r1=160014&r2=160015
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/xdocs/properties.xml Mon Apr  4 02:26:59 2005
@@ -29,10 +29,13 @@
 # Properties for the dashboard reactor
 # ------------------------------------
 
-maven.dashboard.basedir=${basedir}
-maven.dashboard.includes=*/project.xml
-maven.dashboard.excludes=**/target/**/project.xml
-maven.dashboard.ignoreFailures=false
+# Location of subprojects to include in the dashboard report. By default
+# these properties have the same values as their Multiproject conterpart.
+# You can define them if you need to set different values.
+#maven.dashboard.basedir=${basedir}
+#maven.dashboard.includes=*/project.xml
+#maven.dashboard.excludes=
+#maven.dashboard.ignoreFailures=false
 
 # Generated dashboard xml data file
 maven.dashboard.report.xml = ${maven.build.dir}/dashboard-data.xml



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Mime
View raw message