You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/07/16 17:22:21 UTC
svn commit: r677304 - in /maven/plugins/trunk/maven-shade-plugin/src:
main/java/org/apache/maven/plugins/shade/relocation/ test/jars/
test/java/org/apache/maven/plugins/shade/mojo/
test/java/org/apache/maven/plugins/shade/relocation/ test/projects/test...
Author: bentmann
Date: Wed Jul 16 08:22:15 2008
New Revision: 677304
URL: http://svn.apache.org/viewvc?rev=677304&view=rev
Log:
[MSHADE-38] Names of excluded packages are relocated
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
maven/plugins/trunk/maven-shade-plugin/src/test/jars/test-artifact-1.0-SNAPSHOT.jar
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/src/main/java/org/apache/maven/plugins/shade/Lib.java
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=677304&r1=677303&r2=677304&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 16 08:22:15 2008
@@ -19,9 +19,10 @@
* under the License.
*/
-import java.util.ArrayList;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import org.codehaus.plexus.util.SelectorUtils;
@@ -40,7 +41,7 @@
private String shadedPathPattern;
- private List excludes;
+ private Set excludes;
public SimpleRelocator(String patt, String shadedPattern, List excludes)
{
@@ -59,13 +60,20 @@
if ( excludes != null && !excludes.isEmpty() )
{
- this.excludes = new ArrayList();
+ this.excludes = new LinkedHashSet();
for (Iterator i = excludes.iterator(); i.hasNext();)
{
String e = (String) i.next();
- this.excludes.add(e.replace('.', '/'));
+ String classExclude = e.replace( '.', '/' );
+ this.excludes.add( classExclude );
+
+ if ( classExclude.endsWith( "/*" ) )
+ {
+ String packageExclude = classExclude.substring( 0, classExclude.lastIndexOf( '/' ) );
+ this.excludes.add( packageExclude );
+ }
}
}
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/jars/test-artifact-1.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/jars/test-artifact-1.0-SNAPSHOT.jar?rev=677304&r1=677303&r2=677304&view=diff
==============================================================================
Binary files - no diff available.
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java?rev=677304&r1=677303&r2=677304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java Wed Jul 16 08:22:15 2008
@@ -20,6 +20,10 @@
*/
import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -51,6 +55,36 @@
shaderWithPattern("org/shaded/plexus/util", new File( "target/foo-custom.jar" ));
}
+ public void testShaderWithExclusions()
+ throws Exception
+ {
+ File jarFile = new File( getBasedir(), "target/unit/foo-bar.jar" );
+
+ Shader s = (Shader) lookup( Shader.ROLE );
+
+ Set set = new HashSet();
+ set.add( new File( getBasedir(), "src/test/jars/test-artifact-1.0-SNAPSHOT.jar" ) );
+
+ List relocators = new ArrayList();
+ relocators.add( new SimpleRelocator( "org.codehaus.plexus.util", "hidden", Arrays.asList( new String[] {
+ "org.codehaus.plexus.util.xml.Xpp3Dom", "org.codehaus.plexus.util.xml.pull.*" } ) ) );
+
+ List resourceTransformers = new ArrayList();
+
+ List filters = new ArrayList();
+
+ s.shade( set, jarFile, filters, relocators, resourceTransformers );
+
+ ClassLoader cl = new URLClassLoader( new URL[] { jarFile.toURI().toURL() } );
+ Class c = cl.loadClass( "org.apache.maven.plugins.shade.Lib" );
+
+ Field field = c.getDeclaredField( "CLASS_REALM_PACKAGE_IMPORT" );
+ assertEquals( "org.codehaus.plexus.util.xml.pull", field.get( null ) );
+
+ Method method = c.getDeclaredMethod( "getClassRealmPackageImport", new Class[0] );
+ assertEquals( "org.codehaus.plexus.util.xml.pull", method.invoke( null, new Object[0] ) );
+ }
+
public void shaderWithPattern(String shadedPattern, File jar)
throws Exception
{
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java?rev=677304&r1=677303&r2=677304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java Wed Jul 16 08:22:15 2008
@@ -36,6 +36,7 @@
assertEquals( true, relocator.canRelocatePath( "org/foo/excluded" ) );
assertEquals( false, relocator.canRelocatePath( "org/foo/Excluded" ) );
assertEquals( false, relocator.canRelocatePath( "org/foo/Excluded.class" ) );
+ assertEquals( false, relocator.canRelocatePath( "org/foo/public" ) );
assertEquals( false, relocator.canRelocatePath( "org/foo/public/Class" ) );
assertEquals( false, relocator.canRelocatePath( "org/foo/public/Class.class" ) );
assertEquals( true, relocator.canRelocatePath( "org/foo/PrivateStuff" ) );
@@ -62,6 +63,7 @@
assertEquals( true, relocator.canRelocateClass( "org.foo.Class" ) );
assertEquals( true, relocator.canRelocateClass( "org.foo.excluded" ) );
assertEquals( false, relocator.canRelocateClass( "org.foo.Excluded" ) );
+ assertEquals( false, relocator.canRelocateClass( "org.foo.public" ) );
assertEquals( false, relocator.canRelocateClass( "org.foo.public.Class" ) );
assertEquals( true, relocator.canRelocateClass( "org.foo.PrivateStuff" ) );
assertEquals( false, relocator.canRelocateClass( "org.foo.PublicStuff" ) );
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/src/main/java/org/apache/maven/plugins/shade/Lib.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/src/main/java/org/apache/maven/plugins/shade/Lib.java?rev=677304&r1=677303&r2=677304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/src/main/java/org/apache/maven/plugins/shade/Lib.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/src/main/java/org/apache/maven/plugins/shade/Lib.java Wed Jul 16 08:22:15 2008
@@ -10,4 +10,18 @@
private static final String name = new String( Lib.class.getName() );
public static final String CONSTANT = "foo.bar/baz";
+
+ // constant shouldn't be changed if "org.codehaus.plexus.util.xml.pull.*" is excluded from relocation.
+ public static final String CLASS_REALM_PACKAGE_IMPORT = "org.codehaus.plexus.util.xml.pull";
+
+ public static String getClassRealmPackageImport()
+ {
+ // argument shouldn't be changed if "org.codehaus.plexus.util.xml.pull.*" is excluded from relocation.
+ return importFrom( "org.codehaus.plexus.util.xml.pull" );
+ }
+
+ private static String importFrom( String packageName )
+ {
+ return packageName;
+ }
}