Move the mapping constants to the MappingUtils class.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1508434 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java b/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
index 1709f9b..6a4baa3 100644
--- a/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
@@ -65,11 +65,6 @@
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";
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java b/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
index efcc1bb..9228c95 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
@@ -25,7 +25,6 @@
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 @@
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 );
}
}
diff --git a/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java b/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
index 79667bd..7de9309 100644
--- a/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
+++ b/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
@@ -48,6 +48,9 @@
*/
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.
diff --git a/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java b/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
index 8e57432..5d9fd5d 100644
--- a/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
@@ -22,7 +22,6 @@
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 @@
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 ) );
}
/**
