You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/05/08 13:49:22 UTC
svn commit: r405024 -
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
Author: brett
Date: Mon May 8 04:49:18 2006
New Revision: 405024
URL: http://svn.apache.org/viewcvs?rev=405024&view=rev
Log:
silly mistake
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java?rev=405024&r1=405023&r2=405024&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java Mon May 8 04:49:18 2006
@@ -26,6 +26,7 @@
import org.apache.maven.model.Build;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.assembly.filter.AssemblyExcludesArtifactFilter;
import org.apache.maven.plugin.assembly.filter.AssemblyIncludesArtifactFilter;
import org.apache.maven.plugin.assembly.filter.AssemblyScopeArtifactFilter;
import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolationException;
@@ -446,7 +447,7 @@
if ( !repository.getExcludes().isEmpty() )
{
- filter.add( new AssemblyIncludesArtifactFilter( repository.getExcludes() ) );
+ filter.add( new AssemblyExcludesArtifactFilter( repository.getExcludes() ) );
}
List artifacts = new ArrayList();
@@ -496,7 +497,7 @@
}
if ( !moduleSet.getExcludes().isEmpty() )
{
- filter.add( new AssemblyIncludesArtifactFilter( moduleSet.getExcludes() ) );
+ filter.add( new AssemblyExcludesArtifactFilter( moduleSet.getExcludes() ) );
}
Set set = getModulesFromReactor( getExecutedProject() );
@@ -524,10 +525,17 @@
moduleFileSet.setOutputDirectory( output );
List excludesList = new ArrayList();
- excludesList.add( PathUtils.toRelative( moduleProject.getBasedir(), moduleProject.getBuild().getDirectory() ) + "/**" );
- excludesList.add( PathUtils.toRelative( moduleProject.getBasedir(), moduleProject.getBuild().getOutputDirectory() ) + "/**" );
- excludesList.add( PathUtils.toRelative( moduleProject.getBasedir(), moduleProject.getBuild().getTestOutputDirectory() ) + "/**" );
- excludesList.add( PathUtils.toRelative( moduleProject.getBasedir(), moduleProject.getReporting().getOutputDirectory() ) + "/**" );
+ excludesList.add( PathUtils.toRelative( moduleProject.getBasedir(),
+ moduleProject.getBuild().getDirectory() ) + "/**" );
+ excludesList.add( PathUtils.toRelative( moduleProject.getBasedir(),
+ moduleProject.getBuild().getOutputDirectory() ) +
+ "/**" );
+ excludesList.add( PathUtils.toRelative( moduleProject.getBasedir(),
+ moduleProject.getBuild().getTestOutputDirectory() ) +
+ "/**" );
+ excludesList.add( PathUtils.toRelative( moduleProject.getBasedir(),
+ moduleProject.getReporting().getOutputDirectory() ) +
+ "/**" );
moduleFileSet.setExcludes( excludesList );
moduleFileSets.add( moduleFileSet );
@@ -541,10 +549,8 @@
if ( artifact.getFile() == null )
{
- throw new MojoExecutionException(
- "Included module: "
- + moduleProject.getId()
- + " does not have an artifact with a file. Please ensure the package phase is run before the assembly is generated." );
+ throw new MojoExecutionException( "Included module: " + moduleProject.getId() +
+ " does not have an artifact with a file. Please ensure the package phase is run before the assembly is generated." );
}
String output = binaries.getOutputDirectory();
@@ -1017,7 +1023,7 @@
}
if ( !dependencySet.getExcludes().isEmpty() )
{
- filter.add( new AssemblyIncludesArtifactFilter( dependencySet.getExcludes() ) );
+ filter.add( new AssemblyExcludesArtifactFilter( dependencySet.getExcludes() ) );
}
for ( Iterator j = getDependencies().iterator(); j.hasNext(); )