diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-12-01 12:08:03 +0100 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-12-01 12:08:03 +0100 |
commit | a18df54301d3c988c167506b832323fec973a936 (patch) | |
tree | e5ab728b2441ae5f2ac9bd0d3cead8f364c0f7cf /src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java | |
parent | b833ebdbbe47d3a4190612e95fd5e7fc250445bd (diff) | |
download | maven-nar-plugin-a18df54301d3c988c167506b832323fec973a936.tar.gz maven-nar-plugin-a18df54301d3c988c167506b832323fec973a936.tar.bz2 maven-nar-plugin-a18df54301d3c988c167506b832323fec973a936.tar.xz maven-nar-plugin-a18df54301d3c988c167506b832323fec973a936.zip |
Fixed NAR-55 and NAR-113
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java')
-rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java | 29 |
1 files changed, 19 insertions, 10 deletions
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 2c4b5a6..5c6bdc1 100644 --- a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java @@ -22,6 +22,7 @@ package org.apache.maven.plugin.nar; import java.io.File; import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; @@ -97,33 +98,45 @@ public abstract class AbstractNarMojo * @required */ private MavenProject mavenProject; + + private AOL aolId; + protected final void validate() throws MojoFailureException, MojoExecutionException { + linker = NarUtil.getLinker( linker ); + + architecture = NarUtil.getArchitecture( architecture ); + os = NarUtil.getOS( os ); + aolId = NarUtil.getAOL( architecture, os, linker, aol ); + + if ( targetDirectory == null ) + { + targetDirectory = new File( mavenProject.getBuild().getDirectory(), "nar" ); + } + } + protected final boolean shouldSkip() { return skip; } protected final String getArchitecture() - { - architecture = NarUtil.getArchitecture( architecture ); + { return architecture; } protected final String getOS() { - os = NarUtil.getOS( os ); return os; } protected final AOL getAOL() - throws MojoFailureException + throws MojoFailureException, MojoExecutionException { - return NarUtil.getAOL( architecture, os, linker, aol ); + return aolId; } protected final Linker getLinker() { - linker = NarUtil.getLinker( linker ); return linker; } @@ -139,10 +152,6 @@ public abstract class AbstractNarMojo protected final File getTargetDirectory() { - if ( targetDirectory == null ) - { - targetDirectory = new File( mavenProject.getBuild().getDirectory(), "nar" ); - } return targetDirectory; } |