refactoring

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114298 13f79535-47bb-0310-9956-ffa450edef68

dashboard/plugin.jelly

@@ -114,7 +114,7 @@
 
   <!--
      ========================================================================
-       Generate a dashboard report.
+       Generate a dashboard report for a single project
      ========================================================================
   -->
   <goal name="dashboard:report-single">
@@ -122,6 +122,40 @@
     <a:dirname property="singleReportDir" file="${maven.dashboard.report.single}"/>
     <a:mkdir dir="${singleReportDir}"/>
 
+    <attainGoal name="dashboard:run-goals"/>
+
+    <!-- Generate report data file -->
+    <u:tokenize var="aggregatorNames" delim=",">${maven.dashboard.aggregators}</u:tokenize>
+    <j:file name="${maven.dashboard.report.single}" prettyPrint="true" 
+        xmlns="dashboard">
+      <dashboard-single>
+        <j:forEach var="aggregatorName" items="${aggregatorNames}">
+          <x:element name="aggregator">
+
+            <!-- Add aggregator name -->
+            <x:attribute name="name">${aggregatorName}</x:attribute>
+
+            <!-- Add aggregator content -->
+            <j:set var="scriptProperty" 
+                value="maven.dashboard.aggregator.${aggregatorName}.script"/>
+            <j:import file="${context.getVariable(scriptProperty)}"
+                inherit="true"/>
+
+          </x:element>      
+        </j:forEach>
+      </dashboard-single>
+    </j:file>
+
+  </goal>
+
+  <!--
+     ========================================================================
+       Execute goals associated with aggregators so that the data sources 
+       from which we extract report data are available.
+     ========================================================================
+  -->
+  <goal name="dashboard:run-goals">
+
     <u:tokenize var="aggregatorNames" delim=",">${maven.dashboard.aggregators}</u:tokenize>
 
     <!-- Property used to remember what goals have already been called -->
@@ -166,26 +200,6 @@
       </j:forEach>
     </j:if>
 
-    <j:file name="${maven.dashboard.report.single}" prettyPrint="true" 
-        xmlns="dashboard">
-      <dashboard-single>
-        <j:forEach var="aggregatorName" items="${aggregatorNames}">
-          <x:element name="aggregator">
-
-            <!-- Add aggregator name -->
-            <x:attribute name="name">${aggregatorName}</x:attribute>
-
-            <!-- Add aggregator content -->
-            <j:set var="scriptProperty" 
-                value="maven.dashboard.aggregator.${aggregatorName}.script"/>
-            <j:import file="${context.getVariable(scriptProperty)}"
-                inherit="true"/>
-
-          </x:element>      
-        </j:forEach>
-      </dashboard-single>
-    </j:file>
-
   </goal>
 
   <!--