Author: dennisl
Date: Fri Aug 9 10:39:31 2013
New Revision: 1512241
URL: http://svn.apache.org/r1512241
Log:
Copy MappingUtils (with unit test) and DashClassifierValueSource from Maven WAR
Plugin.
Modify to fit the new package structure.
Remove unneeded throwing of MojoExecutionException in the unit test.
Added:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
- copied, changed from r1512220,
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
- copied, changed from r1512220,
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
- copied, changed from r1512220,
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Copied:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
(from r1512220,
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java?p2=maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java&p1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java&r1=1512220&r2=1512241&rev=1512241&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
(original)
+++
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
Fri Aug 9 10:39:31 2013
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.shared.mapping;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
(from r1512220,
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java?p2=maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java&p1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java&r1=1512220&r2=1512241&rev=1512241&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
(original)
+++
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
Fri Aug 9 10:39:31 2013
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.shared.mapping;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
(from r1512220,
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java?p2=maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java&r1=1512220&r2=1512241&rev=1512241&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
(original)
+++
maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
Fri Aug 9 10:39:31 2013
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.shared.mapping;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,6 @@ import junit.framework.TestCase;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import org.codehaus.plexus.interpolation.InterpolationException;
@@ -37,7 +36,7 @@ public class MappingUtilsTest
{
public void testCompleteMapping()
- throws MojoExecutionException, InterpolationException
+ throws InterpolationException
{
TestArtifactStub jar = new TestArtifactStub();
jar.setGroupId( "org.apache.sample" );
@@ -49,7 +48,7 @@ public class MappingUtilsTest
}
public void testNoVersionMapping()
- throws MojoExecutionException, InterpolationException
+ throws InterpolationException
{
TestArtifactStub jar = new TestArtifactStub();
jar.setGroupId( "org.apache.sample" );
@@ -60,7 +59,7 @@ public class MappingUtilsTest
}
public void testMappingWithGroupId()
- throws MojoExecutionException, InterpolationException
+ throws InterpolationException
{
TestArtifactStub jar = new TestArtifactStub();
jar.setGroupId( "org.apache.sample" );
@@ -72,7 +71,7 @@ public class MappingUtilsTest
}
public void testMappingWithClassifier()
- throws MojoExecutionException, InterpolationException
+ throws InterpolationException
{
TestArtifactStub jar = new TestArtifactStub();
jar.setGroupId( "org.apache.sample" );
@@ -84,7 +83,7 @@ public class MappingUtilsTest
}
public void testMappingWithNullClassifier()
- throws MojoExecutionException, InterpolationException
+ throws InterpolationException
{
TestArtifactStub jar = new TestArtifactStub();
jar.setGroupId( "org.apache.sample" );
@@ -99,7 +98,7 @@ public class MappingUtilsTest
* Test for MWAR-212.
*/
public void testMappingWithOptionalClassifier()
- throws MojoExecutionException, InterpolationException
+ throws InterpolationException
{
final String MAPPING_WITH_OPTIONAL_CLASSIFIER_1 =
"@{artifactId}@-@{version}@@{dashClassifier}@.@{extension}@";
final String MAPPING_WITH_OPTIONAL_CLASSIFIER_2 =
"@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@";
@@ -151,7 +150,7 @@ public class MappingUtilsTest
@Override
public String getBaseVersion()
{
- return getVersion();
+ return getVersion();
}
@Override
