You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/08/14 22:07:55 UTC
svn commit: r565893 - in
/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar:
AbstractJarMojo.java JarMojo.java TestJarMojo.java
Author: jdcasey
Date: Tue Aug 14 13:07:55 2007
New Revision: 565893
URL: http://svn.apache.org/viewvc?view=rev&rev=565893
Log:
[MJAR-75] Adding type handling for test-jar.
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java?view=diff&rev=565893&r1=565892&r2=565893
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java Tue Aug 14 13:07:55 2007
@@ -107,6 +107,11 @@
* Overload this to produce a test-jar, for example.
*/
protected abstract String getClassifier();
+
+ /**
+ * Overload this to produce a test-jar, for example.
+ */
+ protected abstract String getType();
protected static File getJarFile( File basedir, String finalName, String classifier )
{
@@ -172,11 +177,11 @@
throws MojoExecutionException
{
File jarFile = createArchive();
-
+
String classifier = getClassifier();
if ( classifier != null )
{
- projectHelper.attachArtifact( getProject(), "jar", classifier, jarFile );
+ projectHelper.attachArtifact( getProject(), getType(), classifier, jarFile );
}
else
{
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java?view=diff&rev=565893&r1=565892&r2=565893
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java Tue Aug 14 13:07:55 2007
@@ -49,6 +49,14 @@
{
return classifier;
}
+
+ /**
+ * @return type of the generated artifact
+ */
+ protected String getType()
+ {
+ return "jar";
+ }
/**
* Return the main classes directory, so it's used as the root of the jar.
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java?view=diff&rev=565893&r1=565892&r2=565893
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java Tue Aug 14 13:07:55 2007
@@ -44,6 +44,14 @@
}
/**
+ * @return type of the generated artifact
+ */
+ protected String getType()
+ {
+ return "test-jar";
+ }
+
+ /**
* Return the test-classes directory, to serve as the root of the tests jar.
*/
protected File getClassesDirectory()