brett 2003/08/31 00:41:00
Modified: src/plugins-build/jxr plugin.jelly
Log:
roll back in these changes
Revision Changes Path
1.17 +2 -16 maven/src/plugins-build/jxr/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jxr/plugin.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plugin.jelly 22 Aug 2003 22:56:57 -0000 1.16
+++ plugin.jelly 31 Aug 2003 07:41:00 -0000 1.17
@@ -72,16 +72,8 @@
<ant:copy file="${maven.jxr.stylesheet}"
tofile="${maven.jxr.destdir}/stylesheet.css"/>
- <!-- XXX This is a dirty hack until the semantics of
pom.build.sourceDirectory are cleared up -->
- <j:set var="sourceDir" value="${pom.build.sourceDirectory}"/>
- <util:file var="sourceDirFile" name="${sourceDir}"/>
-
- <j:if test="${!sourceDirFile.isAbsolute()}">
- <j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
- </j:if>
-
<jxr:jxr
- sourceDir="${sourceDir}"
+ sourceDir="${pom.build.sourceDirectory}"
destDir="${maven.jxr.destdir}"
templateDir="${maven.jxr.templateDir}"
javadocDir="${javadocDestdir}"
@@ -92,18 +84,12 @@
<j:if test="${unitTestSourcesPresent == 'true'}">
<ant:mkdir dir="${maven.jxr.destdir.test}"/>
- <j:set var="testSourceDir" value="${pom.build.unitTestSourceDirectory}"/>
- <util:file var="testSourceDirFile" name="${testSourceDir}"/>
- <j:if test="${!testSourceDirFile.isAbsolute()}">
- <j:set var="testSourceDir" value="${basedir}/${testSourceDir}"/>
- </j:if>
-
<ant:copy file="${maven.jxr.stylesheet}"
tofile="${maven.jxr.destdir.test}/stylesheet.css"/>
<jxr:jxr
- sourceDir="${testSourceDir}"
+ sourceDir="${pom.build.unitTestSourceDirectory}"
destDir="${maven.jxr.destdir.test}"
templateDir="${maven.jxr.templateDir}"
javadocDir="${null}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
