You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/05/23 01:21:18 UTC
svn commit: r777739 - in
/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4: ./
src/it/projects/container-descriptors/configured-handler/
src/it/projects/container-descriptors/configured-handler/src/
src/it/projects/container-descriptors/configur...
Author: jdcasey
Date: Fri May 22 23:21:17 2009
New Revision: 777739
URL: http://svn.apache.org/viewvc?rev=777739&view=rev
Log:
Adding ability to configure built-in containerDescriptorHandlers from the assembly descriptor or a component descriptor.
Added:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/goals.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/verify.bsh (with props)
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/component.mdo
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/descriptor.mdo
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/META-INF/plexus/components.xml
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml?rev=777739&r1=777738&r2=777739&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml Fri May 22 23:21:17 2009
@@ -50,7 +50,7 @@
</issueManagement>
<properties>
- <mdoVersion>1.1.0</mdoVersion>
+ <mdoVersion>1.1.1</mdoVersion>
</properties>
<dependencies>
@@ -244,6 +244,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
+ <version>1.0</version>
<configuration>
<version>${mdoVersion}</version>
</configuration>
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/goals.txt?rev=777739&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/goals.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/goals.txt Fri May 22 23:21:17 2009
@@ -0,0 +1 @@
+clean validate
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/pom.xml?rev=777739&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/pom.xml Fri May 22 23:21:17 2009
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.test</groupId>
+ <artifactId>configured-handler</artifactId>
+ <version>1</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml?rev=777739&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml Fri May 22 23:21:17 2009
@@ -0,0 +1,26 @@
+<assembly>
+ <id>bin</id>
+
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/config</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <containerDescriptorHandlers>
+ <containerDescriptorHandler>
+ <handlerName>file-aggregator</handlerName>
+ <configuration>
+ <filePattern>.*/file.txt</filePattern>
+ <outputPath>file.txt</outputPath>
+ </configuration>
+ </containerDescriptorHandler>
+ </containerDescriptorHandlers>
+</assembly>
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt?rev=777739&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt Fri May 22 23:21:17 2009
@@ -0,0 +1 @@
+file A
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt?rev=777739&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt Fri May 22 23:21:17 2009
@@ -0,0 +1,2 @@
+file B
+
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/verify.bsh?rev=777739&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/verify.bsh (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/verify.bsh Fri May 22 23:21:17 2009
@@ -0,0 +1,54 @@
+import java.io.*;
+
+boolean result = true;
+
+try
+{
+ File a = new File( basedir, "target/configured-handler-1-bin/file.txt");
+ File b = new File( basedir, "target/configured-handler-1-bin/b/file.txt");
+
+ if(result && !a.exists() ) {
+ System.out.println( "File: " + a + " should have been generated, but was not." );
+ result = false;
+ }
+
+ if(result) {
+ BufferedReader r = new BufferedReader(new FileReader(a));
+ String s = null;
+
+ boolean foundA = false;
+ boolean foundB = false;
+ while( ( s = r.readLine() ) != null )
+ {
+ if ( s.equals( "file A" ) ) {
+ foundA = true;
+ }
+ else if ( s.equals( "file B" ) ) {
+ foundB = true;
+ }
+
+ if ( foundA && foundB )
+ {
+ result = true;
+ break;
+ }
+ }
+
+ if ( !result )
+ {
+ System.out.println( "File: " + a + " should contain lines:\nfile A\nfile B\n\n ...but didn't." );
+ }
+ }
+
+ if(result && b.exists() ) {
+ System.out.println( "File: " + b + " should not exist, but does." );
+ result = false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml?rev=777739&r1=777738&r2=777739&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml Fri May 22 23:21:17 2009
@@ -5,7 +5,7 @@
<role-hint>file.txt</role-hint>
<implementation>org.apache.maven.plugin.assembly.filter.SimpleAggregatingDescriptorHandler</implementation>
<configuration>
- <filePattern>.*file.txt</filePattern>
+ <filePattern>.*/file.txt</filePattern>
<outputPath>file.txt</outputPath>
<commentChars>#</commentChars>
</configuration>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=777739&r1=777738&r2=777739&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Fri May 22 23:21:17 2009
@@ -169,7 +169,7 @@
null, finalName, configSource );
}
- List containerHandlers = selectContainerDescriptorHandlers( assembly.getContainerDescriptorHandlers() );
+ List containerHandlers = selectContainerDescriptorHandlers( assembly.getContainerDescriptorHandlers(), configSource );
Archiver archiver = createArchiver( format, assembly.isIncludeBaseDirectory(), basedir, configSource,
containerHandlers );
@@ -217,7 +217,7 @@
return destFile;
}
- private List selectContainerDescriptorHandlers( List requestedContainerDescriptorHandlers )
+ private List selectContainerDescriptorHandlers( List requestedContainerDescriptorHandlers, AssemblerConfigurationSource configSource )
throws InvalidAssemblerConfigurationException
{
getLogger().debug(
@@ -247,8 +247,15 @@
throw new InvalidAssemblerConfigurationException( "Cannot find ContainerDescriptorHandler with hint: " + hint );
}
- System.out.println( "Found container descriptor handler with hint: " + hint + " (component: " + handler + ")" );
-
+ getLogger().debug( "Found container descriptor handler with hint: " + hint + " (component: " + handler + ")" );
+
+ if ( config.getConfiguration() != null )
+ {
+ getLogger().debug( "Configuring handler with:\n\n" + config.getConfiguration() + "\n\n" );
+
+ configureContainerDescriptorHandler( handler, (Xpp3Dom) config.getConfiguration(), configSource );
+ }
+
handlers.add( handler );
if ( "plexus".equals( hint ) )
@@ -324,6 +331,40 @@
return archiver;
}
+
+ private void configureContainerDescriptorHandler( ContainerDescriptorHandler handler, Xpp3Dom config,
+ AssemblerConfigurationSource configSource )
+ throws InvalidAssemblerConfigurationException
+ {
+ ComponentConfigurator configurator;
+ try
+ {
+ configurator = (ComponentConfigurator) container.lookup( ComponentConfigurator.ROLE, "basic" );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new InvalidAssemblerConfigurationException( "Failed to lookup configurator component for setup of handler: " + handler.getClass().getName(), e );
+ }
+
+ XmlPlexusConfiguration configuration = new XmlPlexusConfiguration( config );
+
+ ConfigurationListener listener = new DebugConfigurationListener( getLogger() );
+ ExpressionEvaluator expressionEvaluator = new AssemblyExpressionEvaluator( configSource );
+
+ getLogger().debug( "Configuring handler: '" + handler.getClass().getName() + "' -->" );
+
+ try
+ {
+ configurator.configureComponent( handler, configuration, expressionEvaluator,
+ container.getContainerRealm(), listener );
+ }
+ catch ( ComponentConfigurationException e )
+ {
+ throw new InvalidAssemblerConfigurationException( "Failed to configure handler: " + handler.getClass().getName(), e );
+ }
+
+ getLogger().debug( "-- end configuration --" );
+ }
private void configureArchiver( Archiver archiver, AssemblerConfigurationSource configSource )
throws ArchiverException
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java?rev=777739&r1=777738&r2=777739&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java Fri May 22 23:21:17 2009
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
@@ -71,6 +72,8 @@
public void finalizeArchiveCreation( Archiver archiver )
throws ArchiverException
{
+ checkConfig();
+
if ( outputPath.endsWith( "/" ) )
{
throw new ArchiverException(
@@ -139,12 +142,16 @@
public List getVirtualFiles()
{
+ checkConfig();
+
return Collections.singletonList( outputPath );
}
public boolean isSelected( FileInfo fileInfo )
throws IOException
{
+ checkConfig();
+
if ( overrideFilterAction )
{
System.out.println( "Filtering overridden. Returning true." );
@@ -152,6 +159,7 @@
}
String name = fileInfo.getName();
+ name = AssemblyFileUtils.normalizePath( name );
if ( fileInfo.isFile() && name.matches( filePattern ) )
{
@@ -164,6 +172,14 @@
return true;
}
+ private void checkConfig()
+ {
+ if ( filePattern == null || outputPath == null )
+ {
+ throw new IllegalStateException( "You must configure filePattern and outputPath in your containerDescriptorHandler declaration." );
+ }
+ }
+
private void readProperties( FileInfo fileInfo )
throws IOException
{
@@ -202,14 +218,14 @@
this.logger = logger;
}
- public String getPropertiesPattern()
+ public String getFilePattern()
{
return filePattern;
}
- public void setPropertiesPattern( String propertiesPattern )
+ public void setFilePattern( String filePattern )
{
- filePattern = propertiesPattern;
+ this.filePattern = filePattern;
}
public String getOutputPath()
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java?rev=777739&r1=777738&r2=777739&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java Fri May 22 23:21:17 2009
@@ -213,4 +213,9 @@
c2.close();
}
+ public static String normalizePath( String path )
+ {
+ return path.replace( '\\', '/' );
+ }
+
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/component.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/component.mdo?rev=777739&r1=777738&r2=777739&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/component.mdo (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/component.mdo Fri May 22 23:21:17 2009
@@ -21,8 +21,8 @@
Modello currently does not have capability to share files
-->
-<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0"
- xsd.target-namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0">
+<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.1"
+ xsd.targetNamespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.1">
<id>component</id>
<name>Component</name>
@@ -101,7 +101,7 @@
</field>
<field>
<name>repositories</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<association>
<type>Repository</type>
<multiplicity>*</multiplicity>
@@ -116,7 +116,7 @@
</field>
<field>
<name>containerDescriptorHandlers</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<association>
<type>ContainerDescriptorHandlerConfig</type>
<multiplicity>*</multiplicity>
@@ -137,7 +137,7 @@
<fields>
<field>
<name>useStrictFiltering</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -149,7 +149,7 @@
</field>
<field>
<name>useDefaultExcludes</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -273,7 +273,7 @@
</field>
<field>
<name>filtered</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Whether to filter symbols in the files as they are copied, using
properties from the build configuration.
@@ -402,7 +402,7 @@
</field>
<field>
<name>unpackOptions</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Allows the specification of includes and excludes, along with filtering options, for items
unpacked from a dependency artifact.
@@ -424,7 +424,7 @@
</field>
<field>
<name>useProjectArtifact</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description><![CDATA[
@@ -435,7 +435,7 @@
</field>
<field>
<name>useProjectAttachments</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description><![CDATA[
@@ -445,7 +445,7 @@
</field>
<field>
<name>useTransitiveDependencies</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -459,7 +459,7 @@
</field>
<field>
<name>useTransitiveFiltering</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -477,13 +477,13 @@
<class>
<name>Repository</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<superClass>SetBase</superClass>
<description>Defines a Maven repository to be included in the assembly.</description>
<fields>
<field>
<name>includeMetadata</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -494,7 +494,7 @@
</field>
<field>
<name>groupVersionAlignments</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>Align a group to a version or an individual artifact.</description>
<association>
<type>GroupVersionAlignment</type>
@@ -503,7 +503,7 @@
</field>
<field>
<name>scope</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>String</type>
<defaultValue>runtime</defaultValue>
<required>true</required>
@@ -516,24 +516,24 @@
</class>
<class>
<name>GroupVersionAlignment</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>Defines a Maven repository to be included in the assembly.</description>
<fields>
<field>
<name>id</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>String</type>
<description>The groupId for which you want to align the versions.</description>
</field>
<field>
<name>version</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>String</type>
<description>The version you want to align this group to.</description>
</field>
<field>
<name>excludes</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>Artifact Ids of the artifacts you want excluded from version alignment.</description>
<association>
<type>String</type>
@@ -544,14 +544,14 @@
</class>
<class>
<name>UnpackOptions</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Specifies options for including/excluding/filtering items extracted from an archive.
</description>
<fields>
<field>
<name>includes</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Set of patterns for matching items to be included from an archive as it is unpacked.
</description>
@@ -562,7 +562,7 @@
</field>
<field>
<name>excludes</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Set of patterns for matching items to be excluded from an archive as it is unpacked.
</description>
@@ -573,7 +573,7 @@
</field>
<field>
<name>filtered</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Whether to filter symbols in the files as they are unpacked from the archive, using
properties from the build configuration.
@@ -585,7 +585,7 @@
</class>
<class>
<name>ContainerDescriptorHandlerConfig</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Configures a filter for files headed into the assembly archive, to enable
aggregation of various types of descriptor fragments, such as components.xml,
@@ -594,23 +594,21 @@
<fields>
<field>
<name>handlerName</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
The handler's plexus role-hint, for lookup from the container.
</description>
<type>String</type>
<required>true</required>
</field>
- <!-- Commented out until it can be implemented and tested...
<field>
<name>configuration</name>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<description>
Configuration options for the handler.
</description>
<type>DOM</type>
</field>
- -->
</fields>
</class>
</classes>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/descriptor.mdo?rev=777739&r1=777738&r2=777739&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/descriptor.mdo (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/mdo/descriptor.mdo Fri May 22 23:21:17 2009
@@ -23,8 +23,8 @@
to "component.mdo".
-->
-<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xsd.target-namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0">
+<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+ xsd.targetNamespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1">
<id>assembly</id>
<name>Assembly</name>
@@ -120,7 +120,7 @@
</field>
<field>
<name>baseDirectory</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>String</type>
<description>
Sets the base directory of the resulting assembly archive. If this is not
@@ -140,7 +140,7 @@
</field>
<field>
<name>containerDescriptorHandlers</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<association>
<type>ContainerDescriptorHandlerConfig</type>
<multiplicity>*</multiplicity>
@@ -256,7 +256,7 @@
<fields>
<field>
<name>useStrictFiltering</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -268,7 +268,7 @@
</field>
<field>
<name>useDefaultExcludes</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -392,7 +392,7 @@
</field>
<field>
<name>filtered</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Whether to filter symbols in the files as they are copied, using
properties from the build configuration. (Since 2.2)
@@ -520,7 +520,7 @@
</field>
<field>
<name>unpackOptions</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Allows the specification of includes and excludes, along with filtering options, for items
unpacked from a dependency artifact. (Since 2.2)
@@ -542,7 +542,7 @@
</field>
<field>
<name>useProjectArtifact</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description><![CDATA[
@@ -553,7 +553,7 @@
</field>
<field>
<name>useProjectAttachments</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description><![CDATA[
@@ -563,7 +563,7 @@
</field>
<field>
<name>useTransitiveDependencies</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -577,7 +577,7 @@
</field>
<field>
<name>useTransitiveFiltering</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -610,7 +610,7 @@
<fields>
<field>
<name>includeSubModules</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -686,7 +686,7 @@
<fields>
<field>
<name>fileSets</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<association>
<type>FileSet</type>
<multiplicity>*</multiplicity>
@@ -700,7 +700,7 @@
</field>
<field>
<name>includeModuleDirectory</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -712,7 +712,7 @@
</field>
<field>
<name>excludeSubModuleDirectories</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -727,7 +727,7 @@
</field>
<field>
<name>outputDirectoryMapping</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>String</type>
<defaultValue>${module.artifactId}</defaultValue>
<description>
@@ -750,7 +750,7 @@
<fields>
<field>
<name>attachmentClassifier</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>String</type>
<description>
When specified, the attachmentClassifier will cause the assembler to look at artifacts
@@ -772,7 +772,7 @@
</field>
<field>
<name>dependencySets</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<association>
<type>DependencySet</type>
<multiplicity>*</multiplicity>
@@ -799,7 +799,7 @@
</field>
<field>
<name>unpackOptions</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Allows the specification of includes and excludes, along with filtering options, for items
unpacked from a module artifact. (Since 2.2)
@@ -869,7 +869,7 @@
</field>
<field>
<name>scope</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<type>String</type>
<defaultValue>runtime</defaultValue>
<required>true</required>
@@ -924,14 +924,14 @@
</class>
<class>
<name>UnpackOptions</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Specifies options for including/excluding/filtering items extracted from an archive. (Since 2.2)
</description>
<fields>
<field>
<name>includes</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Set of patterns for matching items to be included from an archive as it is unpacked. (Since 2.2)
</description>
@@ -942,7 +942,7 @@
</field>
<field>
<name>excludes</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Set of patterns for matching items to be excluded from an archive as it is unpacked. (Since 2.2)
</description>
@@ -953,7 +953,7 @@
</field>
<field>
<name>filtered</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Whether to filter symbols in the files as they are unpacked from the archive, using
properties from the build configuration. (Since 2.2)
@@ -965,7 +965,7 @@
</class>
<class>
<name>ContainerDescriptorHandlerConfig</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
Configures a filter for files headed into the assembly archive, to enable
aggregation of various types of descriptor fragments, such as components.xml,
@@ -974,23 +974,21 @@
<fields>
<field>
<name>handlerName</name>
- <version>1.1.0</version>
+ <version>1.1.0+</version>
<description>
The handler's plexus role-hint, for lookup from the container.
</description>
<type>String</type>
<required>true</required>
</field>
- <!-- Commented out until it can be implemented and tested...
<field>
<name>configuration</name>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<description>
Configuration options for the handler.
</description>
<type>DOM</type>
</field>
- -->
</fields>
</class>
</classes>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/META-INF/plexus/components.xml?rev=777739&r1=777738&r2=777739&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/META-INF/plexus/components.xml Fri May 22 23:21:17 2009
@@ -42,6 +42,13 @@
</component>
<component>
+ <role>org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler</role>
+ <role-hint>file-aggregator</role-hint>
+ <implementation>org.apache.maven.plugin.assembly.filter.SimpleAggregatingDescriptorHandler</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ </component>
+
+ <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>assembly-component</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>