Author: vmassol
Date: Sat Feb 19 03:04:13 2005
New Revision: 154403

URL: http://svn.apache.org/viewcvs?view=rev&rev=154403
Log:
Modified default value of <code>maven.cruisecontrol.logs.mergedirectory</code> 
so that CC can aggregate JUnit test reports both for single project and 
multiproject setups.

Modified:
    maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties
    maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
    maven/maven-1/plugins/trunk/cruisecontrol/xdocs/faq.fml

Modified: maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties?view=diff&r1=154402&r2=154403
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties Sat Feb 19 
03:04:13 2005
@@ -37,13 +37,13 @@
 maven.cruisecontrol.schedule.interval=300
 maven.cruisecontrol.schedule.time=1900
 
-# If left undefined this property is computed automatically by the plugin
-# from the ${maven.build.dir} property.
-#maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${module}/target/test-reports
+# We use the root directory to search for JUnit report files so that it works
+# both in single and multiproject setups.
+maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${module}
+maven.cruisecontrol.logs.pattern=TEST-*.xml
 
 maven.cruisecontrol.logs.merge=true
 maven.cruisecontrol.logs.encodingtype=ISO-8859-1
-maven.cruisecontrol.logs.pattern=*.xml
 
 maven.cruisecontrol.currentbuildstatus.filename=status.txt
 

Modified: maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml?view=diff&r1=154402&r2=154403
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml Sat Feb 19 
03:04:13 2005
@@ -27,6 +27,11 @@
   <body>
     <release version="1.7" date="in SVN">
       <action dev="vmassol" type="update">
+        Modified default value of 
<code>maven.cruisecontrol.logs.mergedirectory</code>
+        so that CC can aggregate JUnit test reports both for single project and
+        multiproject setups.
+      </action>
+      <action dev="vmassol" type="update">
         Compute automatically the merge directory automatically (the 
         value of <code>maven.cruisecontrol.logs.mergedirectory</code>
         if not specified by the user. The computation uses the

Modified: maven/maven-1/plugins/trunk/cruisecontrol/xdocs/faq.fml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/xdocs/faq.fml?view=diff&r1=154402&r2=154403
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to