Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/ejb/plugin.jelly,v
retrieving revision 1.12
diff -u -r1.12 plugin.jelly
--- plugin.jelly	20 Nov 2003 07:25:27 -0000	1.12
+++ plugin.jelly	28 Nov 2003 06:17:02 -0000
@@ -9,7 +9,7 @@
   <!--==================================================================-->
   <!-- Default goal : Builds a ejb file                                 -->
   <!--==================================================================-->
-  <goal name="ejb" prereqs="ejb:ejb" description="Build an ejb file"/>
+  <goal name="ejb" prereqs="ejb:ejb,ejb:client" description="Build an ejb file"/>
 
   <!--==================================================================-->
   <!-- Initializations                                                  -->
@@ -17,8 +17,10 @@
   <goal name="ejb:init" 
     description="Initialize filesystem and other resources for an ejb build">
 
-   <j:set var="maven.ejb.final.name" 
+    <j:set var="maven.ejb.final.name" 
       value="${maven.build.dir}/${maven.final.name}.jar"/>
+    <j:set var="maven.ejb.final.client.name" 
+      value="${maven.build.dir}/${pom.artifactId}-client-${pom.currentVersion}.jar"/> 
 
     <j:if test="${sourcesPresent == 'true'}">
       <attainGoal name="test:test"/>
@@ -115,7 +117,7 @@
   <!-- Builds an ejb client jar file                                    -->
   <!--==================================================================-->
   <goal name="ejb:ejb-client" prereqs="ejb:ejb" description="Build a client ejb file">
-    <ant:jar jarfile="${maven.build.dir}/${maven.final.name}-client.jar"
+    <ant:jar jarfile="${maven.ejb.final.client.name}"
              basedir="${maven.build.dest}"
              excludes="${maven.ejb.client.base.excludes},${maven.ejb.client.excludes}"
              index="${maven.ejb.client.index}"
@@ -127,21 +129,31 @@
   <!-- Install the ejb in the local repository                          -->
   <!--==================================================================-->    
   <goal name="ejb:install"
-        prereqs="ejb:ejb"
+        prereqs="ejb:ejb,ejb:ejb-client"
         description="Install the ejb in the local repository">
      
      <artifact:install
         artifact="${maven.ejb.final.name}"
         type="ejb"
         project="${pom}"/> 
-  
+
+     <j:set var="artifactId_original" 
+        value="${pom.artifactId}"/> 
+     <j:set var="artifactId_client" 
+        value="${pom.artifactId}-client"/> 
+     <j:expr value="${pom.setArtifactId(artifactId_client)}" /> 
+     <artifact:install
+        artifact="${maven.ejb.final.client.name}" 
+        type="jar" 
+        project="${pom}"/> 
+     <j:expr value="${pom.setArtifactId(artifactId_original)}" />
   </goal>
   
   <!--==================================================================-->
   <!-- Install the snapshot version of the ejb in the local repository  -->
   <!--==================================================================-->      
   <goal name="ejb:install-snapshot"
-        prereqs="ejb:ejb" 
+        prereqs="ejb:ejb,ejb:ejb-client"
         description="Install the snapshot version of the ejb in the local repository">
         
       <artifact:install-snapshot
@@ -149,13 +161,23 @@
         type="ejb"
         project="${pom}"/> 
         
+     <j:set var="artifactId_original" 
+        value="${pom.artifactId}"/> 
+     <j:set var="artifactId_client" 
+        value="${pom.artifactId}-client"/> 
+     <j:expr value="${pom.setArtifactId(artifactId_client)}" /> 
+     <artifact:install-snapshot
+        artifact="${maven.ejb.final.client.name}" 
+        type="jar" 
+        project="${pom}"/> 
+     <j:expr value="${pom.setArtifactId(artifactId_original)}" />
   </goal>
 
   <!--==================================================================-->
   <!-- Deploys the ejb to the remote repository                         -->
   <!--==================================================================-->      
   <goal name="ejb:deploy" 
-        prereqs="ejb:ejb" 
+        prereqs="ejb:ejb,ejb:ejb-client"
         description="Deploys the ejb to the remote repository">
 
      <artifact:deploy
@@ -163,13 +185,23 @@
         type="ejb"
         project="${pom}"/>   
         
+     <j:set var="artifactId_original" 
+        value="${pom.artifactId}"/> 
+     <j:set var="artifactId_client" 
+        value="${pom.artifactId}-client"/> 
+     <j:expr value="${pom.setArtifactId(artifactId_client)}" /> 
+     <artifact:deploy
+        artifact="${maven.ejb.final.client.name}" 
+        type="jar" 
+        project="${pom}"/> 
+     <j:expr value="${pom.setArtifactId(artifactId_original)}" />
   </goal>      
         
   <!--==================================================================-->
   <!-- Deploys the snapshot of the ejb to the remote repository         -->
   <!--==================================================================-->      
   <goal name="ejb:deploy-snapshot" 
-        prereqs="ejb:ejb"
+        prereqs="ejb:ejb,ejb:ejb-client"
         description="Deploys the snapshot version of the ejb to remote repository">  
 
      <artifact:deploy-snapshot
@@ -177,8 +209,15 @@
         type="ejb"
         project="${pom}"/>    
         
+     <j:set var="artifactId_original" 
+        value="${pom.artifactId}"/> 
+     <j:set var="artifactId_client" 
+        value="${pom.artifactId}-client"/> 
+     <j:expr value="${pom.setArtifactId(artifactId_client)}" />
+     <artifact:deploy-snapshot
+        artifact="${maven.ejb.final.client.name}" 
+        type="jar" 
+        project="${pom}"/> 
+     <j:expr value="${pom.setArtifactId(artifactId_original)}" />
   </goal>
-  
-  
-
 </project>
Index: project.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/ejb/project.xml,v
retrieving revision 1.18
diff -u -r1.18 project.xml
--- project.xml	26 Nov 2003 21:11:34 -0000	1.18
+++ project.xml	28 Nov 2003 06:17:02 -0000
@@ -42,6 +42,11 @@
       </roles>
     </developer>
   </developers>
+  <contributors>
+      <contributor>
+      <name>Archimedes Trajano</name>
+    </contributor>
+  </contributors>
   <dependencies/>
   <reports>
     <report>maven-changes-plugin</report>