- 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). git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114524 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
vmassol committed
1 parent
6d98c94a0a
commit
ad84efa0f6
2 files changed
+31
-45
No files matched your search
+26
-36
@@ -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>
|
||||
@@ -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>
|
||||
@@ -85,6 +76,11 @@
|
||||
<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>
|
||||
<report>maven-changes-plugin</report>
|
||||
|
||||
Reference in new issue
Block a user