From 46b15dcc696b3a6ca1559d6191247275f4118b36 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 25 Dec 2003 20:47:58 +0000
Subject: [PATCH] - Add dependent jars (not sure they are required) - Added
 merge xml file for the plugin test project - There are no more errors when
 running plugin:test but I am still unsure it works... :-)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114505 13f79535-47bb-0310-9956-ffa450edef68
---
 aspectwerkz/plugin.jelly                       | 12 +++++-------
 aspectwerkz/plugin.properties                  |  5 +++--
 aspectwerkz/project.xml                        | 10 ++++++++++
 aspectwerkz/src/plugin-test/project.properties |  1 +
 aspectwerkz/xdocs/properties.xml               | 10 ++++++++++
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/aspectwerkz/plugin.jelly b/aspectwerkz/plugin.jelly
index 13497a5f..30462f07 100644
--- a/aspectwerkz/plugin.jelly
+++ b/aspectwerkz/plugin.jelly
@@ -24,7 +24,7 @@
         classname="org.codehaus.aspectwerkz.metadata.AttributeC">
 
       <ant:arg file="${maven.aspectwerkz.src.dir}"/>
-      <ant:arg file="${maven.aspectwerkz.definition.file}"/>
+      <ant:arg file="${maven.aspectwerkz.build.definition.file}"/>
       <j:if test="${context.getVariable('maven.aspectwerkz.definition.merge.file') != null}">
         <ant:arg line="-m ${maven.aspectwerkz.definition.merge.file}"/>
       </j:if>
@@ -39,16 +39,14 @@
         <ant:pathelement location="${plugin.getDependencyPath('trove:trove')}"/>
         <ant:pathelement location="${plugin.getDependencyPath('dom4j:dom4j')}"/>
         <ant:pathelement location="${plugin.getDependencyPath('jrexx:jrexx')}"/>
+
+        <!-- vmassol: I am not sure whether these 2 jars are required or not -->
+        <ant:pathelement location="${plugin.getDependencyPath('piccolo:piccolo')}"/>
+        <ant:pathelement location="${plugin.getDependencyPath('commons-jexl:commons-jexl')}"/>
       </ant:classpath>
 
     </ant:java>
 
-    <!--            
-      Note VMA: I'm not yet sure whether these 2 jars are needed or not:
-      ${lib.dir}/piccolo-1.03.jar
-      ${lib.dir}/commons-jexl-1.0-beta-2.jar
-    -->      
-
   </goal>
   
 </project>
diff --git a/aspectwerkz/plugin.properties b/aspectwerkz/plugin.properties
index 54338579..f359e2a1 100644
--- a/aspectwerkz/plugin.properties
+++ b/aspectwerkz/plugin.properties
@@ -1,8 +1,9 @@
 # Location of AW sources
 maven.aspectwerkz.src.dir = ${basedir}/src/main
 
-# Location of AW XML definition file
-maven.aspectwerkz.definition.file = ${basedir}/conf/aspectwerkz.xml
+# Location of the AW XML definition file that will be created by the
+# attribute compilation (when calling <aspectwerkz:attributeC>).
+maven.aspectwerkz.build.definition.file = ${maven.build.dir}/aspectwerkz.xml
 
 # (optional). Definition file to be merged with the main definition file. 
 # Used by the <aspectwerkz:attributeC> goal.
diff --git a/aspectwerkz/project.xml b/aspectwerkz/project.xml
index 60296d87..f85004fd 100644
--- a/aspectwerkz/project.xml
+++ b/aspectwerkz/project.xml
@@ -66,6 +66,16 @@
       <artifactId>jrexx</artifactId>
       <version>1.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>piccolo</groupId>
+      <artifactId>piccolo</artifactId>
+      <version>1.0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-jexl</groupId>
+      <artifactId>commons-jexl</artifactId>
+      <version>1.0-beta-2</version>
+    </dependency>
   </dependencies>
   <reports>
     <report>maven-changes-plugin</report>
diff --git a/aspectwerkz/src/plugin-test/project.properties b/aspectwerkz/src/plugin-test/project.properties
index 095bc845..4f759730 100644
--- a/aspectwerkz/src/plugin-test/project.properties
+++ b/aspectwerkz/src/plugin-test/project.properties
@@ -3,3 +3,4 @@
 # -------------------------------------------------------------------
 
 maven.aspectwerkz.uuid = test
+maven.aspectwerkz.definition.merge.file = ${basedir}/conf/aspectwerkz.xml
diff --git a/aspectwerkz/xdocs/properties.xml b/aspectwerkz/xdocs/properties.xml
index 773923ac..77ef6e04 100644
--- a/aspectwerkz/xdocs/properties.xml
+++ b/aspectwerkz/xdocs/properties.xml
@@ -21,6 +21,16 @@
             <code>${basedir}/src/aspectwerkz</code>.
           </td>
         </tr>
+        <tr>
+          <td>maven.aspectwerkz.build.definition.file</td>
+          <td>Yes</td>
+          <td>
+            Location of the AW XML definition file that will be created by the
+            attribute compilation (when calling the 
+            <code>aspectwerkz:attributeC</code> goal). Defaults to
+            <code>${maven.build.dir}/aspectwerkz.xml</code>.
+          </td>
+        </tr>
         <tr>
           <td>maven.aspectwerkz.definition.merge.file</td>
           <td>Yes</td>