svn commit: r1508454 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java

[dennisl]

Author: dennisl
Date: Tue Jul 30 14:11:50 2013
New Revision: 1508454

URL: http://svn.apache.org/r1508454
Log:
Document the purpose of the classifier property, and move it to the correct 
place.
Test when classifier is null, but it is still used in the mapping.

Modified:
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
    
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java?rev=1508454&r1=1508453&r2=1508454&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
 Tue Jul 30 14:11:50 2013
@@ -47,7 +47,6 @@ public class DashClassifierValueSource
     private static Properties createDashClassifierProperties( String 
classifier )
     {
         Properties classifierMask = new Properties();
-        classifierMask.setProperty( "classifier", "" );
 
         if ( classifier != null )
         {
@@ -58,6 +57,8 @@ public class DashClassifierValueSource
         {
             classifierMask.setProperty( "dashClassifier?", "" );
             classifierMask.setProperty( "dashClassifier", "" );
+            // Make sure that the classifier property is usable, if it is null
+            classifierMask.setProperty( "classifier", "" );
         }
         return classifierMask;
     }

Modified: 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java?rev=1508454&r1=1508453&r2=1508454&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
 Tue Jul 30 14:11:50 2013
@@ -81,6 +81,18 @@ public class MappingUtilsTest
                       MappingUtils.evaluateFileNameMapping( 
MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
     }
 
+    public void testMappingWithNullClassifier()
+        throws MojoExecutionException, InterpolationException
+    {
+        TestArtifactStub jar = new TestArtifactStub();
+        jar.setGroupId( "org.apache.sample" );
+        jar.setArtifactId( "maven-test-lib" );
+        jar.setVersion( "1.0" );
+        jar.setClassifier( null );
+        assertEquals( "maven-test-lib-1.0-.jar",
+                      MappingUtils.evaluateFileNameMapping( 
MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
+    }
+
     /**
      * Test for MWAR-212.
      */