Author: jdcasey
Date: Thu May 4 17:50:34 2006
New Revision: 399900
URL: http://svn.apache.org/viewcvs?rev=399900&view=rev
Log:
Moving to feature branch until changes stabilize.
Added:
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/
- copied from r399858, maven/plugins/trunk/maven-assembly-plugin/
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/pom.xml
- copied unchanged from r399870,
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
- copied unchanged from r399870,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/main/mdo/descriptor.mdo
- copied, changed from r399870,
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
- copied, changed from r399870,
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/test/plugin-configs/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-pluginConfig.xml
- copied unchanged from r399870,
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-pluginConfig.xml
Copied:
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/main/mdo/descriptor.mdo
(from r399870,
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo)
URL:
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/main/mdo/descriptor.mdo?p2=maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/main/mdo/descriptor.mdo&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo&r1=399870&r2=399900&rev=399900&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
(original)
+++
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/main/mdo/descriptor.mdo
Thu May 4 17:50:34 2006
@@ -399,38 +399,70 @@
<class>
<name>ModuleSet</name>
<version>1.0.0</version>
- <superClass>SetBase</superClass>
<fields>
<field>
- <name>includeSources</name>
+ <name>includes</name>
<version>1.0.0</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
<description>
- When set to true, the plugin will include the source files for
modules included in this
- set. Otherwise, it will only include binaries.
+ This is a list of <include> elements, each containing a
module reference of the type groupId:artifactId.
+ Modules matching these elements will be included in this set.
</description>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
</field>
<field>
- <name>sourceOutputDirectory</name>
+ <name>excludes</name>
<version>1.0.0</version>
- <type>String</type>
<description>
- The output directory in the assembly for the module-sources
included by this set.
+ This is a list of <exclude> elements, each containing a
module reference of the type groupId:artifactId.
+ Modules matching these elements will be excluded from this set.
</description>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
</field>
<field>
- <name>includeBinaries</name>
+ <name>sources</name>
<version>1.0.0</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
<description>
- When set to true, the plugin will include the binaries for the
included modules, according to other
- configuration in this set. This includes the module artifacts,
along with the dependency artifacts
- (optionally).
+ When this is configured, the plugin will include the source files
of the included modules from this set in
+ the resulting assembly, according to the configuration.
</description>
+ <association>
+ <type>ModuleSources</type>
+ </association>
</field>
<field>
+ <name>binaries</name>
+ <version>1.0.0</version>
+ <description>
+ When this is configured, the plugin will include the binaries of
the included modules from this set in
+ the resulting assembly, according to the configuration.
+ </description>
+ <association>
+ <type>ModuleBinaries</type>
+ </association>
+ </field>
+ </fields>
+ </class>
+
+ <class>
+ <name>ModuleSources</name>
+ <version>1.0.0</version>
+ <superClass>SetBase</superClass>
+ <description>Configuration for including the source files for a Module
in an assembly.</description>
+ </class>
+
+ <class>
+ <name>ModuleBinaries</name>
+ <version>1.0.0</version>
+ <superClass>SetBase</superClass>
+ <description>Configuration for including the binary files for a Module
in an assembly.</description>
+ <fields>
+ <field>
<name>includeDependencies</name>
<version>1.0.0</version>
<type>boolean</type>
@@ -465,7 +497,7 @@
</field>
</fields>
</class>
-
+
<class>
<name>Repository</name>
<version>1.0.0</version>
Copied:
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
(from r399870,
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java)
URL:
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java?p2=maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java&r1=399870&r2=399900&rev=399900&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
(original)
+++
maven/plugins/branches/maven-assembly-plugin-MASSEMBLY-29/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
Thu May 4 17:50:34 2006
@@ -3,6 +3,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.model.Model;
+import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
import org.apache.maven.plugin.assembly.stubs.ArchiverStub;
import org.apache.maven.plugin.assembly.stubs.ArtifactStub;
@@ -42,10 +43,18 @@
requiredDependencies.add( "dependencies/test.jar" );
requiredDependencies.add( "dependencies/test2.jar" );
- testDependencyMapping( pluginConfig, requiredDependencies );
+ Mojo mojo = run( pluginConfig, "directory" );
+ testDependencyMapping( mojo, requiredDependencies );
}
-
- private void testDependencyMapping( String pluginConfig, List
requiredDependencies ) throws Exception
+
+ public void testModuleSetSourceIncludedBinariesNotIncluded() throws
Exception
+ {
+ String pluginConfig =
"moduleSetSourceIncludedBinariesNotIncluded-pluginConfig.xml";
+
+ Mojo mojo = run( pluginConfig, "directory" );
+ }
+
+ private Mojo run( String pluginConfig, String mojoName ) throws Exception
{
String pluginConfigResource = "basicAbstractAssemblyMojoFeaturesTest/"
+ pluginConfig;
@@ -61,6 +70,13 @@
mojo.execute();
+ return mojo;
+ }
+
+ private void testDependencyMapping( Mojo mojo, List requiredDependencies )
throws Exception
+ {
+ FileLoggingArchiverManagerStub archiverManager =
(FileLoggingArchiverManagerStub) getVariableValueFromObject( mojo,
"archiverManager" );
+
FileLoggingArchiverStub archiver = (FileLoggingArchiverStub)
archiverManager.getArchiver( null );
Set addedFiles = archiver.getAddedFiles();
