svn commit: r476533 - in /maven/plugins/trunk/maven-ear-plugin: ./ src/main/java/org/apache/maven/plugin/ear/EarMojo.java

[sn...@apache.org]

Author: snicoll
Date: Sat Nov 18 07:01:33 2006
New Revision: 476533

URL: http://svn.apache.org/viewvc?view=rev&rev=476533
Log:
MEAR-47: resourceDir is now optional since it's deprecated
Submitted by: Ian Springer
Reviewed by: Stéphane Nicoll

Modified:
    maven/plugins/trunk/maven-ear-plugin/   (props changed)
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java

Propchange: maven/plugins/trunk/maven-ear-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Nov 18 07:01:33 2006
@@ -7,3 +7,4 @@
 *.ipr
 *.iws
 *.iml
+*.ser

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?view=diff&rev=476533&r1=476532&r2=476533
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Sat Nov 18 07:01:33 2006
@@ -124,8 +124,6 @@
     /**
      * The directory to get the resources from.
      *
-     * @parameter expression="${project.build.outputDirectory}"
-     * @required
      * @deprecated
      */
     private File resourcesDir;
@@ -261,7 +259,7 @@
         // Copy resources files
         try
         {
-            if ( resourcesDir.exists() )
+            if ( resourcesDir != null && resourcesDir.exists() )
             {
                 getLog().info( "Copy ear resources to " + getWorkDirectory().getAbsolutePath() );
                 String[] fileNames = getEarFiles( resourcesDir );