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

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

Modified Files:
	project.xml plugin.jelly 
Log Message:
Folded loom-info code in maven-sar plugin 

Index: project.xml
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- project.xml	28 Oct 2003 13:38:08 -0000	1.5
+++ project.xml	1 Nov 2003 13:15:31 -0000	1.6
@@ -10,8 +10,8 @@
 
   <versions>
       <version>
-          <id>1.1-dev</id>
-          <name>1.1-dev</name>
+          <id>${pom.currentVersion}</id>
+          <name>${pom.currentVersion}</name>
           <tag>HEAD</tag>
       </version>
       <version>
@@ -21,20 +21,34 @@
       </version>
   </versions>
 
-  <developers>
-    <developer>
-      <name>Mauro Talevi</name>
-      <id>mauro</id>
-      <email>mauro.talevi at aquilonia.org</email>
-    </developer>
-  </developers>
+	<developers>
+		<developer>
+      		<name>Mauro Talevi</name>
+      		<id>mauro</id>
+      		<email>mauro.talevi at aquilonia.org</email>
+    	</developer>
+	</developers>
 
-  <dependencies>
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.5.3-1</version>
-    </dependency>
-  </dependencies>
+	<dependencies>
+		<dependency>
+      		<groupId>ant</groupId>
+      		<artifactId>ant</artifactId>
+      		<version>1.5.1</version>
+    	</dependency>
+        <dependency>
+            <groupId>dna</groupId>
+            <artifactId>dna-tools</artifactId>
+            <version>20031016.083103</version>
+        </dependency>
+        <dependency>
+            <id>qdox</id>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>spice</groupId>
+            <artifactId>spice-metaclass</artifactId>
+            <version>20031016.074122</version>
+        </dependency>
+	</dependencies>
 
 </project>

Index: plugin.jelly
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plugin.jelly	28 Oct 2003 13:42:26 -0000	1.4
+++ plugin.jelly	1 Nov 2003 13:15:31 -0000	1.5
@@ -31,6 +31,18 @@
 
         <j:set var="metagenerate" value='${context.getVariable("maven.sar.metagenerate")}'/>
         <ant:echo message="Set metagenerate property to ${metagenerate}"/>
+        <j:if test="${metagenerate == 'true'}">
+            <ant:echo message="Defining metagenerate task"/>
+            <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:classpath>
+            </ant:taskdef>
+		</j:if>
 
     </goal>
 
@@ -40,14 +52,6 @@
     <goal name="sar:metagenerate" prereqs="sar:init"
         description="Metagenerate xinfo files">
         <j:if test="${metagenerate == 'true'}">
-            <ant:echo message="Defining metagenerate task"/>
-            <ant:taskdef name="metagenerate"
-                classname="org.jcontainer.loom.info.GenerateLoomDescriptorsTask">
-                <ant:classpath>
-                    <ant:path refid="maven.dependency.classpath"/>
-                    <ant:pathelement path="${maven.build.dest}"/>
-                </ant:classpath>
-            </ant:taskdef>
             <ant:echo message="Generating Component Descriptors"/>
             <!-- Ensure maven.build.dest exists -->
             <ant:mkdir dir="${maven.build.dest}"/>