You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/10/18 18:51:58 UTC
svn commit: r705897 - in /maven/plugins/trunk/maven-shade-plugin/src:
main/java/org/apache/maven/plugins/shade/
main/java/org/apache/maven/plugins/shade/mojo/
main/java/org/apache/maven/plugins/shade/resource/
test/java/org/apache/maven/plugins/shade/r...
Author: hboutemy
Date: Sat Oct 18 09:51:58 2008
New Revision: 705897
URL: http://svn.apache.org/viewvc?rev=705897&view=rev
Log:
fixed typo
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/mojo/ShadeMojo.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.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=705897&r1=705896&r2=705897&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 Oct 18 09:51:58 2008
@@ -180,7 +180,7 @@
throws IOException
{
if ( !remapper.hasRelocators() )
- {
+ {
try
{
jos.putNextEntry( new JarEntry( name ) );
@@ -190,7 +190,7 @@
{
getLogger().warn( "We have a duplicate " + name + " in " + jar );
}
-
+
return;
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=705897&r1=705896&r2=705897&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Sat Oct 18 09:51:58 2008
@@ -84,29 +84,29 @@
*/
private MavenProject project;
- /**
+ /**
* @component
* @required
* @readonly
*/
private MavenProjectHelper projectHelper;
- /**
+ /**
* @component
* @required
* @readonly
*/
private Shader shader;
-
+
/**
* The dependency tree builder to use.
- *
+ *
* @component
* @required
* @readonly
*/
private DependencyTreeBuilder dependencyTreeBuilder;
-
+
/**
* ProjectBuilder, needed to create projects from the artifacts.
*
@@ -115,10 +115,10 @@
* @readonly
*/
private MavenProjectBuilder mavenProjectBuilder;
-
+
/**
* The artifact metadata source to use.
- *
+ *
* @component
* @required
* @readonly
@@ -127,7 +127,7 @@
/**
* The artifact collector to use.
- *
+ *
* @component
* @required
* @readonly
@@ -317,7 +317,7 @@
sourceArtifacts.add( file );
}
}
-
+
for ( Iterator it = project.getArtifacts().iterator(); it.hasNext(); )
{
Artifact artifact = (Artifact) it.next();
@@ -356,7 +356,7 @@
List relocators = getRelocators();
- List resourceTransformers = getResourceTrasformers();
+ List resourceTransformers = getResourceTransformers();
shader.shade( artifacts, outputJar, filters, relocators, resourceTransformers );
@@ -444,6 +444,7 @@
//try a gc to see if an unclosed stream needs garbage collecting
System.gc();
System.gc();
+
if ( !newFile.renameTo( oldFile ) )
{
// Still didn't work. We'll do a copy
@@ -558,12 +559,12 @@
PackageRelocation r = relocations[i];
relocators.add( new SimpleRelocator( r.getPattern(), r.getShadedPattern(), r.getExcludes() ) );
-
}
+
return relocators;
}
- private List getResourceTrasformers()
+ private List getResourceTransformers()
{
if ( transformers == null )
{
@@ -621,6 +622,7 @@
+ artifact.getArtifactHandler().getExtension();
return new File( outputDirectory, shadedName );
}
+
private File shadedSourceArtifactFileWithClassifier()
{
Artifact artifact = project.getArtifact();
@@ -648,6 +650,7 @@
return new File( outputDirectory, shadedName );
}
+
private File shadedSourcesArtifactFile()
{
Artifact artifact = project.getArtifact();
@@ -688,7 +691,7 @@
List dependencies = new ArrayList();
boolean modified = false;
-
+
List transitiveDeps = new ArrayList();
for ( Iterator it = project.getArtifacts().iterator(); it.hasNext(); )
@@ -709,7 +712,7 @@
dep.setVersion( artifact.getVersion() );
//we'll figure out the exclusions in a bit.
-
+
transitiveDeps.add( dep );
}
List origDeps = getProject().getDependencies();
@@ -747,30 +750,30 @@
{
while ( modified )
{
-
+
model.setDependencies( dependencies );
-
+
File f = new File( outputDirectory, "dependency-reduced-pom.xml" );
if ( f.exists() )
{
f.delete();
}
-
+
Writer w = WriterFactory.newXmlWriter( f );
-
+
PomWriter.write( w, model, true );
-
+
w.close();
-
+
MavenProject p2 = mavenProjectBuilder.build( f, localRepository, null );
modified = updateExcludesInDeps( p2, dependencies, transitiveDeps );
-
+
}
-
- //copy the dependecy-reduced-pom.xml to the basedir where
+
+ //copy the dependecy-reduced-pom.xml to the basedir where
//we'll set the file for the project to it. We cannot set
//it to the real version in "target" as then ${basedir} gets
- //messed up. We'll delete this file on exit to make
+ //messed up. We'll delete this file on exit to make
//sure it gets cleaned up.
File f = new File( project.getBasedir(), "dependency-reduced-pom.xml" );
File f2 = new File( outputDirectory, "dependency-reduced-pom.xml" );
@@ -780,7 +783,7 @@
}
FileUtils.copyFile( f2, f );
FileUtils.forceDeleteOnExit( f );
- project.setFile( f );
+ project.setFile( f );
}
}
@@ -795,9 +798,9 @@
return artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getClassifier();
}
}
-
-
- public boolean updateExcludesInDeps( MavenProject project,
+
+
+ public boolean updateExcludesInDeps( MavenProject project,
List dependencies,
List transitiveDeps )
throws DependencyTreeBuilderException
@@ -811,11 +814,11 @@
artifactCollector );
boolean modified = false;
Iterator it = node.getChildren().listIterator();
- while ( it.hasNext() )
+ while ( it.hasNext() )
{
DependencyNode n2 = (DependencyNode) it.next();
Iterator it2 = n2.getChildren().listIterator();
- while ( it2.hasNext() )
+ while ( it2.hasNext() )
{
DependencyNode n3 = (DependencyNode) it2.next();
//anything two levels deep that is marked "included"
@@ -827,27 +830,27 @@
//prior to 2.0.8 may grab versions from transients instead of
//from the direct deps in which case they would be marked included
//instead of OMITTED_FOR_DUPLICATE
-
+
//also, if not promoting the transitives, level 2's would be included
boolean found = false;
- for ( int x = 0; x < transitiveDeps.size(); x++ )
+ for ( int x = 0; x < transitiveDeps.size(); x++ )
{
Dependency dep = (Dependency) transitiveDeps.get( x );
if ( dep.getArtifactId().equals( n3.getArtifact().getArtifactId() )
- && dep.getGroupId().equals( n3.getArtifact().getGroupId() ) )
+ && dep.getGroupId().equals( n3.getArtifact().getGroupId() ) )
{
found = true;
}
-
+
}
-
- if ( !found )
+
+ if ( !found )
{
- for ( int x = 0; x < dependencies.size(); x++ )
+ for ( int x = 0; x < dependencies.size(); x++ )
{
Dependency dep = (Dependency) dependencies.get( x );
if ( dep.getArtifactId().equals( n2.getArtifact().getArtifactId() )
- && dep.getGroupId().equals( n2.getArtifact().getGroupId() ) )
+ && dep.getGroupId().equals( n2.getArtifact().getGroupId() ) )
{
Exclusion exclusion = new Exclusion();
exclusion.setArtifactId( n3.getArtifact().getArtifactId() );
@@ -859,8 +862,8 @@
}
}
}
- }
+ }
}
return modified;
- }
+ }
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java?rev=705897&r1=705896&r2=705897&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java Sat Oct 18 09:51:58 2008
@@ -112,14 +112,14 @@
{
// TODO: use the tools in Plexus to merge these properly. For now, I just need an all-or-nothing
// configuration carry over
-
+
Xpp3Dom dom = (Xpp3Dom) components.get( key );
if ( dom.getChild( "configuration" ) != null )
{
component.addChild( dom.getChild( "configuration" ) );
}
}
-
+
components.put( key, component );
}
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java?rev=705897&r1=705896&r2=705897&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java Sat Oct 18 09:51:58 2008
@@ -34,7 +34,7 @@
* A resource processor that allows the arbitrary addition of attributes to
* the first MANIFEST.MF that is found in the set of JARs being processed, or
* to a newly created manifest for the shaded JAR.
- *
+ *
* @author Jason van Zyl
* @since 1.2
*/
@@ -46,11 +46,11 @@
// Configuration
private String mainClass;
private Map manifestEntries;
-
+
// Fields
private boolean manifestDiscovered;
private Manifest manifest;
-
+
public boolean canTransformResource( String resource )
{
if ( MANIFEST_PATH.equalsIgnoreCase( resource ) )
@@ -71,7 +71,7 @@
{
manifest = new Manifest( is );
manifestDiscovered = true;
- IOUtil.close( is );
+ IOUtil.close( is );
}
}
@@ -85,17 +85,17 @@
{
// If we didn't find a manifest, then let's create one.
if ( manifest == null )
- {
+ {
manifest = new Manifest();
}
Attributes attributes = manifest.getMainAttributes();
-
+
if ( mainClass != null )
{
- attributes.put( Attributes.Name.MAIN_CLASS, mainClass );
+ attributes.put( Attributes.Name.MAIN_CLASS, mainClass );
}
-
+
if ( manifestEntries != null )
{
for ( Iterator i = manifestEntries.keySet().iterator(); i.hasNext(); )
@@ -104,8 +104,8 @@
attributes.put( new Attributes.Name( key ), manifestEntries.get( key ) );
}
}
-
+
jos.putNextEntry( new JarEntry( MANIFEST_PATH ) );
manifest.write( jos );
- }
+ }
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java?rev=705897&r1=705896&r2=705897&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java Sat Oct 18 09:51:58 2008
@@ -38,30 +38,30 @@
* resources spread across many JARs the individual entries will all be concatenated into a single
* META-INF/services/org.apache.maven.project.ProjectBuilder resource packaged into the resultant JAR produced
* by the shading process.
- *
+ *
* @author jvanzyl
*/
public class ServicesResourceTransformer
implements ResourceTransformer
{
private static final String SERVICES_PATH = "META-INF/services";
-
+
private ByteArrayOutputStream data;
private Map serviceEntries = new HashMap();
-
+
public boolean canTransformResource( String resource )
{
if ( resource.startsWith( SERVICES_PATH ) )
- {
+ {
data = (ByteArrayOutputStream) serviceEntries.get( resource );
-
+
if ( data == null )
{
data = new ByteArrayOutputStream();
serviceEntries.put( resource, data );
- }
-
+ }
+
return true;
}
@@ -90,6 +90,6 @@
jos.putNextEntry( new JarEntry( key ) );
IOUtil.copy( new ByteArrayInputStream( data.toByteArray() ), jos );
data.reset();
- }
+ }
}
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java?rev=705897&r1=705896&r2=705897&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java Sat Oct 18 09:51:58 2008
@@ -46,7 +46,7 @@
{
transformer.processResource( getClass().getResourceAsStream( "/components-1.xml" ) );
transformer.processResource( getClass().getResourceAsStream( "/components-2.xml" ) );
-
+
assertEquals( IOUtil.toString( getClass().getResourceAsStream( "/components-expected.xml" ) ),
FileUtils.fileRead( transformer.getTransformedResource() ) );
}