CVS: jcontainer/loom/plugins/maven-sar plugin.jelly,1.5,1.6

Peter Donald <pdonald-yCVjj/[email protected]> Sun, 2 Nov 2003 23:15:18 -0600
Newsgroups gmane.comp.java.jcontainer.cvs
Message-ID <[email protected]>
Update of /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar
In directory hogshead.codehaus.org:/tmp/cvs-serv19843/plugins/maven-sar

Modified Files:
	plugin.jelly 
Log Message:
Rework plugin so that metageneration occurs as postGoal on java:compile


Index: plugin.jelly
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- plugin.jelly	1 Nov 2003 13:15:31 -0000	1.5
+++ plugin.jelly	3 Nov 2003 05:15:16 -0000	1.6
@@ -36,13 +36,13 @@
             <ant:taskdef name="metagenerate"
                 classname="org.jcontainer.loom.info.GenerateLoomDescriptorsTask">
                 <ant:classpath>
-	                <ant:pathelement path="${plugin.dir}"/>
-	                <ant:pathelement path="${plugin.getDependencyPath('dna:dna-tools')}"/>
-	                <ant:pathelement path="${plugin.getDependencyPath('qdox')}"/>
-	                <ant:pathelement path="${plugin.getDependencyPath('spice:spice-metaclass')}"/>
+                    <ant:pathelement path="${plugin.dir}"/>
+                    <ant:pathelement path="${plugin.getDependencyPath('dna:dna-tools')}"/>
+                    <ant:pathelement path="${plugin.getDependencyPath('qdox')}"/>
+                    <ant:pathelement path="${plugin.getDependencyPath('spice:spice-metaclass')}"/>
                 </ant:classpath>
             </ant:taskdef>
-		</j:if>
+        </j:if>
 
     </goal>
 
@@ -64,14 +64,14 @@
         </j:if>
     </goal>
 
-    <postGoal name="sar:metagenerate">
-        <attainGoal name="jar:jar"/>
+    <postGoal name="java:compile">
+        <attainGoal name="sar:metagenerate"/>
     </postGoal>
 
     <!--==================================================================-->
     <!-- Builds a sar file                                                -->
     <!--==================================================================-->
-    <goal name="sar:sar" prereqs="sar:metagenerate" description="Build a sar file">
+    <goal name="sar:sar" prereqs="jar:jar" description="Build a sar file">
 
         <ant:echo message="Building sar ${maven.sar.final.name}"/>
         <ant:mkdir dir="${maven.sar.build.dir}"/>