carlos 2004/06/30 13:45:19
Modified: aspectj/xdocs changes.xml
aspectj plugin.jelly
Log:
Check that unitTestSourceDirectory is defined in pom
Revision Changes Path
1.21 +1 -0 maven-plugins/aspectj/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/aspectj/xdocs/changes.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- changes.xml 30 Jun 2004 20:12:36 -0000 1.20
+++ changes.xml 30 Jun 2004 20:45:19 -0000 1.21
@@ -28,6 +28,7 @@
</properties>
<body>
<release version="3.1.1" date="in CVS">
+ <action dev="carlos" type="fix" issue="MPASPECTJ-11">Check that
unitTestSourceDirectory is defined in pom</action>
<action dev="carlos" type="add">Output messages to log</action>
<action dev="carlos" type="fix">Check that aspectSourceDirectory is defined
in pom</action>
</release>
1.17 +2 -2 maven-plugins/aspectj/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/aspectj/plugin.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plugin.jelly 30 Jun 2004 20:20:16 -0000 1.16
+++ plugin.jelly 30 Jun 2004 20:45:19 -0000 1.17
@@ -148,7 +148,7 @@
</j:when>
<!-- if aspectSourceDirectory is not defined in pom -->
<j:otherwise>
- <log:info>Aspect source directory not specified</log:info>
+ <log:info>Aspect source directory not defined</log:info>
<j:set var="aspectSourcesPresent" value="false"/>
</j:otherwise>
</j:choose>
@@ -207,7 +207,7 @@
<goal name="aspectj:test-compile" prereqs="aspectj:compile"
description="Weave tests with AspectJ">
- <j:if test="${shouldWeave == 'true'}">
+ <j:if test="${(shouldWeave == 'true') and (pom.build.unitTestSourceDirectory !=
'')}">
<!-- By calling a goal from the test plugin we ensure that all its
properties are loaded and are thus accessible from this plugin -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
