jvanzyl 2002/07/10 18:43:57
Modified: src/plugins/java plugin.jelly
Log:
o Move the source and unit source check to the driver
o Placed an if around the construction of the maven.compile.src.set
because it will bomb if there are no sources. An attempt to get
the docs only turbine-site project working again.
Revision Changes Path
1.17 +5 -20 jakarta-turbine-maven/src/plugins/java/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/java/plugin.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plugin.jelly 9 Jul 2002 23:17:41 -0000 1.16
+++ plugin.jelly 11 Jul 2002 01:43:57 -0000 1.17
@@ -5,10 +5,6 @@
xmlns:maven="jelly:maven"
xmlns:m="maven">
- <path id="maven.compile.src.set">
- <pathelement location="${pom.build.SourceDirectory}"/>
- </path>
-
<j:choose>
<j:when test="${!pom.build.resources.includes.isEmpty()}">
<property name="maven.has.jar.resource.patterns" value="true"/>
@@ -43,22 +39,11 @@
<fileset dir="${maven.home}/lib"/>
</path>
- <!-- The start of setting up some flags for the build:
-
- . sourceDirectory present
- . testSourceDirectory present
-
- -->
-
- <available
- property="sourcesPresent"
- file="${pom.build.sourceDirectory}"
- />
-
- <available
- property="unitTestSourcesPresent"
- file="${pom.build.unitTestSourceDirectory}"
- />
+ <j:if test="${sourcesPresent == 'true'}">
+ <path id="maven.compile.src.set">
+ <pathelement location="${pom.build.SourceDirectory}"/>
+ </path>
+ </j:if>
<!-- ================================================================== -->
<!-- prepare-filesystem -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
