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

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113489 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
vmassol
2003-06-12 12:28:48 +00:00
parent 0ddba26c86
commit b02ca64527
3 changed files with 20 additions and 0 deletions

View File

@@ -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>

View File

@@ -0,0 +1,4 @@
<!-- Do not delete -->
<!-- Some sample resource file to verify that non java source files
are correctly copied by the cactus:compile goal -->

View File

@@ -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