summaryrefslogtreecommitdiff
path: root/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-17 16:33:28 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-17 16:33:28 +0100
commit0975240ce6b505db32a87233f31c8d1377b14c54 (patch)
treeedf3933a3bd151673c3ab1bb9338c4411bab89c2 /src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
parentbb9f382d1024e60f672b9c484031f40772a54a4b (diff)
downloadmaven-nar-plugin-0975240ce6b505db32a87233f31c8d1377b14c54.tar.gz
maven-nar-plugin-0975240ce6b505db32a87233f31c8d1377b14c54.tar.bz2
maven-nar-plugin-0975240ce6b505db32a87233f31c8d1377b14c54.tar.xz
maven-nar-plugin-0975240ce6b505db32a87233f31c8d1377b14c54.zip
Cleanup
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarLayout20.java')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarLayout20.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
index d72e640..f011453 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
@@ -3,6 +3,7 @@ package org.apache.maven.plugin.nar;
import java.io.File;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
@@ -55,16 +56,15 @@ public class NarLayout20
* (non-Javadoc)
* @see org.apache.maven.plugin.nar.NarLayout#getLibDir(java.io.File, org.apache.maven.plugin.nar.AOL, String type)
*/
- public File getLibDirectory( File baseDir, String aol, String type )
+ public File getLibDirectory( File baseDir, String aol, String type ) throws MojoFailureException
{
if ( type.equals( Library.EXECUTABLE ) )
{
- System.err.println( "WARNING, Replace call to getLibDirectory with getBinDirectory" );
- Thread.dumpStack();
+ throw new MojoFailureException( "INTERNAL ERROR, Replace call to getLibDirectory with getBinDirectory" );
}
File dir = new File( baseDir, "lib" );
- dir = new File( dir, aol.toString() );
+ dir = new File( dir, aol );
dir = new File( dir, type );
return dir;
}
@@ -76,7 +76,7 @@ public class NarLayout20
public File getBinDirectory( File baseDir, String aol )
{
File dir = new File( baseDir, "bin" );
- dir = new File( dir, aol.toString() );
+ dir = new File( dir, aol );
return dir;
}