Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include META-INF, just make sure files in resources take precedence 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292374 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-09-29 02:04:34 +00:00
parent 232935ba65
commit d16cd8ba1a
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
View File

@ -142,13 +142,11 @@ public class AssemblyMojo
/** /**
* Create the binary distribution. * Create the binary distribution.
*
* @throws ArchiverException, IOException, MojoExecutionException, XmlPullParserException
*/ */
private void doExecute() private void doExecute()
throws ArchiverException, IOException, MojoExecutionException, XmlPullParserException throws ArchiverException, IOException, MojoExecutionException, XmlPullParserException
{ {
Reader r = null; Reader r;
if ( descriptor != null ) if ( descriptor != null )
{ {
@ -189,8 +187,8 @@ public class AssemblyMojo
// TODO: use component roles? Can we do that in a mojo? // TODO: use component roles? Can we do that in a mojo?
Archiver archiver = createArchiver( format ); Archiver archiver = createArchiver( format );
processFileSets( archiver, assembly.getFileSets(), assembly.isIncludeBaseDirectory() );
processDependencySets( archiver, assembly.getDependencySets(), assembly.isIncludeBaseDirectory() ); processDependencySets( archiver, assembly.getDependencySets(), assembly.isIncludeBaseDirectory() );
processFileSets( archiver, assembly.getFileSets(), assembly.isIncludeBaseDirectory() );
File destFile = new File( outputDirectory, filename ); File destFile = new File( outputDirectory, filename );
archiver.setDestFile( destFile ); archiver.setDestFile( destFile );
@ -211,7 +209,6 @@ public class AssemblyMojo
* @param archiver * @param archiver
* @param dependencySets * @param dependencySets
* @param includeBaseDirectory * @param includeBaseDirectory
* @throws ArchiverException, IOException, MojoExecutionException
*/ */
private void processDependencySets( Archiver archiver, List dependencySets, boolean includeBaseDirectory ) private void processDependencySets( Archiver archiver, List dependencySets, boolean includeBaseDirectory )
throws ArchiverException, IOException, MojoExecutionException throws ArchiverException, IOException, MojoExecutionException
@ -273,7 +270,7 @@ public class AssemblyMojo
unpack( artifact.getFile(), tempLocation ); unpack( artifact.getFile(), tempLocation );
} }
archiver.addDirectory( tempLocation, null, archiver.addDirectory( tempLocation, null,
(String[]) getJarExcludes().toArray( EMPTY_STRING_ARRAY ) ); (String[]) getDefaultExcludes().toArray( EMPTY_STRING_ARRAY ) );
} }
else else
{ {
@ -376,7 +373,8 @@ public class AssemblyMojo
Pattern pat = Pattern.compile( "^(.*)\\$\\{([^\\}]+)\\}(.*)$" ); Pattern pat = Pattern.compile( "^(.*)\\$\\{([^\\}]+)\\}(.*)$" );
Matcher mat = pat.matcher( expression ); Matcher mat = pat.matcher( expression );
String left, right; String left;
String right;
Object middle; Object middle;
if ( mat.matches() ) if ( mat.matches() )
@ -396,7 +394,7 @@ public class AssemblyMojo
{ {
// TODO: There should be a more generic way dealing with that. Having magic words is not good at all. // TODO: There should be a more generic way dealing with that. Having magic words is not good at all.
// probe for magic word // probe for magic word
if ( mat.group( 2 ).trim().equals( "extension" ) ) if ( "extension".equals( mat.group( 2 ).trim() ) )
{ {
ArtifactHandler artifactHandler = artifact.getArtifactHandler(); ArtifactHandler artifactHandler = artifact.getArtifactHandler();
middle = artifactHandler.getExtension(); middle = artifactHandler.getExtension();
@ -413,18 +411,6 @@ public class AssemblyMojo
return expression; return expression;
} }
/**
* Get the files to be excluded and put it into list.
*
* @return l List of filename patterns to be excluded.
*/
private static List getJarExcludes()
{
List l = new ArrayList( getDefaultExcludes() );
l.add( "META-INF/**" );
return l;
}
/** /**
* Get the Output Directory by parsing the String output directory. * Get the Output Directory by parsing the String output directory.
* *
@ -486,11 +472,11 @@ public class AssemblyMojo
TarArchiver.TarCompressionMethod tarCompressionMethod = new TarArchiver.TarCompressionMethod(); TarArchiver.TarCompressionMethod tarCompressionMethod = new TarArchiver.TarCompressionMethod();
// TODO: this should accept gz and bz2 as well so we can skip over the switch // TODO: this should accept gz and bz2 as well so we can skip over the switch
String compression = format.substring( index + 1 ); String compression = format.substring( index + 1 );
if ( compression.equals( "gz" ) ) if ( "gz".equals( compression ) )
{ {
tarCompressionMethod.setValue( "gzip" ); tarCompressionMethod.setValue( "gzip" );
} }
else if ( compression.equals( "bz2" ) ) else if ( "bz2".equals( compression ) )
{ {
tarCompressionMethod.setValue( "bzip2" ); tarCompressionMethod.setValue( "bzip2" );
} }
@ -619,15 +605,15 @@ public class AssemblyMojo
{ {
if ( lineEnding != null ) if ( lineEnding != null )
{ {
if ( lineEnding.equals( "keep" ) ) if ( "keep".equals( lineEnding ) )
{ {
lineEnding = null; lineEnding = null;
} }
else if ( lineEnding.equals( "dos" ) || lineEnding.equals( "crlf" ) ) else if ( "dos".equals( lineEnding ) || "crlf".equals( lineEnding ) )
{ {
lineEnding = "\r\n"; lineEnding = "\r\n";
} }
else if ( lineEnding.equals( "unix" ) || lineEnding.equals( "lf" ) ) else if ( "unix".equals( lineEnding ) || "lf".equals( lineEnding ) )
{ {
lineEnding = "\n"; lineEnding = "\n";
} }