svn commit: r225758 - /maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/module/EarModuleFactory.java

[brett]

Author: brett
Date: Thu Jul 28 05:17:45 2005
New Revision: 225758

URL: http://svn.apache.org/viewcvs?rev=225758&view=rev
Log:
PR: MNG-651
include ejb-clients in an EAR

Modified:
    
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/module/EarModuleFactory.java

Modified: 
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/module/EarModuleFactory.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/module/EarModuleFactory.java?rev=225758&r1=225757&r2=225758&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/module/EarModuleFactory.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/module/EarModuleFactory.java
 Thu Jul 28 05:17:45 2005
@@ -36,7 +36,7 @@
      */
     public static final EarModule newEarModule( Artifact artifact )
     {
-        if ( "jar".equals( artifact.getType() ) )
+        if ( "jar".equals( artifact.getType() ) || "ejb-client".equals( 
artifact.getType() ) )
         {
             return new JavaModule( getUri( artifact ), artifact );
         }
@@ -67,7 +67,16 @@
      */
     private static String getUri( Artifact artifact )
     {
-        return artifact.getFile().getName();
+               // FIXME: this should be in ArtifactHandler
+        if ( "ejb-client".equals( artifact.getType() ) )
+        {
+            return artifact.getArtifactId() + "-" + artifact.getVersion() +
+                               "-client." + 
artifact.getArtifactHandler().getExtension();
+        }
+        else
+        {
+            return artifact.getFile().getName();
+        }
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]