Author: epunzalan
Date: Tue May 9 04:10:42 2006
New Revision: 405387
URL: http://svn.apache.org/viewcvs?rev=405387&view=rev
Log:
PR: MASSEMBLY-88
Added test cases for ModuleSets
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-includes-plugin-config.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-plugin-config.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-excludes.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-include-dependencies.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-includes.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet.xml
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.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=405387&r1=405386&r2=405387&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
Tue May 9 04:10:42 2006
@@ -538,7 +538,7 @@
// archiver.addJar( )
// TODO refactor into the AbstractUnpackMojo
- File tempLocation = new File( workDirectory,
name.substring( 0, name.lastIndexOf( '.' ) ) );
+ File tempLocation = new File( workDirectory, name
);
boolean process = false;
if ( !tempLocation.exists() )
{
@@ -1339,6 +1339,7 @@
throw new MojoExecutionException( "Error adding file to
archive: " + e.getMessage(), e );
}
+ // @todo delete this part
// return to original source
if ( fileItem.isFiltered() )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java?rev=405387&r1=405386&r2=405387&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
Tue May 9 04:10:42 2006
@@ -20,6 +20,7 @@
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
import org.apache.maven.plugin.assembly.stubs.ArchiverStub;
+import org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
@@ -569,6 +570,159 @@
assertEquals( "Test file mode", 777, file.getFileMode() );
}
+ public void testModuleSet()
+ throws Exception
+ {
+ AssemblyMojo mojo = getMojo( "moduleSet-plugin-config.xml" );
+
+ MavenProject project = (MavenProject) getVariableValueFromObject(
mojo, "executedProject" );
+
+ List reactorProjectsList = (List) getVariableValueFromObject( mojo,
"reactorProjects" );
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ reactorProject.setParent( project );
+ }
+
+ mojo.execute();
+
+ File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ File unpacked = new File( workDir,
reactorProject.getBuild().getFinalName() );
+ assertTrue( "Test if reactor project was unpacked in work
directory", unpacked.exists() );
+ assertTrue( "Test if unpacked directory is in the archive",
archiverFiles.containsKey( unpacked ) );
+ archiverFiles.remove( unpacked );
+
+ File srcDir = reactorProject.getBasedir();
+ assertTrue( "Test if reactor sources is in the archive",
archiverFiles.containsKey( srcDir ) );
+ archiverFiles.remove( srcDir );
+ }
+
+ assertEquals( "Test that there are no other archive files added", 0,
archiverFiles.size() );
+ }
+
+ public void testModuleSetIncludes()
+ throws Exception
+ {
+ ReactorMavenProjectStub.reactorProjects.clear();
+
+ AssemblyMojo mojo = getMojo( "moduleSet-includes-plugin-config.xml" );
+
+ MavenProject project = (MavenProject) getVariableValueFromObject(
mojo, "executedProject" );
+
+ List reactorProjectsList = (List) getVariableValueFromObject( mojo,
"reactorProjects" );
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ reactorProject.setParent( project );
+ }
+
+ mojo.execute();
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
+
+ File unpacked = new File( workDir, "reactor-project-1-1.0.jar" );
+
+ assertTrue( "Test if reactor project was unpacked in work directory",
unpacked.exists() );
+ assertTrue( "Test if unpacked directory is in the archive",
archiverFiles.containsKey( unpacked ) );
+ archiverFiles.remove( unpacked );
+
+ File srcDir = new File( workDir.getParentFile(), "reactor-project-1" );
+ assertTrue( "Test if reactor project sources is in the archive",
archiverFiles.containsKey( srcDir ) );
+ archiverFiles.remove( srcDir );
+
+ assertEquals( "Test that there are no other archive files added", 0,
archiverFiles.size() );
+ }
+
+ public void testModuleSetExcludes()
+ throws Exception
+ {
+ ReactorMavenProjectStub.reactorProjects.clear();
+
+ AssemblyMojo mojo = getMojo( "moduleSet-excludes-plugin-config.xml" );
+
+ MavenProject project = (MavenProject) getVariableValueFromObject(
mojo, "executedProject" );
+
+ List reactorProjectsList = (List) getVariableValueFromObject( mojo,
"reactorProjects" );
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ reactorProject.setParent( project );
+ }
+
+ mojo.execute();
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
+
+ File unpacked = new File( workDir, "reactor-project-2-1.0.jar" );
+
+ assertTrue( "Test if reactor project was unpacked in work directory",
unpacked.exists() );
+ assertTrue( "Test if unpacked directory is in the archive",
archiverFiles.containsKey( unpacked ) );
+ archiverFiles.remove( unpacked );
+
+ File srcDir = new File( workDir.getParentFile(), "reactor-project-2" );
+ assertTrue( "Test if reactor project sources is in the archive",
archiverFiles.containsKey( srcDir ) );
+ archiverFiles.remove( srcDir );
+
+ assertEquals( "Test that there are no other archive files added", 0,
archiverFiles.size() );
+ }
+
+ public void testModuleSetIncludeDependencies()
+ throws Exception
+ {
+ AssemblyMojo mojo = getMojo(
"moduleSet-include-dependencies-plugin-config.xml" );
+
+ MavenProject project = (MavenProject) getVariableValueFromObject(
mojo, "executedProject" );
+
+ List reactorProjectsList = (List) getVariableValueFromObject( mojo,
"reactorProjects" );
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ reactorProject.setParent( project );
+ }
+
+ mojo.execute();
+
+ File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ File unpacked = new File( workDir,
reactorProject.getBuild().getFinalName() );
+ assertTrue( "Test if reactor project is unpacked in work
directory", unpacked.exists() );
+ File dependency = new File( unpacked,
"reactor-dependency-1.0.jar.extracted" );
+ assertTrue( "Test if reactor dependency is also unpacked",
dependency.exists() );
+ assertTrue( "Test if unpacked directory is in the archive",
archiverFiles.containsKey( unpacked ) );
+ archiverFiles.remove( unpacked );
+
+ File srcDir = reactorProject.getBasedir();
+ assertTrue( "Test if reactor sources is in the archive",
archiverFiles.containsKey( srcDir ) );
+ archiverFiles.remove( srcDir );
+ }
+
+ assertEquals( "Test that there are no other archive files added", 0,
archiverFiles.size() );
+ }
private AssemblyMojo getMojo( String pluginXml )
throws Exception
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java?rev=405387&r1=405386&r2=405387&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
Tue May 9 04:10:42 2006
@@ -24,6 +24,7 @@
import java.util.Set;
import java.util.Collections;
import java.util.Properties;
+import java.io.File;
/**
* @author Edwin Punzalan
@@ -39,6 +40,8 @@
private Model model;
+ private File basedir;
+
public Build getBuild()
{
return model.getBuild();
@@ -49,6 +52,11 @@
groupId = "assembly";
artifactId = "test-project";
version = "1.0";
+ }
+
+ public File getBasedir()
+ {
+ return basedir;
}
public Artifact getArtifact()
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java?rev=405387&r1=405386&r2=405387&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java
Tue May 9 04:10:42 2006
@@ -16,13 +16,19 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.Artifact;
+import org.codehaus.plexus.util.FileUtils;
+import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Properties;
import java.util.Set;
/**
@@ -35,10 +41,9 @@
private MavenProject parent;
- public Set getArtifacts()
- {
- return Collections.EMPTY_SET;
- }
+ private Model model;
+
+ private File basedir;
public ReactorMavenProjectStub()
{
@@ -58,6 +63,88 @@
setArtifact( new ArtifactStub( getGroupId(), getArtifactId(),
getVersion(), getPackaging(),
Artifact.SCOPE_COMPILE ) );
+ }
+
+ public String getId()
+ {
+ return getGroupId() + ":" + getArtifactId() + ":" + getVersion() + ":"
+ getPackaging();
+ }
+
+ public Set getArtifacts()
+ {
+ Set artifacts = new HashSet();
+
+ artifacts.add( new ArtifactStub( "assembly", "reactor-dependency",
"1.0", "jar", Artifact.SCOPE_COMPILE ) );
+
+ return artifacts;
+ }
+
+ public File getBasedir()
+ {
+ File basedir = super.getBasedir();
+
+ if ( parent != null )
+ {
+ basedir = parent.getBasedir();
+ }
+
+ return new File( basedir, getArtifactId() );
+ }
+
+ public Reporting getReporting()
+ {
+ return model.getReporting();
+ }
+
+ public Model getModel()
+ {
+ if ( model == null )
+ {
+ model = new Model();
+
+ model.setGroupId( getGroupId() );
+
+ model.setArtifactId( getArtifactId() );
+
+ model.setVersion( getVersion() );
+
+ model.setPackaging( getPackaging() );
+
+ model.setProperties( new Properties() );
+
+ Build build = new Build();
+ build.setFinalName( getArtifactId() + "-" + getVersion() + "." +
getPackaging() );
+
+ if ( parent != null )
+ {
+ build.setDirectory( parent.getBasedir().getAbsolutePath() +
"/" + getArtifactId() + "/target" );
+ FileUtils.mkdir( build.getDirectory() );
+
+ build.setOutputDirectory(
parent.getBasedir().getAbsolutePath() + "/" +
+ getArtifactId() + "/target/classes"
);
+ FileUtils.mkdir( build.getOutputDirectory() );
+
+ build.setTestOutputDirectory(
parent.getBasedir().getAbsolutePath() + "/" +
+ getArtifactId() +
"/target/test-classes" );
+ FileUtils.mkdir( build.getTestOutputDirectory() );
+
+ Reporting reporting = new Reporting();
+ reporting.setOutputDirectory(
parent.getBasedir().getAbsolutePath() + "/" +
+ getArtifactId() + "/target/site" );
+ FileUtils.mkdir( reporting.getOutputDirectory() );
+
+ model.setReporting( reporting );
+ }
+
+ model.setBuild( build );
+ }
+
+ return model;
+ }
+
+ public Build getBuild()
+ {
+ return getModel().getBuild();
}
public void setParent( MavenProject parent )
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml?rev=405387&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml
Tue May 9 04:10:42 2006
@@ -0,0 +1,50 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-excludes/target</outputDirectory>
+ <finalName>assembly</finalName>
+
<workDirectory>${basedir}/target/test-harness/assembly/moduleSet-excludes/work</workDirectory>
+ <archiverManager
implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ </reactorProjects>
+ <classifier></classifier>
+ <project
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
+ <executedProject
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
+
<basedir>${basedir}/target/test-harness/assembly/moduleSet-excludes</basedir>
+ </executedProject>
+ <descriptorRefs>
+ <descriptorRef>moduleSet-excludes</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+
<tempRoot>${basedir}/target/test-harness/assembly/moduleSet-excludes/archive-tmp</tempRoot>
+
<siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-excludes/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml?rev=405387&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml
Tue May 9 04:10:42 2006
@@ -0,0 +1,50 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/target</outputDirectory>
+ <finalName>assembly</finalName>
+
<workDirectory>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/work</workDirectory>
+ <archiverManager
implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ </reactorProjects>
+ <classifier></classifier>
+ <project
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
+ <executedProject
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
+
<basedir>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies</basedir>
+ </executedProject>
+ <descriptorRefs>
+ <descriptorRef>moduleSet-include-dependencies</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+
<tempRoot>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/archive-tmp</tempRoot>
+
<siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-includes-plugin-config.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-includes-plugin-config.xml?rev=405387&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-includes-plugin-config.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-includes-plugin-config.xml
Tue May 9 04:10:42 2006
@@ -0,0 +1,50 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-includes/target</outputDirectory>
+ <finalName>assembly</finalName>
+
<workDirectory>${basedir}/target/test-harness/assembly/moduleSet-includes/work</workDirectory>
+ <archiverManager
implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ </reactorProjects>
+ <classifier></classifier>
+ <project
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
+ <executedProject
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
+
<basedir>${basedir}/target/test-harness/assembly/moduleSet-includes</basedir>
+ </executedProject>
+ <descriptorRefs>
+ <descriptorRef>moduleSet-includes</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+
<tempRoot>${basedir}/target/test-harness/assembly/moduleSet-includes/archive-tmp</tempRoot>
+
<siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-includes/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-includes-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-plugin-config.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-plugin-config.xml?rev=405387&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-plugin-config.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-plugin-config.xml
Tue May 9 04:10:42 2006
@@ -0,0 +1,50 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-harness/assembly/moduleSet/target</outputDirectory>
+ <finalName>assembly</finalName>
+
<workDirectory>${basedir}/target/test-harness/assembly/moduleSet/work</workDirectory>
+ <archiverManager
implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ </reactorProjects>
+ <classifier></classifier>
+ <project
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
+ <executedProject
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
+
<basedir>${basedir}/target/test-harness/assembly/moduleSet</basedir>
+ </executedProject>
+ <descriptorRefs>
+ <descriptorRef>moduleSet</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+
<tempRoot>${basedir}/target/test-harness/assembly/moduleSet/archive-tmp</tempRoot>
+
<siteDirectory>${basedir}/target/test-harness/assembly/moduleSet/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-excludes.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-excludes.xml?rev=405387&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-excludes.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-excludes.xml
Tue May 9 04:10:42 2006
@@ -0,0 +1,31 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>moduleSet</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <moduleSets>
+ <moduleSet>
+ <excludes>
+ <exclude>assembly:reactor-project-1</exclude>
+ </excludes>
+ <sources/>
+ <binaries/>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-excludes.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-include-dependencies.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-include-dependencies.xml?rev=405387&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-include-dependencies.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-include-dependencies.xml
Tue May 9 04:10:42 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>moduleSet</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <moduleSets>
+ <moduleSet>
+ <sources/>
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-include-dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-includes.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-includes.xml?rev=405387&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-includes.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-includes.xml
Tue May 9 04:10:42 2006
@@ -0,0 +1,31 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>moduleSet</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>assembly:reactor-project-1</include>
+ </includes>
+ <sources/>
+ <binaries/>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-includes.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet.xml?rev=405387&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet.xml
Tue May 9 04:10:42 2006
@@ -0,0 +1,28 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>moduleSet</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <moduleSets>
+ <moduleSet>
+ <sources/>
+ <binaries/>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet.xml
------------------------------------------------------------------------------
svn:eol-style = native
