svn commit: r983220 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/ main/java/org/apache/maven/plugins/shade/resource/ test/java/org/apache/maven/plugins/shade/

[be...@apache.org]

Author: bentmann
Date: Sat Aug  7 12:13:26 2010
New Revision: 983220

URL: http://svn.apache.org/viewvc?rev=983220&view=rev
Log:
[MSHADE-81] Poor error reporting

Modified:
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
    maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=983220&r1=983219&r2=983220&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Sat Aug  7 12:13:26 2010
@@ -106,6 +106,8 @@ public class DefaultShader
         {
             File jar = (File) i.next();
 
+            getLogger().debug( "Processing JAR " + jar );
+
             List jarFilters = getFilters( jar, filters );
 
             JarFile jarFile = newJarFile( jar );
@@ -308,6 +310,8 @@ public class DefaultShader
 
             if ( transformer.canTransformResource( name ) )
             {
+                getLogger().debug( "Transforming " + name + " using " + transformer.getClass().getName() );
+
                 transformer.processResource( name, is, relocators );
 
                 resourceTransformed = true;

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java?rev=983220&r1=983219&r2=983220&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java Sat Aug  7 12:13:26 2010
@@ -86,7 +86,7 @@ public class XmlAppendingTransformer
         }
         catch ( JDOMException e )
         {
-            throw new RuntimeException( e );
+            throw new RuntimeException( "Error processing resource " + resource + ": " + e.getMessage(), e );
         }
 
         if ( doc == null )

Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java?rev=983220&r1=983219&r2=983220&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java Sat Aug  7 12:13:26 2010
@@ -32,6 +32,8 @@ import junit.framework.TestCase;
 
 import org.apache.maven.plugins.shade.relocation.SimpleRelocator;
 import org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
 
 /**
  * @author Jason van Zyl
@@ -53,7 +55,7 @@ public class DefaultShaderTest
     public void testShaderWithStaticInitializedClass()
         throws Exception
     {
-        Shader s = new DefaultShader();
+        Shader s = newShader();
 
         Set set = new LinkedHashSet();
 
@@ -92,7 +94,7 @@ public class DefaultShaderTest
     public void shaderWithPattern( String shadedPattern, File jar, String[] excludes )
         throws Exception
     {
-        Shader s = new DefaultShader();
+        DefaultShader s = newShader();
 
         Set set = new LinkedHashSet();
 
@@ -113,4 +115,13 @@ public class DefaultShaderTest
         s.shade( set, jar, filters, relocators, resourceTransformers );
     }
 
+    private static DefaultShader newShader()
+    {
+        DefaultShader s = new DefaultShader();
+
+        s.enableLogging( new ConsoleLogger( Logger.LEVEL_INFO, "TEST" ) );
+
+        return s;
+    }
+
 }