commit b69f6b0107a79db2bdba3899d788d37431bca53a
author Aaron Digulla <digulla@hepe.com> Wed May 09 13:29:11 2012 +0200
committer Aaron Digulla <digulla@hepe.com> Wed May 09 13:29:11 2012 +0200
tree 35f651ae05f0d464c3e99a2dd8bda069963aacd1
parent 4969e527e9fde25531df0fb6df9479c0c9afd841

Produce XML logs

src/main/groovy/m4e/DependencyManagementCmd.groovy

diff --git a/src/main/groovy/m4e/DependencyManagementCmd.groovy b/src/main/groovy/m4e/DependencyManagementCmd.groovy
index 27e0c1a..16fc992 100644
--- a/src/main/groovy/m4e/DependencyManagementCmd.groovy
+++ b/src/main/groovy/m4e/DependencyManagementCmd.groovy
@@ -91,7 +91,13 @@
     }
 
     void twoVersionsError( Pom pom, String oldVersion ) {
-        error( Error.TWO_VERSIONS, "The repository contains (at least) two versions of ${pom.shortKey()}: ${pom.version()} and ${oldVersion}. Omitting both." )
+        def xml = [
+            artifact: pom.key(),
+            shortKey: pom.shortKey(),
+            version1: pom.version(),
+            version2: oldVersion,
+        ]
+        error( Error.TWO_VERSIONS, "The repository contains (at least) two versions of ${pom.shortKey()}: ${pom.version()} and ${oldVersion}. Omitting both.", xml )
     }
 
     void createPom() {

src/main/groovy/m4e/MergeCmd.groovy

diff --git a/src/main/groovy/m4e/MergeCmd.groovy b/src/main/groovy/m4e/MergeCmd.groovy
index 2992b9c..28e55e9 100644
--- a/src/main/groovy/m4e/MergeCmd.groovy
+++ b/src/main/groovy/m4e/MergeCmd.groovy
@@ -96,7 +96,7 @@
                 
                 if( targetPath.exists() ) {
                     if( !filesAreEqual( srcPath, targetPath ) ) {
-                        warn( Warning.BINARY_DIFFERENCE, "File ${srcPath} differs from ${targetPath}" )
+                        warn( Warning.BINARY_DIFFERENCE, "File ${srcPath} differs from ${targetPath}", [ source: srcPath.absolutePath, target: targetPath.absolutePath ] )
                     }
                 } else {
                     srcPath.copy( targetPath )