CVS: jcontainer/loom/plugins/maven-sar plugin.jelly,1.10,1.11 plugin.properties,1.4,1.5 project.xml,1.7,1.8

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

Modified Files:
	plugin.jelly plugin.properties project.xml 
Log Message:
Upgrade to DNA rc2 and MetaClass rc2


Index: plugin.jelly
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- plugin.jelly	24 Nov 2003 09:06:44 -0000	1.10
+++ plugin.jelly	29 Nov 2003 07:25:01 -0000	1.11
@@ -7,7 +7,6 @@
     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')}"/>
     <j:set var="logging" value="${context.getVariable('maven.sar.logging')}"/>
 
     <!--==================================================================-->
@@ -16,36 +15,34 @@
     <goal name="sar" prereqs="sar:sar" description="Build a sar file"/>
 
     <!--==================================================================-->
-    <!-- Metagenerate descriptor files - only if maven.sar.metagenerate=true   -->
+    <!-- Setup Descriptor Tools                                           -->
     <!--==================================================================-->
-    <goal name="sar:metagenerate" 
-        description="Metagenerate descriptor files">
-        <j:if test="${metagenerate == 'true'}">
-            <ant:echo message="Generating Component Descriptors"/>
-            <!-- Define taskdef -->
-            <ant:taskdef name="metagenerate"
-                classname="org.jcontainer.loom.info.GenerateLoomDescriptorsTask">
+    <goal name="sar:init"
+        prereqs="dna:init"
+        description="Setup Loom Descriptor Processing Tasks">
+
+        <ant:mc_interceptorSet id="maven.loom.interceptors">
+            <ant:interceptor
+                name="org.jcontainer.loom.info.PhoenixAttributeInterceptor">
                 <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>
-            <!-- Ensure maven.build.dest exists -->
-            <ant:mkdir dir="${maven.build.dest}"/>
-            <metagenerate destDir="${maven.build.dest}">
-                <ant:fileset dir="${maven.sar.metagenerate.src}">
-                    <ant:include name="${maven.sar.metagenerate.include}"/>
-                    <ant:exclude name="${maven.sar.metagenerate.exclude}"/>
-                </ant:fileset>
-            </metagenerate>
-        </j:if>
+            </ant:interceptor>
+        </ant:mc_interceptorSet>
+
+        <ant:mc_addToInterceptorSet
+            dest="maven.metaclass.interceptors"
+            source="maven.loom.interceptors"/>
     </goal>
 
-    <postGoal name="java:compile">
-        <attainGoal name="sar:metagenerate"/>
-    </postGoal>
+    <!--==================================================================-->
+    <!-- Metagenerate descriptor files                                    -->
+    <!--==================================================================-->
+    <goal name="sar:metagenerate"
+        prereqs="sar:init"
+        description="Generate Loom Descriptor Files">
+        <attainGoal name="metaclass:generate"/>
+    </goal>
 
     <!--==================================================================-->
     <!-- Builds a sar file                                                -->

Index: plugin.properties
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plugin.properties	4 Nov 2003 10:25:35 -0000	1.4
+++ plugin.properties	29 Nov 2003 07:25:01 -0000	1.5
@@ -3,26 +3,19 @@
 # -------------------------------------------------------------------
 # Loom Sar plugin
 # -------------------------------------------------------------------
-# Location of where the sar source is located in the source tree. 
+# Location of where the sar source is located in the source tree.
 maven.sar.src=${maven.src.dir}
 # Location of configuration files
 maven.sar.assembly=${maven.sar.src}/conf/assembly.xml
 maven.sar.config=${maven.sar.src}/conf/config.xml
 maven.sar.environment=${maven.sar.src}/conf/environment.xml
-# The optional logging file allows the specification of logging 
+# The optional logging file allows the specification of logging
 # outside of environment file. The recognised valid logging file names are:
-# log4j.properties, log4j.xml, logging.properties, excalibur-logger.xml 
-# The environment logging takes precedence over the logging file.  
+# log4j.properties, log4j.xml, logging.properties, excalibur-logger.xml
+# The environment logging takes precedence over the logging file.
 maven.sar.logging=
-# Location where the sar will be created. 
+# Location where the sar will be created.
 maven.sar.build.dir=${maven.build.dir}
-# Flag to metagenerate descriptors
-maven.sar.metagenerate=false
-# Location of metagenerate source
-maven.sar.metagenerate.src=${pom.build.sourceDirectory}
-# Files to include/exclude in metagenerate
-maven.sar.metagenerate.include=**/*.java
-maven.sar.metagenerate.exclude=
 # Build artifacts to include/exclude in sar SAR-INF/lib
 # These are are not specified in the dependency element
 # and are found in ${maven.sar.build.dir}

Index: project.xml
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- project.xml	29 Nov 2003 00:57:23 -0000	1.7
+++ project.xml	29 Nov 2003 07:25:01 -0000	1.8
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>dna</groupId>
             <artifactId>dna-tools</artifactId>
-            <version>1.1-rc1</version>
+            <version>1.1-rc2</version>
         </dependency>
         <dependency>
             <id>qdox</id>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>spice</groupId>
             <artifactId>spice-metaclass</artifactId>
-            <version>20031129.004415</version>
+            <version>1.0-rc2</version>
         </dependency>
 	</dependencies>