vmassol 2004/01/16 04:18:09
Modified: aspectwerkz plugin.jelly plugin.properties
aspectwerkz/xdocs properties.xml
aspectwerkz/src/plugin-test project.properties
Log:
- renamed property by prefixing it with "maven". It was previously wrongly named
- added default property values for non-production aspects
Revision Changes Path
1.19 +7 -3 maven-plugins/aspectwerkz/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/plugin.jelly,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 16 Jan 2004 11:49:23 -0000 1.18
+++ plugin.jelly 16 Jan 2004 12:18:09 -0000 1.19
@@ -59,6 +59,10 @@
<ant:pathelement location="${plugin.getDependencyPath('trove:trove')}"/>
</path>
+ <!-- Check if non-production aspects exist -->
+ <ant:available property="hasNonProductionAspects"
+ file="${maven.aspectwerkz.src.dir}" type="dir"/>
+
</goal>
<!--
@@ -70,7 +74,7 @@
description="Compile AspectWerkz java sources">
<!-- If there are non-production aspect sources, compile them -->
- <j:if test="${context.getVariable('maven.aspectwerkz.src.dir') != null}">
+ <j:if test="${hasNonProductionAspects}">
<ant:mkdir dir="${maven.aspectwerkz.build.dest}"/>
@@ -199,7 +203,7 @@
</j:forEach>
<!-- Parse non-production aspects if source directory has been defined -->
- <j:if test="${context.getVariable('maven.aspectwerkz.src.dir') != null}">
+ <j:if test="${hasNonProductionAspects}">
<aw:aspectc javaSrc="${maven.aspectwerkz.src.dir}"
classSrc="${maven.aspectwerkz.build.dest}"/>
</j:if>
@@ -247,7 +251,7 @@
</j:if>
<ant:sysproperty key="aspectwerkz.classloader.preprocessor"
- value="${aspectwerkz.classloader.preprocessor}"/>
+ value="${maven.aspectwerkz.classloader.preprocessor}"/>
<ant:sysproperty key="aspectwerkz.transform.filter"
value="${maven.aspectwerkz.transform.filter}"/>
1.9 +5 -5 maven-plugins/aspectwerkz/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/plugin.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.properties 16 Jan 2004 11:49:23 -0000 1.8
+++ plugin.properties 16 Jan 2004 12:18:09 -0000 1.9
@@ -22,17 +22,17 @@
maven.aspectwerkz.verbose = false
# Classloader to use for class files weaving
-aspectwerkz.classloader.preprocessor =
org.codehaus.aspectwerkz.transform.AspectWerkzPreProcessor
+maven.aspectwerkz.classloader.preprocessor =
org.codehaus.aspectwerkz.transform.AspectWerkzPreProcessor
-# (optional) The AW plugin looks for source files in ${pom.sourceDirectory}.
+# The AW plugin looks for source files in ${pom.sourceDirectory}.
# It also supports all source directories added to the ${maven.compile.src.set}
# Ant path variable. Moreover, if you wish to keep non-production aspects in a
# specific directory, you can define the property below.
-# maven.aspectwerkz.src.dir = ${basedir}/src/aspectwerkz
+maven.aspectwerkz.src.dir = ${basedir}/src/aspectwerkz
-# (optional) Location where non-production aspect classes will be compiled to.
+# Location where non-production aspect classes will be compiled to.
# There are the classes defined by ${maven.aspectwerkz.src.dir}.
-# maven.aspectwerkz.build.dest = ${maven.build.dir}/aspectwerkz/classes
+maven.aspectwerkz.build.dest = ${maven.build.dir}/aspectwerkz/classes
#----------------------------------------------------------------------------
# attribdef mode properties
1.8 +3 -3 maven-plugins/aspectwerkz/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/aspectwerkz/xdocs/properties.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- properties.xml 16 Jan 2004 11:49:23 -0000 1.7
+++ properties.xml 16 Jan 2004 12:18:09 -0000 1.8
@@ -90,7 +90,7 @@
directories added to the <code>${maven.compile.src.set}</code>
Ant path variable. Moreover, if you wish to keep non-production
aspects in a specific directory, you can define the
- <code>maven.aspectwerkz.src.dir</code> property. For example
+ <code>maven.aspectwerkz.src.dir</code> property. Defaults to
<code>maven.aspectwerkz.src.dir = ${basedir}/src/aspectwerkz</code>.
</td>
</tr>
@@ -100,12 +100,12 @@
<td>
Location where non-production aspect classes will be compiled to.
These are the classes defined by
- <code>${maven.aspectwerkz.src.dir}</code>. For example
+ <code>${maven.aspectwerkz.src.dir}</code>. Defaults to
<code>maven.aspectwerkz.build.dest =
${maven.build.dir}/aspectwerkz/classes</code>.
</td>
</tr>
<tr>
- <td>aspectwerkz.classloader.preprocessor</td>
+ <td>maven.aspectwerkz.classloader.preprocessor</td>
<td>Yes</td>
<td>
Classloader to use for class files weaving. Defaults to
1.9 +0 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.properties 16 Jan 2004 11:49:23 -0000 1.8
+++ project.properties 16 Jan 2004 12:18:09 -0000 1.9
@@ -3,6 +3,4 @@
# -------------------------------------------------------------------
maven.aspectwerkz.verbose = true
-maven.aspectwerkz.src.dir = ${basedir}/src/aspectwerkz
-maven.aspectwerkz.build.dest = ${maven.build.dir}/aspectwerkz/classes
maven.aspectwerkz.weave.build.dir = ${maven.build.dir}/aspectwerkz/weaved
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
