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

Update of /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar
In directory hogshead.codehaus.org:/tmp/cvs-serv14587/loom/plugins/maven-sar

Modified Files:
	plugin.jelly 
Log Message:
Removed sar:init goal.  Variables are set globally and taskdefs are defined
in the appropriate goal.

Index: plugin.jelly
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- plugin.jelly	3 Nov 2003 05:15:16 -0000	1.6
+++ plugin.jelly	4 Nov 2003 10:27:34 -0000	1.7
@@ -6,33 +6,22 @@
     xmlns:license="license"
     xmlns:util="jelly:util">
 
+    <j:set var="maven.sar.final.name" value="${pom.artifactId}.sar"/>
+    <j:set var="metagenerate" value='${context.getVariable("maven.sar.metagenerate")}'/>
+
     <!--==================================================================-->
     <!-- Default goal : Builds a sar file                                 -->
     <!--==================================================================-->
     <goal name="sar" prereqs="sar:sar" description="Build a sar file"/>
 
     <!--==================================================================-->
-    <!-- Initializations                                                  -->
+    <!-- Metagenerate descriptor files - only if maven.sar.metagenerate=true   -->
     <!--==================================================================-->
-    <goal name="sar:init"
-        description="Initialize the file system and define tasks">
-
-        <ant:property name="maven.sar.final.name"
-            value="${pom.artifactId}.sar"/>
-
-        <ant:echo message="Defining sar task"/>
-        <ant:taskdef name="sar"
-            classname="org.jcontainer.loom.tools.ant.SarTask">
-            <ant:classpath>
-                <ant:pathelement path="${plugin.dir}"/>
-                <ant:pathelement path="${plugin.getDependencyPath('ant')}"/>
-            </ant:classpath>
-        </ant:taskdef>
-
-        <j:set var="metagenerate" value='${context.getVariable("maven.sar.metagenerate")}'/>
-        <ant:echo message="Set metagenerate property to ${metagenerate}"/>
+    <goal name="sar:metagenerate" 
+        description="Metagenerate descriptor files">
         <j:if test="${metagenerate == 'true'}">
-            <ant:echo message="Defining metagenerate task"/>
+            <ant:echo message="Generating Component Descriptors"/>
+            <!-- Define taskdef -->
             <ant:taskdef name="metagenerate"
                 classname="org.jcontainer.loom.info.GenerateLoomDescriptorsTask">
                 <ant:classpath>
@@ -42,17 +31,6 @@
                     <ant:pathelement path="${plugin.getDependencyPath('spice:spice-metaclass')}"/>
                 </ant:classpath>
             </ant:taskdef>
-        </j:if>
-
-    </goal>
-
-    <!--==================================================================-->
-    <!-- Metagenerate xinfo files - only if maven.sar.metagenerate=true   -->
-    <!--==================================================================-->
-    <goal name="sar:metagenerate" prereqs="sar:init"
-        description="Metagenerate xinfo files">
-        <j:if test="${metagenerate == 'true'}">
-            <ant:echo message="Generating Component Descriptors"/>
             <!-- Ensure maven.build.dest exists -->
             <ant:mkdir dir="${maven.build.dest}"/>
             <metagenerate destDir="${maven.build.dest}">
@@ -74,6 +52,15 @@
     <goal name="sar:sar" prereqs="jar:jar" description="Build a sar file">
 
         <ant:echo message="Building sar ${maven.sar.final.name}"/>
+        <!-- Define taskdef -->
+        <ant:taskdef name="sar"
+            classname="org.jcontainer.loom.tools.ant.SarTask">
+            <ant:classpath>
+                <ant:pathelement path="${plugin.dir}"/>
+                <ant:pathelement path="${plugin.getDependencyPath('ant')}"/>
+            </ant:classpath>
+        </ant:taskdef>
+        <!-- Ensure maven.sar.build.dir exists -->
         <ant:mkdir dir="${maven.sar.build.dir}"/>
         <sar sarfile="${maven.sar.build.dir}/${maven.sar.final.name}"
             assembly="${maven.sar.assembly}"