vmassol 2003/10/30 10:37:18
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
Fixed bug <a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-977";>MAVEN-977</a>.
Cactus <code>cactus.src.includes</code> and <code>cactus.src.excludes</code>
properties should now work.
Revision Changes Path
1.3 +6 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 29 Oct 2003 21:49:00 -0000 1.2
+++ changes.xml 30 Oct 2003 18:37:18 -0000 1.3
@@ -8,6 +8,12 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="fix">
+ Fixed bug
+ <a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-977";>MAVEN-977</a>.
+ Cactus <code>cactus.src.includes</code> and
+ <code>cactus.src.excludes</code> properties should now work.
+ </action>
<action dev="vmassol" type="add">
Moved the Cactus plugin from the Maven CVS to the Cactus CVS.
</action>
1.3 +4 -0 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 29 Oct 2003 18:30:01 -0000 1.2
+++ plugin.jelly 30 Oct 2003 18:37:18 -0000 1.3
@@ -122,6 +122,8 @@
optimize="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.optimize')}">
<ant:src path="${cactus.src.dir}"/>
+ <ant:include name="${cactus.src.includes}"/>
+ <ant:exclude name="${cactus.src.excludes}"/>
<ant:classpath>
<ant:path refid="maven.dependency.classpath"/>
@@ -159,6 +161,8 @@
<ant:fileset dir="${cactus.src.dir}">
<ant:exclude name="**/*.java"/>
<ant:exclude name="**/*.html"/>
+ <ant:include name="${cactus.src.includes}"/>
+ <ant:exclude name="${cactus.src.excludes}"/>
</ant:fileset>
</ant:copy>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
