From 7a69f15c15f10e0bdc236b43289be490630de99b Mon Sep 17 00:00:00 2001
From: Kenney Westerhof <kenney@apache.org>
Date: Wed, 3 Aug 2005 11:29:36 +0000
Subject: [PATCH] o Resolved MNG-692, although I think a more general solution
 is required;

o Fixed another boolean-logic error in the ear plugin.
  Stephane: (x != a) || (x != b) is always true, unless a == b.. ;-)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227198 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/maven/plugin/ear/AbstractEarMojo.java    |  8 ++++----
 .../java/org/apache/maven/plugin/ear/EarMojo.java   | 13 ++++++++++++-
 .../java/org/apache/maven/plugin/ejb/EjbMojo.java   |  4 +++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java b/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
index ff3ccd046e..7a48350871 100644
--- a/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
+++ b/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
@@ -47,7 +47,7 @@ public abstract class AbstractEarMojo
      * @required
      * @readonly
      */
-    private MavenProject project;
+    protected MavenProject project;
 
     /**
      * The ear modules configuration.
@@ -106,9 +106,9 @@ public void execute()
 
             // Artifact is not yet registered and it has neither test, nor a
             // provided scope
-            if ( !isArtifactRegistered( artifact, earModules ) && (
-                !Artifact.SCOPE_TEST.equals( artifact.getScope() ) ||
-                    !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) ) )
+            if ( !isArtifactRegistered( artifact, earModules ) &&
+                 !Artifact.SCOPE_TEST.equals( artifact.getScope() ) &&
+                 !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() )
             {
                 EarModule module = EarModuleFactory.newEarModule( artifact );
                 earModules.add( module );
diff --git a/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java b/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
index 82f20cf41a..4125cea60b 100644
--- a/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
+++ b/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
@@ -119,6 +119,15 @@ public void execute()
                 EarModule module = (EarModule) iter.next();
                 getLog().info( "Copying artifact[" + module + "] to[" + module.getUri() + "]" );
                 File destinationFile = buildDestinationFile( getBuildDir(), module.getUri() );
+
+                File sourceFile = module.getArtifact().getFile();
+
+                if ( !sourceFile.isFile() )
+                {
+                    throw new MojoExecutionException( "Cannot copy a directory: " + sourceFile.getAbsolutePath() + 
+                        "; Did you package/install " + module.getArtifact().getId() + "?" );
+                }
+
                 FileUtils.copyFile( module.getArtifact().getFile(), destinationFile );
             }
         }
@@ -158,6 +167,8 @@ public void execute()
 
             archiver.getArchiver().addDirectory( getBuildDir() );
             archiver.createArchive( getProject(), archive );
+
+            project.getArtifact().setFile( earFile );
         }
         catch ( Exception e )
         {
@@ -169,4 +180,4 @@ private static File buildDestinationFile( File buildDir, String uri )
     {
         return new File( buildDir, uri );
     }
-}
\ No newline at end of file
+}
diff --git a/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java b/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
index eaf45106cc..4ed6100c62 100644
--- a/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
+++ b/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
@@ -112,6 +112,8 @@ public void execute()
             // create archive
             archiver.createArchive( project, archive );
 
+            project.getArtifact().setFile( jarFile );
+
             if ( new Boolean( generateClient ).booleanValue() )
             {
                 getLog().info( "Building ejb client " + jarName + "-client" );
@@ -145,4 +147,4 @@ public void execute()
         }
     }
 
-}
\ No newline at end of file
+}