svn commit: r760158 - in /maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source: SourceJarMojo.java TestSourceJarMojo.java

[pgier]

Author: pgier
Date: Mon Mar 30 20:34:16 2009
New Revision: 760158

URL: http://svn.apache.org/viewvc?rev=760158&view=rev
Log:
Refactor to remove duplicate code.

Modified:
    
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java
    
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java

Modified: 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java?rev=760158&r1=760157&r2=760158&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java
 Mon Mar 30 20:34:16 2009
@@ -19,11 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.project.MavenProject;
-
-import java.util.Collections;
-import java.util.List;
-
 /**
  * This plugin bundles all the sources into a jar archive.
  *
@@ -35,28 +30,7 @@
  * @since 2.0.3
  */
 public class SourceJarMojo
-    extends AbstractSourceJarMojo
+    extends SourceJarNoForkMojo
 {
-    /** {...@inheritdoc} */
-    protected List getSources( MavenProject p )
-    {
-        return p.getCompileSourceRoots();
-    }
-
-    /** {...@inheritdoc} */
-    protected List getResources( MavenProject p )
-    {
-        if ( excludeResources )
-        {
-            return Collections.EMPTY_LIST;
-        }
-
-        return p.getResources();
-    }
 
-    /** {...@inheritdoc} */
-    protected String getClassifier()
-    {
-        return "sources";
-    }
 }

Modified: 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java?rev=760158&r1=760157&r2=760158&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java
 Mon Mar 30 20:34:16 2009
@@ -19,11 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.project.MavenProject;
-
-import java.util.Collections;
-import java.util.List;
-
 /**
  * This plugin bundles all the test sources into a jar archive.
  *
@@ -33,28 +28,7 @@
  * @since 2.0.3
  */
 public class TestSourceJarMojo
-    extends AbstractSourceJarMojo
+    extends TestSourceJarNoForkMojo
 {
-    /** {...@inheritdoc} */
-    protected List getSources( MavenProject p )
-    {
-        return p.getTestCompileSourceRoots();
-    }
-
-    /** {...@inheritdoc} */
-    protected List getResources( MavenProject p )
-    {
-        if ( excludeResources )
-        {
-            return Collections.EMPTY_LIST;
-        }
-
-        return p.getTestResources();
-    }
 
-    /** {...@inheritdoc} */
-    protected String getClassifier()
-    {
-        return "test-sources";
-    }
 }