summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Schumacher <volker@antenna500.local>2009-12-18 10:43:49 +0800
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2010-01-08 00:17:03 +0800
commit7eb1e97c0a34b10a2d6724e8907ed3183fc97bcb (patch)
treece8ebea2be80425e5204580ecfb9923ea905b560
parent947b4f87a88a2702fd15c69f274d9afcab426564 (diff)
downloadmaven-nar-plugin-7eb1e97c0a34b10a2d6724e8907ed3183fc97bcb.tar.gz
maven-nar-plugin-7eb1e97c0a34b10a2d6724e8907ed3183fc97bcb.tar.bz2
maven-nar-plugin-7eb1e97c0a34b10a2d6724e8907ed3183fc97bcb.tar.xz
maven-nar-plugin-7eb1e97c0a34b10a2d6724e8907ed3183fc97bcb.zip
Moved NarLayout properties up to AbstractNarMojo.
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java24
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java21
2 files changed, 21 insertions, 24 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
index c04660d..876f152 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
@@ -129,18 +129,6 @@ public abstract class AbstractCompileMojo
*/
private Java java;
- /**
- * Layout to be used for building and unpacking artifacts
- *
- * @parameter expression="${nar.layout}" default-value="org.apache.maven.plugin.nar.NarLayout21"
- * @required
- */
- private String layout;
-
-
-
- private NarLayout narLayout;
-
private NarInfo narInfo;
private List/* <String> */dependencyLibOrder;
@@ -285,16 +273,4 @@ public abstract class AbstractCompileMojo
}
return narInfo;
}
-
- // FIXME, needs to maybe move up
- protected final NarLayout getLayout()
- throws MojoExecutionException
- {
- if ( narLayout == null )
- {
- narLayout =
- AbstractNarLayout.getLayout( layout, getLog() );
- }
- return narLayout;
- }
}
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
index 0923600..99bebf6 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
@@ -107,6 +107,16 @@ public abstract class AbstractNarMojo
private File unpackDirectory;
/**
+ * Layout to be used for building and unpacking artifacts
+ *
+ * @parameter expression="${nar.layout}" default-value="org.apache.maven.plugin.nar.NarLayout21"
+ * @required
+ */
+ private String layout;
+
+ private NarLayout narLayout;
+
+ /**
* @parameter expression="${project}"
* @readonly
* @required
@@ -176,6 +186,17 @@ public abstract class AbstractNarMojo
return unpackDirectory;
}
+ protected final NarLayout getLayout()
+ throws MojoExecutionException
+ {
+ if ( narLayout == null )
+ {
+ narLayout =
+ AbstractNarLayout.getLayout( layout, getLog() );
+ }
+ return narLayout;
+ }
+
protected final MavenProject getMavenProject()
{
return mavenProject;