svn commit: r790028 - in /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade: DefaultShader.java relocation/SimpleRelocator.java

[dkulp]

Author: dkulp
Date: Wed Jul  1 03:24:56 2009
New Revision: 790028

URL: http://svn.apache.org/viewvc?rev=790028&view=rev
Log:
[MSHADE-47] Fix problem with mapping some classes from the string pools.

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/relocation/SimpleRelocator.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=790028&r1=790027&r2=790028&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
 Wed Jul  1 03:24:56 2009
@@ -291,17 +291,17 @@
                 {
                     Relocator r = (Relocator) i.next();
 
-                    if ( r.canRelocatePath( name ) )
-                    {
-                        value = r.relocatePath( name );
-                        break;
-                    }
-
                     if ( r.canRelocateClass( name ) )
                     {
                         value = r.relocateClass( name );
                         break;
+                    } 
+                    else if ( r.canRelocatePath( name ) )
+                    {
+                        value = r.relocatePath( name );
+                        break;
                     }
+
                     if ( name.length() > 0 && name.charAt( 0 ) == '[' ) 
                     {
                         int count = 0;
@@ -342,14 +342,9 @@
                         }
                     }
                 }
-
                 return value;
             } 
-            else 
-            {
-                object = super.mapValue( object );
-            }
-            return object;
+            return super.mapValue( object );
         }
 
         public String map( String name )
@@ -365,7 +360,6 @@
                     break;
                 }
             }
-
             return value;
         }
     }

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java?rev=790028&r1=790027&r2=790028&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
 Wed Jul  1 03:24:56 2009
@@ -103,7 +103,7 @@
 
     public boolean canRelocateClass( String clazz )
     {
-        return canRelocatePath( clazz.replace( '.', '/' ) );
+        return !clazz.contains("/") && canRelocatePath( clazz.replace( '.', 
'/' ) );
     }
 
     public String relocatePath( String path )