Author: jdcasey
Date: Fri Sep 24 16:10:31 2010
New Revision: 1000938
URL: http://svn.apache.org/viewvc?rev=1000938&view=rev
Log:
[MASSEMBLY-464] Require non-empty assembly ID.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1000938&r1=1000937&r2=1000938&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
Fri Sep 24 16:10:31 2010
@@ -136,6 +136,8 @@ public class DefaultAssemblyArchiver
final AssemblerConfigurationSource configSource
)
throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
{
+ validate( assembly );
+
String filename = fullName;
if ( !configSource.isIgnoreDirFormatExtensions() ||
!format.startsWith( "dir" ) )
{
@@ -207,6 +209,15 @@ public class DefaultAssemblyArchiver
return destFile;
}
+ private void validate( Assembly assembly )
+ throws InvalidAssemblerConfigurationException
+ {
+ if ( assembly.getId() == null || assembly.getId().trim().length() < 1 )
+ {
+ throw new InvalidAssemblerConfigurationException( "Assembly ID
must be present and non-empty." );
+ }
+ }
+
private List<ContainerDescriptorHandler>
selectContainerDescriptorHandlers( List<ContainerDescriptorHandlerConfig>
requestedContainerDescriptorHandlers,
final AssemblerConfigurationSource configSource )
throws InvalidAssemblerConfigurationException
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1000938&r1=1000937&r2=1000938&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
Fri Sep 24 16:10:31 2010
@@ -47,71 +47,5 @@
<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>
- <configuration>
- <packaging>assembly-component</packaging>
- <classifier>assembly-component</classifier>
- <extension>xml</extension>
- <type>xml</type>
- <addedToClasspath>false</addedToClasspath>
- <includesDependencies>true</includesDependencies>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>assembly-component</role-hint>
-
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
- <configuration>
- <lifecycles>
- <lifecycle>
- <id>default</id>
- <!-- START SNIPPET: assembly-component-lifecycle -->
- <phases>
-
<package>org.apache.maven.plugins:maven-assembly-plugin:attach-component-descriptor</package>
-
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
-
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
- </phases>
- <!-- END SNIPPET: assembly-component-lifecycle -->
- </lifecycle>
- </lifecycles>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>assembly-descriptor</role-hint>
-
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <packaging>assembly-descriptor</packaging>
- <classifier>assembly-descriptor</classifier>
- <extension>xml</extension>
- <type>xml</type>
- <addedToClasspath>false</addedToClasspath>
- <includesDependencies>true</includesDependencies>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>assembly-descriptor</role-hint>
-
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
- <configuration>
- <lifecycles>
- <lifecycle>
- <id>default</id>
- <!-- START SNIPPET: assembly-descriptor-lifecycle -->
- <phases>
-
<package>org.apache.maven.plugins:maven-assembly-plugin:attach-assembly-descriptor</package>
-
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
-
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
- </phases>
- <!-- END SNIPPET: assembly-descriptor-lifecycle -->
- </lifecycle>
- </lifecycles>
- </configuration>
- </component>
</components>
</component-set>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml?rev=1000938&r1=1000937&r2=1000938&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
Fri Sep 24 16:10:31 2010
@@ -30,15 +30,9 @@
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
+ <useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
</assembly>
