You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vm...@apache.org on 2003/12/25 21:47:58 UTC
cvs commit: maven-plugins/aspectwerkz/src/plugin-test project.properties
vmassol 2003/12/25 12:47:58
Modified: aspectwerkz plugin.jelly project.xml plugin.properties
aspectwerkz/xdocs properties.xml
aspectwerkz/src/plugin-test project.properties
Log:
- 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... :-)
Revision Changes Path
1.3 +5 -7 maven-plugins/aspectwerkz/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 25 Dec 2003 16:26:15 -0000 1.2
+++ plugin.jelly 25 Dec 2003 20:47:57 -0000 1.3
@@ -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,15 +39,13 @@
<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>
1.3 +10 -0 maven-plugins/aspectwerkz/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 25 Dec 2003 16:26:15 -0000 1.2
+++ project.xml 25 Dec 2003 20:47:57 -0000 1.3
@@ -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>
1.2 +3 -2 maven-plugins/aspectwerkz/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 24 Dec 2003 15:57:58 -0000 1.1
+++ plugin.properties 25 Dec 2003 20:47:57 -0000 1.2
@@ -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.
1.2 +10 -0 maven-plugins/aspectwerkz/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/xdocs/properties.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- properties.xml 24 Dec 2003 15:57:57 -0000 1.1
+++ properties.xml 25 Dec 2003 20:47:57 -0000 1.2
@@ -22,6 +22,16 @@
</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>
<td>
1.2 +1 -0 maven-plugins/aspectwerkz/src/plugin-test/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/src/plugin-test/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 24 Dec 2003 15:57:58 -0000 1.1
+++ project.properties 25 Dec 2003 20:47:58 -0000 1.2
@@ -3,3 +3,4 @@
# -------------------------------------------------------------------
maven.aspectwerkz.uuid = test
+maven.aspectwerkz.definition.merge.file = ${basedir}/conf/aspectwerkz.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org