CVS: jcontainer/dna/tools/src/java plugin.jelly,1.1,1.2 plugin.properties,1.1,1.2

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

Modified Files:
	plugin.jelly plugin.properties 
Log Message:
Updated to use latest MetaClass and remove specialized dna metaclass generation task in favour of using generic task.


Index: plugin.jelly
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/src/java/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- plugin.jelly	13 Nov 2003 02:47:40 -0000	1.1
+++ plugin.jelly	27 Nov 2003 03:51:54 -0000	1.2
@@ -1,32 +1,29 @@
 <?xml version="1.0"?>
 
-<project xmlns:dna="dna"
-    xmlns:ant="jelly:ant">
+<project xmlns:ant="jelly:ant">
 
-    <goal name="dna:init" description="Initialize Plugin">
-        <ant:echo message="Generating DNA Component Descriptors"/>
-        <ant:taskdef name="dna:generate-descriptors"
-            classname="org.jcontainer.dna.tools.metaclass.GenerateDNADescriptorsTask">
-            <ant:classpath>
-                <ant:pathelement path="${plugin.dir}"/>
-                <ant:pathelement path="${plugin.getDependencyPath('qdox')}"/>
-                <ant:pathelement path="${plugin.getDependencyPath('spice:spice-metaclass')}"/>
-            </ant:classpath>
-        </ant:taskdef>
+    <goal name="dna:init"
+        prereqs="metaclass:init"
+        description="Initialize Plugin">
+
+        <ant:mc_interceptorSet id="maven.dna.interceptors">
+            <ant:interceptor
+                name="org.jcontainer.dna.tools.metaclass.DNAAttributeInterceptor">
+                <ant:classpath>
+                    <ant:pathelement path="${plugin.dir}"/>
+                </ant:classpath>
+            </ant:interceptor>
+        </ant:mc_interceptorSet>
+
+        <ant:mc_addToInterceptorSet
+            id="maven.metaclass.interceptors"
+            refid="maven.dna.interceptors"/>
     </goal>
 
     <goal name="dna:metagenerate"
         prereqs="dna:init"
         description="Generate DNA Descriptor files">
-        <!-- Ensure maven.build.dest exists -->
-        <ant:mkdir dir="${maven.build.dest}"/>
-
-        <dna:generate-descriptors destDir="${maven.build.dest}">
-            <ant:fileset dir="${maven.dna.descriptor.src}">
-                <ant:include name="${maven.dna.descriptor.include}"/>
-                <ant:exclude name="${maven.dna.descriptor.exclude}"/>
-            </ant:fileset>
-        </dna:generate-descriptors>
+        <attainGoal name="metaclass:generate"/>
     </goal>
 
 </project>

Index: plugin.properties
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/src/java/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- plugin.properties	13 Nov 2003 02:47:40 -0000	1.1
+++ plugin.properties	27 Nov 2003 03:51:54 -0000	1.2
@@ -1,9 +1 @@
-# -------------------------------------------------------------------
-# P L U G I N  P R O P E R T I E S
-# -------------------------------------------------------------------
-# DNA Plugin
-# -------------------------------------------------------------------
 
-maven.dna.descriptor.src=${pom.build.sourceDirectory}
-maven.dna.descriptor.include=**/*.java
-maven.dna.descriptor.exclude=