You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/03/13 15:35:40 UTC
svn commit: r1300149 - in
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade:
./ resource/
Author: olamy
Date: Tue Mar 13 14:35:39 2012
New Revision: 1300149
URL: http://svn.apache.org/viewvc?rev=1300149&view=rev
Log:
use generics
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/Shader.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.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/DontIncludeResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.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/ResourceTransformer.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/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.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=1300149&r1=1300148&r2=1300149&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 Tue Mar 13 14:35:39 2012
@@ -57,16 +57,17 @@ public class DefaultShader
implements Shader
{
- public void shade( Set jars, File uberJar, List filters, List relocators, List resourceTransformers )
+ public void shade( Set jars, File uberJar, List filters, List<Relocator> relocators,
+ List<ResourceTransformer> resourceTransformers )
throws IOException, MojoExecutionException
{
Set resources = new HashSet();
ResourceTransformer manifestTransformer = null;
List transformers = new ArrayList( resourceTransformers );
- for ( Iterator it = transformers.iterator(); it.hasNext(); )
+ for ( Iterator<ResourceTransformer> it = transformers.iterator(); it.hasNext(); )
{
- ResourceTransformer transformer = (ResourceTransformer) it.next();
+ ResourceTransformer transformer = it.next();
if ( transformer instanceof ManifestResourceTransformer )
{
manifestTransformer = transformer;
@@ -312,14 +313,15 @@ public class DefaultShader
return false;
}
- private boolean resourceTransformed( List resourceTransformers, String name, InputStream is, List relocators )
+ private boolean resourceTransformed( List<ResourceTransformer> resourceTransformers, String name, InputStream is,
+ List relocators )
throws IOException
{
boolean resourceTransformed = false;
- for ( Iterator k = resourceTransformers.iterator(); k.hasNext(); )
+ for ( Iterator<ResourceTransformer> k = resourceTransformers.iterator(); k.hasNext(); )
{
- ResourceTransformer transformer = (ResourceTransformer) k.next();
+ ResourceTransformer transformer = k.next();
if ( transformer.canTransformResource( name ) )
{
@@ -351,9 +353,9 @@ public class DefaultShader
private final Pattern classPattern = Pattern.compile( "(\\[*)?L(.+);" );
- List relocators;
+ List<Relocator> relocators;
- public RelocatorRemapper( List relocators )
+ public RelocatorRemapper( List<Relocator> relocators )
{
this.relocators = relocators;
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/Shader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/Shader.java?rev=1300149&r1=1300148&r2=1300149&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/Shader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/Shader.java Tue Mar 13 14:35:39 2012
@@ -19,16 +19,17 @@ package org.apache.maven.plugins.shade;
* under the License.
*/
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.apache.maven.plugins.shade.resource.ResourceTransformer;
+
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Set;
-import org.apache.maven.plugin.MojoExecutionException;
-
/**
- * Interface that defines the process of shading.
- *
+ * Interface that defines the process of shading.
*/
public interface Shader
{
@@ -36,14 +37,16 @@ public interface Shader
/**
* Perform a shading operation.
- * @param jars which jars
- * @param uberJar output jar
- * @param filters the filters
- * @param relocators the relocators
+ *
+ * @param jars which jars
+ * @param uberJar output jar
+ * @param filters the filters
+ * @param relocators the relocators
* @param resourceTransformers the transformers
- * @throws IOException for IO errors reading the thing
+ * @throws IOException for IO errors reading the thing
* @throws MojoExecutionException for anything else that goes wrong.
*/
- void shade( Set jars, File uberJar, List filters, List relocators, List resourceTransformers )
+ void shade( Set jars, File uberJar, List filters, List<Relocator> relocators,
+ List<ResourceTransformer> resourceTransformers )
throws IOException, MojoExecutionException;
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java?rev=1300149&r1=1300148&r2=1300149&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java Tue Mar 13 14:35:39 2012
@@ -37,8 +37,6 @@ public class ApacheLicenseResourceTransf
private static final String LICENSE_TXT_PATH = "META-INF/LICENSE.txt";
- Set entries = new HashSet();
-
public boolean canTransformResource( String resource )
{
if ( LICENSE_PATH.equalsIgnoreCase( resource )
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java?rev=1300149&r1=1300148&r2=1300149&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java Tue Mar 13 14:35:39 2012
@@ -19,6 +19,9 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.codehaus.plexus.util.StringUtils;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -38,22 +41,21 @@ import java.util.TreeSet;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
-import org.codehaus.plexus.util.StringUtils;
-
/**
* Merges <code>META-INF/NOTICE.TXT</code> files.
*/
public class ApacheNoticeResourceTransformer
implements ResourceTransformer
{
- Set entries = new LinkedHashSet();
+ Set<String> entries = new LinkedHashSet<String>();
+
Map organizationEntries = new LinkedHashMap();
String projectName = ""; // MSHADE-101 :: NullPointerException when projectName is missing
+
boolean addHeader = true;
- String preamble1 =
- "// ------------------------------------------------------------------\n"
+ String preamble1 = "// ------------------------------------------------------------------\n"
+ "// NOTICE file corresponding to the section 4d of The Apache License,\n"
+ "// Version 2.0, in this case for ";
@@ -63,7 +65,9 @@ public class ApacheNoticeResourceTransfo
//defaults overridable via config in pom
String organizationName = "The Apache Software Foundation";
+
String organizationURL = "http://www.apache.org/";
+
String inceptionYear = "2006";
String copyright;
@@ -87,7 +91,7 @@ public class ApacheNoticeResourceTransfo
return false;
}
- public void processResource( String resource, InputStream is, List relocators )
+ public void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException
{
if ( entries.isEmpty() )
@@ -98,9 +102,8 @@ public class ApacheNoticeResourceTransfo
year = inceptionYear + "-" + year;
}
-
//add headers
- if ( addHeader )
+ if ( addHeader )
{
entries.add( preamble1 + projectName + preamble2 );
}
@@ -113,7 +116,6 @@ public class ApacheNoticeResourceTransfo
entries.add( preamble3 + organizationName + " (" + organizationURL + ").\n" );
}
-
BufferedReader reader;
if ( StringUtils.isNotEmpty( encoding ) )
{
@@ -163,8 +165,7 @@ public class ApacheNoticeResourceTransfo
else
{
String ent = sb.toString();
- if ( ent.startsWith( projectName )
- && ent.indexOf( "Copyright " ) != -1 )
+ if ( ent.startsWith( projectName ) && ent.indexOf( "Copyright " ) != -1 )
{
copyright = ent;
}
@@ -184,7 +185,7 @@ public class ApacheNoticeResourceTransfo
line = reader.readLine();
}
- if ( sb.length() > 0 )
+ if ( sb.length() > 0 )
{
if ( currentOrg == null )
{
@@ -219,7 +220,7 @@ public class ApacheNoticeResourceTransfo
PrintWriter writer = new PrintWriter( pow );
int count = 0;
- for ( Iterator itr = entries.iterator() ; itr.hasNext() ; )
+ for ( Iterator itr = entries.iterator(); itr.hasNext(); )
{
++count;
String line = (String) itr.next();
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java?rev=1300149&r1=1300148&r2=1300149&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java Tue Mar 13 14:35:39 2012
@@ -19,6 +19,9 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.codehaus.plexus.util.IOUtil;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -27,16 +30,14 @@ import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
-import org.codehaus.plexus.util.IOUtil;
-
/**
* A resource processor that appends content for a resource, separated by a newline.
- *
*/
public class AppendingTransformer
implements ResourceTransformer
{
String resource;
+
ByteArrayOutputStream data = new ByteArrayOutputStream();
public boolean canTransformResource( String r )
@@ -49,7 +50,7 @@ public class AppendingTransformer
return false;
}
- public void processResource( String resource, InputStream is, List relocators )
+ public void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException
{
IOUtil.copy( is, data );
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=1300149&r1=1300148&r2=1300149&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 Tue Mar 13 14:35:39 2012
@@ -19,6 +19,14 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.WriterFactory;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
+import org.codehaus.plexus.util.xml.Xpp3DomWriter;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -32,22 +40,13 @@ import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
-import org.apache.maven.plugins.shade.relocation.Relocator;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.WriterFactory;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.Xpp3DomWriter;
-
/**
* A resource processor that aggregates plexus <code>components.xml</code> files.
- *
*/
public class ComponentsXmlResourceTransformer
implements ResourceTransformer
{
- private Map components = new LinkedHashMap();
+ private Map<String, Xpp3Dom> components = new LinkedHashMap<String, Xpp3Dom>();
public static final String COMPONENTS_XML_PATH = "META-INF/plexus/components.xml";
@@ -56,7 +55,7 @@ public class ComponentsXmlResourceTransf
return COMPONENTS_XML_PATH.equals( resource );
}
- public void processResource( String resource, InputStream is, List relocators )
+ public void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException
{
Xpp3Dom newDom;
@@ -109,7 +108,7 @@ public class ComponentsXmlResourceTransf
// 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 );
+ Xpp3Dom dom = components.get( key );
if ( dom.getChild( "configuration" ) != null )
{
component.addChild( dom.getChild( "configuration" ) );
@@ -180,14 +179,12 @@ public class ComponentsXmlResourceTransf
return baos.toByteArray();
}
- private String getRelocatedClass( String className, List relocators )
+ private String getRelocatedClass( String className, List<Relocator> relocators )
{
if ( className != null && className.length() > 0 && relocators != null )
{
- for ( Iterator it = relocators.iterator(); it.hasNext(); )
+ for ( Relocator relocator : relocators )
{
- Relocator relocator = (Relocator) it.next();
-
if ( relocator.canRelocateClass( className ) )
{
return relocator.relocateClass( className );
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java?rev=1300149&r1=1300148&r2=1300149&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java Tue Mar 13 14:35:39 2012
@@ -19,6 +19,8 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import org.apache.maven.plugins.shade.relocation.Relocator;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -27,7 +29,6 @@ import java.util.jar.JarOutputStream;
/**
* A resource processor that prevents the inclusion of an arbitrary
* resource into the shaded JAR.
- *
*/
public class DontIncludeResourceTransformer
implements ResourceTransformer
@@ -44,10 +45,10 @@ public class DontIncludeResourceTransfor
return false;
}
- public void processResource( String resource, InputStream is, List relocators )
+ public void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException
{
-
+ // no op
}
public boolean hasTransformedResource()
@@ -58,5 +59,6 @@ public class DontIncludeResourceTransfor
public void modifyOutputStream( JarOutputStream os )
throws IOException
{
+ // no op
}
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java?rev=1300149&r1=1300148&r2=1300149&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java Tue Mar 13 14:35:39 2012
@@ -19,6 +19,9 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.codehaus.plexus.util.IOUtil;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -27,8 +30,6 @@ import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
-import org.codehaus.plexus.util.IOUtil;
-
/**
* A resource processor that allows the addition of an arbitrary file
* content into the shaded JAR.
@@ -37,6 +38,7 @@ public class IncludeResourceTransformer
implements ResourceTransformer
{
File file;
+
String resource;
public boolean canTransformResource( String r )
@@ -44,10 +46,10 @@ public class IncludeResourceTransformer
return false;
}
- public void processResource( String resource, InputStream is, List relocators )
+ public void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException
{
-
+ // no op
}
public boolean hasTransformedResource()
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=1300149&r1=1300148&r2=1300149&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 Tue Mar 13 14:35:39 2012
@@ -19,6 +19,9 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.codehaus.plexus.util.IOUtil;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;
@@ -30,8 +33,6 @@ import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
-import org.codehaus.plexus.util.IOUtil;
-
/**
* 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
@@ -46,10 +47,12 @@ public class ManifestResourceTransformer
// Configuration
private String mainClass;
+
private Map manifestEntries;
// Fields
private boolean manifestDiscovered;
+
private Manifest manifest;
public boolean canTransformResource( String resource )
@@ -62,7 +65,7 @@ public class ManifestResourceTransformer
return false;
}
- public void processResource( String resource, InputStream is, List relocators )
+ public void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException
{
// We just want to take the first manifest we come across as that's our project's manifest. This is the behavior
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ResourceTransformer.java?rev=1300149&r1=1300148&r2=1300149&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ResourceTransformer.java Tue Mar 13 14:35:39 2012
@@ -19,6 +19,8 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import org.apache.maven.plugins.shade.relocation.Relocator;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -29,7 +31,7 @@ public interface ResourceTransformer
{
boolean canTransformResource( String resource );
- void processResource( String resource, InputStream is, List relocators )
+ void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException;
boolean hasTransformedResource();
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=1300149&r1=1300148&r2=1300149&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 Tue Mar 13 14:35:39 2012
@@ -19,19 +19,19 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.codehaus.plexus.util.IOUtil;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
-import org.codehaus.plexus.util.IOUtil;
-
/**
* Resources transformer that appends entries in META-INF/services resources into
* a single resource. For example, if there are several META-INF/services/org.apache.maven.project.ProjectBuilder
@@ -47,7 +47,7 @@ public class ServicesResourceTransformer
private static final String SERVICES_PATH = "META-INF/services";
- private Map serviceEntries = new HashMap();
+ private Map<String, ServiceStream> serviceEntries = new HashMap<String, ServiceStream>();
public boolean canTransformResource( String resource )
{
@@ -59,10 +59,10 @@ public class ServicesResourceTransformer
return false;
}
- public void processResource( String resource, InputStream is, List relocators )
+ public void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException
{
- ServiceStream out = (ServiceStream) serviceEntries.get( resource );
+ ServiceStream out = serviceEntries.get( resource );
if ( out == null )
{
out = new ServiceStream();
@@ -81,10 +81,11 @@ public class ServicesResourceTransformer
public void modifyOutputStream( JarOutputStream jos )
throws IOException
{
- for ( Iterator i = serviceEntries.keySet().iterator(); i.hasNext(); )
+ for ( Map.Entry<String, ServiceStream> entry : serviceEntries.entrySet() )
{
- String key = (String) i.next();
- ServiceStream data = (ServiceStream) serviceEntries.get( key );
+ String key = entry.getKey();
+ ServiceStream data = entry.getValue();
+
jos.putNextEntry( new JarEntry( key ) );
IOUtil.copy( data.toInputStream(), jos );
data.reset();
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=1300149&r1=1300148&r2=1300149&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 Tue Mar 13 14:35:39 2012
@@ -19,14 +19,7 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.List;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-
+import org.apache.maven.plugins.shade.relocation.Relocator;
import org.jdom.Attribute;
import org.jdom.Content;
import org.jdom.Document;
@@ -39,6 +32,14 @@ import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.util.Iterator;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+
/**
* Appends multiple occurrences of some XML file.
*/
@@ -63,7 +64,7 @@ public class XmlAppendingTransformer
return false;
}
- public void processResource( String resource, InputStream is, List relocators )
+ public void processResource( String resource, InputStream is, List<Relocator> relocators )
throws IOException
{
Document r;