CVS: jcontainer/dna/tools maven.xml,1.3,1.4

Update of /cvsroot/jcontainer/jcontainer/dna/tools
In directory hogshead.codehaus.org:/tmp/cvs-serv13163/dna/tools

Modified Files:
	maven.xml 
Log Message:
Make sure plugin is installed and deployed correctly

Index: maven.xml
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- maven.xml	27 Nov 2003 03:51:53 -0000	1.3
+++ maven.xml	29 Nov 2003 02:40:42 -0000	1.4
@@ -8,16 +8,17 @@
     </goal>
 
     <goal name="build">
-        <attainGoal name="jar:install"/>
         <attainGoal name="install"/>
     </goal>
 
-    <goal name="deploy">
-        <attainGoal name="jar:deploy"/>
-        <attainGoal name="plugin:deploy"/>
+    <goal name="setupPlugin" prereqs="jar:jar">
+        <ant:property name="artifact"
+            value="${pom.artifactId}-plugin-${pom.currentVersion}.jar"/>
         <ant:copy file="${maven.build.dir}/${maven.final.name}.jar"
-            toFile="${maven.build.dir}/${maven.final.name}-plugin.jar"/>
-        <ant:property name="artifact" value="${maven.final.name}-plugin.jar"/>
+            toFile="${maven.build.dir}/${artifact}"/>
+    </goal>
+
+    <goal name="deploy" prereqs="jar:deploy,setupPlugin">
         <deploy:artifact
             artifact="${maven.build.dir}/${artifact}"
             type="plugins"
@@ -25,12 +26,9 @@
             siteCommand="cd @deployDirectory@; chmod g+w ${artifact}; chgrp ${maven.remote.group} ${artifact}"/>
     </goal>
 
-    <goal name="install">
-        <attainGoal name="plugin:install"/>
-        <ant:copy file="${maven.build.dir}/${maven.final.name}.jar"
+    <goal name="install" prereqs="jar:install,setupPlugin">
+        <ant:copy file="${maven.build.dir}/${artifact}"
             todir="${maven.repo.local}/${pom.groupId}/plugins"/>
-        <ant:delete dir="${maven.home}/plugins/${maven.final.name}.jar"/>
-        <ant:delete dir="${maven.home}/plugins/${maven.final.name}"/>
         <ant:delete>
             <ant:fileset dir="${maven.home}/plugins">
                 <ant:include name="${pom.artifactID}-*"/>