vmassol 2004/01/04 07:24:14
Modified: aspectwerkz plugin.jelly
Log:
- Fixed removal of java/lang/Object
- Better naming of variables
Revision Changes Path
1.17 +9 -9 maven-plugins/aspectwerkz/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/plugin.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plugin.jelly 3 Jan 2004 13:29:40 -0000 1.16
+++ plugin.jelly 4 Jan 2004 15:24:13 -0000 1.17
@@ -197,19 +197,19 @@
<!-- Parse all known source directories -->
<j:forEach var="srcDir" items="${srcDirs}">
- <aw:aspectc src="${srcDir}" dest="${maven.build.dest}"/>
+ <aw:aspectc javaSrc="${srcDir}" classSrc="${maven.build.dest}"/>
</j:forEach>
<!-- Parse non-production aspects if source directory has been defined -->
<j:if test="${context.getVariable('maven.aspectwerkz.src.dir') != null}">
- <aw:aspectc src="${maven.aspectwerkz.src.dir}"
- dest="${maven.aspectwerkz.build.dest}"/>
+ <aw:aspectc javaSrc="${maven.aspectwerkz.src.dir}"
+ classSrc="${maven.aspectwerkz.build.dest}"/>
</j:if>
<!-- AspectC currently has a bug in that it creates a java.lang.Object class
file in the output directory. Until
this is fixed, we need to remove that files. Otherwise, AspectWerkc will
try to instrument it, which will
lead to an error... -->
- <ant:delete file="${maven.build.dest}/java/lang/Object.class"/>
+ <ant:delete
file="${maven.aspectwerkz.weave.build.dir}/java/lang/Object.class"/>
</j:if>
@@ -275,12 +275,12 @@
<define:taglib uri="aspectwerkz">
<!--
- @param src source directory that will be parsed
- @param dest path where compiled sources are located
+ @param javaSrc source directory that will be parsed
+ @param classSrc path where compiled sources are located
-->
<define:tag name="aspectc">
- <ant:echo>Parsing [${src}] using [${dest}] ...</ant:echo>
+ <ant:echo>Parsing [${javaSrc}] using [${classSrc}] ...</ant:echo>
<ant:java dir="${maven.build.dir}" failonerror="true" fork="true"
classname="org.codehaus.aspectwerkz.attribdef.definition.AspectC">
@@ -290,10 +290,10 @@
</j:if>
<!-- Path to source dir -->
- <ant:arg file="${src}"/>
+ <ant:arg file="${javaSrc}"/>
<!-- Path to classes dir -->
- <ant:arg file="${dest}"/>
+ <ant:arg file="${classSrc}"/>
<!-- (optional) Path to where weaved classes will be generated -->
<ant:arg file="${maven.aspectwerkz.weave.build.dir}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
