vmassol 2003/12/30 12:32:58
Modified: aspectwerkz plugin.jelly project.xml
Log:
- I had not understood the purpose of AspectC which is not to generated final weaved
code but only to weave the custom javadoc tags onto the aspects themselves. We still
need to call AspectWerkzC afterwards for offline weaving onto the main source code.
- Next step is to add support for 2 source paths: one being the main runtime sources
and another being where non-production aspects are located (optional).
Revision Changes Path
1.10 +26 -36 maven-plugins/aspectwerkz/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 29 Dec 2003 11:37:33 -0000 1.9
+++ plugin.jelly 30 Dec 2003 20:32:58 -0000 1.10
@@ -98,17 +98,8 @@
<!--
========================================================================
- Weave aspects at build time (offline mode). Works for both "xmldef"
- and "attribdef" modes.
- ========================================================================
- -->
- <goal name="aspectwerkz:weave"
- prereqs="aspectwerkz:aspectc,aspectwerkz:aspectwerkc"
- description="Weave aspects (offline mode)"/>
-
- <!--
- ========================================================================
- Weave "attribdef" aspects at build time (offline mode).
+ Parse files for custom javadoc tags (attribef mode only) and weave
+ them in the bytecode of the aspects themselves.
========================================================================
-->
<goal name="aspectwerkz:aspectc" prereqs="aspectwerkz:init,java:compile">
@@ -151,43 +142,42 @@
<!--
========================================================================
- Weave "xmldef" aspects at build time (offline mode).
+ Weave aspects at build time (offline mode). Works for both "xmldef"
+ and "attribdef" modes.
========================================================================
-->
- <goal name="aspectwerkz:aspectwerkc"
- prereqs="aspectwerkz:init,aspectwerkz:attributec,java:compile">
-
- <j:if test="${context.getVariable('maven.aspectwerkz.mode') == 'xmldef'}">
+ <goal name="aspectwerkz:weave"
+
prereqs="aspectwerkz:init,aspectwerkz:attributec,aspectwerkz:aspectc,java:compile">
<!-- TODO: Add support for extension classes -->
- <ant:java dir="${maven.build.dir}" failonerror="true" fork="true"
- classname="org.codehaus.aspectwerkz.compiler.AspectWerkzC">
+ <ant:java dir="${maven.build.dir}" failonerror="true" fork="true"
+ classname="org.codehaus.aspectwerkz.compiler.AspectWerkzC">
- <j:if test="${context.getVariable('maven.aspectwerkz.verbose') == 'true'}">
- <ant:sysproperty key="aspectwerkz.transform.verbose" value="true"/>
- </j:if>
+ <j:if test="${context.getVariable('maven.aspectwerkz.verbose') == 'true'}">
+ <ant:sysproperty key="aspectwerkz.transform.verbose" value="true"/>
+ </j:if>
- <ant:sysproperty key="aspectwerkz.transform.filter"
- value="${maven.aspectwerkz.transform.filter}"/>
- <ant:sysproperty key="aspectwerkz.definition.file"
- value="${maven.aspectwerkz.definition.file}"/>
+ <ant:sysproperty key="aspectwerkz.transform.filter"
+ value="${maven.aspectwerkz.transform.filter}"/>
+ <ant:sysproperty key="aspectwerkz.definition.file"
+ value="${maven.aspectwerkz.definition.file}"/>
- <ant:arg value="-verify"/>
+ <ant:arg value="-verify"/>
- <ant:arg file="${maven.aspectwerkz.build.dir}"/>
+ <ant:arg file="${maven.aspectwerkz.build.dir}"/>
- <ant:classpath>
- <ant:path refid="classpath.main"/>
- <ant:pathelement location="${plugin.getDependencyPath('ant:ant')}"/>
- <ant:pathelement
location="${plugin.getDependencyPath('aspectwerkz:aspectwerkz-core')}"/>
- <ant:pathelement location="${plugin.getDependencyPath('bcel:bcel')}"/>
- </ant:classpath>
+ <ant:classpath>
+ <ant:path refid="classpath.main"/>
+ <ant:pathelement location="${plugin.getDependencyPath('ant:ant')}"/>
+ <ant:pathelement
location="${plugin.getDependencyPath('aspectwerkz:aspectwerkz-core')}"/>
+ <ant:pathelement location="${plugin.getDependencyPath('bcel:bcel')}"/>
+ <ant:pathelement location="${plugin.getDependencyPath('jrexx:jrexx')}"/>
+ <ant:pathelement
location="${plugin.getDependencyPath('commons-jexl:commons-jexl')}"/>
+ </ant:classpath>
- </ant:java>
+ </ant:java>
- </j:if>
-
</goal>
</project>
1.8 +5 -9 maven-plugins/aspectwerkz/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 29 Dec 2003 11:36:50 -0000 1.7
+++ project.xml 30 Dec 2003 20:32:58 -0000 1.8
@@ -46,9 +46,6 @@
<artifactId>aspectwerkz</artifactId>
<version>0.9.RC1</version>
</dependency>
-
- <!-- Required for Attribute compilation -->
-
<dependency>
<groupId>qdox</groupId>
<artifactId>qdox</artifactId>
@@ -59,9 +56,6 @@
<artifactId>jrexx</artifactId>
<version>1.1.1</version>
</dependency>
-
- <!-- Required for AspectWerkz offline compilation -->
-
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
@@ -72,9 +66,6 @@
<artifactId>bcel</artifactId>
<version>5.1</version>
</dependency>
-
- <!-- Required both for Attribute and AspectWerkz compilations -->
-
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
@@ -84,6 +75,11 @@
<groupId>trove</groupId>
<artifactId>trove</artifactId>
<version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>1.0-beta-2</version>
</dependency>
</dependencies>
<reports>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
