You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/11/14 23:16:36 UTC

svn commit: r1542107 - in /maven/plugins/trunk/maven-ear-plugin: pom.xml src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java

Author: rfscholte
Date: Thu Nov 14 22:16:36 2013
New Revision: 1542107

URL: http://svn.apache.org/r1542107
Log:
[MEAR-172] Enhance the exception thrown when the EAR plugin can not map an included artifact
Patch contributed by Steve Moyer, verified by Robert Scholte

Modified:
    maven/plugins/trunk/maven-ear-plugin/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java

Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1542107&r1=1542106&r2=1542107&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Thu Nov 14 22:16:36 2013
@@ -60,10 +60,13 @@ under the License.
 
   <contributors>
     <contributor>
-      <name>Seth Rife</name>
+      <name>Fred Bricon</name>
     </contributor>
     <contributor>
-      <name>Fred Bricon</name>
+      <name>Steve Moyer</name>
+    </contributor>
+    <contributor>
+      <name>Seth Rife</name>
     </contributor>
   </contributors>
 

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java?rev=1542107&r1=1542106&r2=1542107&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java Thu Nov 14 22:16:36 2013
@@ -74,7 +74,15 @@ public final class EarModuleFactory
         throws UnknownArtifactTypeException
     {
         // Get the standard artifact type based on default config and user-defined mapping(s)
-        final String artifactType = typeMappingService.getStandardType( artifact.getType() );
+        final String artifactType;
+        try
+        {
+            artifactType = typeMappingService.getStandardType( artifact.getType() );
+        }
+        catch ( UnknownArtifactTypeException e )
+        {
+            throw new UnknownArtifactTypeException( e.getMessage() + " for " + artifact.getArtifactId() );
+        }
 
         if ( "jar".equals( artifactType ) )
         {