svn commit: r392512 - /maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java

[br...@apache.org]

Author: brett
Date: Sat Apr  8 05:05:39 2006
New Revision: 392512

URL: http://svn.apache.org/viewcvs?rev=392512&view=rev
Log:
[MONE-1] fix base directory for file inclusion

Modified:
    maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java

Modified: maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java?rev=392512&r1=392511&r2=392512&view=diff
==============================================================================
--- maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java (original)
+++ maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java Sat Apr  8 05:05:39 2006
@@ -43,13 +43,22 @@
     private static final String[] DEFAULT_INCLUDES = new String[]{"**/**"};
 
     /**
+     * Base directory.
+     *
+     * @parameter expression="${basedir}"
+     * @required
+     * @readonly
+     */
+    private File basedir;
+
+    /**
      * Directory containing the generated JAR.
      *
      * @parameter expression="${project.build.directory}"
      * @required
      * @readonly
      */
-    private File basedir;
+    private File targetDirectory;
 
     /**
      * Name of the generated JAR.
@@ -95,7 +104,7 @@
     public File createArchive()
         throws MojoExecutionException
     {
-        File jarFile = new File( basedir, finalName + ".jar" );
+        File jarFile = new File( targetDirectory, finalName + ".jar" );
 
         MavenArchiver archiver = new MavenArchiver();
 
@@ -110,12 +119,12 @@
                 archiver.getArchiver().addDirectory( contentDirectory, DEFAULT_INCLUDES, DEFAULT_EXCLUDES );
             }
 
-            addFile( archiver, new File( "plugin.jelly" ) );
-            addFile( archiver, new File( "plugin.properties" ) );
-            addFile( archiver, new File( "project.properties" ) );
-            addFile( archiver, new File( "build.properties" ) );
-            addFile( archiver, new File( "project.xml" ) );
-            addDirectory( archiver, new File( "src/plugin-resources" ) );
+            addFile( archiver, new File( basedir, "plugin.jelly" ) );
+            addFile( archiver, new File( basedir, "plugin.properties" ) );
+            addFile( archiver, new File( basedir, "project.properties" ) );
+            addFile( archiver, new File( basedir, "build.properties" ) );
+            addFile( archiver, new File( basedir, "project.xml" ) );
+            addDirectory( archiver, new File( basedir, "src/plugin-resources" ) );
 
             archiver.createArchive( project, new MavenArchiveConfiguration() );