Author: dennisl
Date: Tue Jul 30 13:33:50 2013
New Revision: 1508434
URL: http://svn.apache.org/r1508434
Log:
Move the mapping constants to the MappingUtils class.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.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/AbstractWarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1508434&r1=1508433&r2=1508434&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Tue Jul 30 13:33:50 2013
@@ -65,11 +65,6 @@ import org.codehaus.plexus.util.StringUt
public abstract class AbstractWarMojo
extends AbstractMojo
{
- public static final String DEFAULT_FILE_NAME_MAPPING =
"@{artifactId}@-@{baseVersion}@.@{extension}@";
-
- public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
- "@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@";
-
private static final String[] EMPTY_STRING_ARRAY = {};
private static final String META_INF = "META-INF";
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=1508434&r1=1508433&r2=1508434&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
Tue Jul 30 13:33:50 2013
@@ -25,7 +25,6 @@ import java.io.IOException;
import org.apache.commons.io.input.XmlStreamReader;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.AbstractWarMojo;
import org.apache.maven.plugin.war.util.MappingUtils;
import org.apache.maven.plugin.war.util.PathSet;
import org.apache.maven.plugin.war.util.WebappStructure;
@@ -437,12 +436,12 @@ public abstract class AbstractWarPackagi
String classifier = artifact.getClassifier();
if ( ( classifier != null ) && !( "".equals( classifier.trim() ) ) )
{
- return MappingUtils.evaluateFileNameMapping(
AbstractWarMojo.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER,
+ return MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER,
artifact );
}
else
{
- return MappingUtils.evaluateFileNameMapping(
AbstractWarMojo.DEFAULT_FILE_NAME_MAPPING, artifact );
+ return MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING, artifact );
}
}
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java?rev=1508434&r1=1508433&r2=1508434&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
Tue Jul 30 13:33:50 2013
@@ -48,6 +48,9 @@ import org.codehaus.plexus.interpolation
*/
public class MappingUtils
{
+ public static final String DEFAULT_FILE_NAME_MAPPING =
"@{artifactId}@-@{baseVersion}@.@{extension}@";
+ public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
+ "@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@";
/**
* Evaluates the specified expression for the given artifact.
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=1508434&r1=1508433&r2=1508434&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 13:33:50 2013
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.war.util
import junit.framework.TestCase;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.AbstractWarMojo;
import org.apache.maven.plugin.war.stub.AbstractArtifactStub;
import org.codehaus.plexus.interpolation.InterpolationException;
@@ -79,7 +78,7 @@ public class MappingUtilsTest
jar.setVersion( "1.0" );
jar.setClassifier( "classifier" );
assertEquals( "maven-test-lib-1.0-classifier.jar",
- MappingUtils.evaluateFileNameMapping(
AbstractWarMojo.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
+ MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
}
/**
