vmassol 2003/06/12 05:28:48
Modified: src/plugins-build/cactus plugin.jelly
src/plugins-build/cactus/xdocs changes.xml
Added:
src/plugins-build/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample
test.xml
Log:
The cactus:compile goal now correctly copy the non java files to the target class
directory. Thanks to Florin Vancea for reporting this bug. This fixes bug
http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-478
Revision Changes Path
1.21 +10 -0 maven/src/plugins-build/cactus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.jelly,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plugin.jelly 7 Jun 2003 15:54:38 -0000 1.20
+++ plugin.jelly 12 Jun 2003 12:28:48 -0000 1.21
@@ -72,6 +72,7 @@
<j:choose>
<j:when test="${cactusSourcePresent == 'true'}">
+
<ant:javac destdir="${cactus.target.classes.dir}"
excludes="**/package.html"
debug="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.debug')}"
@@ -111,6 +112,15 @@
<ant:setProperty name="verbose"
value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.verbose')}"/>
</j:if>
</ant:javac>
+
+ <!-- Copy non java source files -->
+ <ant:copy todir="${cactus.target.classes.dir}">
+ <ant:fileset dir="${cactus.src.dir}">
+ <ant:exclude name="**/*.java"/>
+ <ant:exclude name="**/*.html"/>
+ </ant:fileset>
+ </ant:copy>
+
</j:when>
<j:otherwise>
<ant:echo>No Cactus source files to compile.</ant:echo>
1.9 +6 -0 maven/src/plugins-build/cactus/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/changes.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- changes.xml 23 May 2003 21:05:56 -0000 1.8
+++ changes.xml 12 Jun 2003 12:28:48 -0000 1.9
@@ -8,6 +8,12 @@
<body>
<release version="3.0" date="in CVS">
+ <action dev="vmassol" type="fix">
+ The <code>cactus:compile</code> goal now correctly copy the non
+ java files to the target class directory. Thanks to Florin Vancea for
+ reporting this bug. This fixes bug
+ <a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-478";>MAVEN-478</a>.
+ </action>
<action dev="vmassol" type="update">
Major change: updated to use the Cactus/Ant integration built on
23rd of May 2003 (it is completely different from the Cactus/Ant
1.1
maven/src/plugins-build/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/test.xml
Index: test.xml
===================================================================
<!-- Do not delete -->
<!-- Some sample resource file to verify that non java source files
are correctly copied by the cactus:compile goal -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
