You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 13:12:18 UTC
svn commit: r1027468 -
/tuscany/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
Author: nash
Date: Tue Oct 26 11:12:17 2010
New Revision: 1027468
URL: http://svn.apache.org/viewvc?rev=1027468&view=rev
Log:
Merge r1002093 Fix resource exclusion patterns so that files under the target directory aren't incorrectly treated as resources
Modified:
tuscany/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
Modified: tuscany/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java?rev=1027468&r1=1027467&r2=1027468&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java (original)
+++ tuscany/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java Tue Oct 26 11:12:17 2010
@@ -248,7 +248,7 @@ public class AntGeneratorMojo extends Ab
if (project.getResources().size() > 1) {
break;
}
- pw.println(" <fileset dir=\".\" excludes=\"**/*.java, pom.xml, build.xml, target\"/>");
+ pw.println(" <fileset dir=\".\" excludes=\"**/*.java, **/.*/**, pom.xml, build*.xml, target/**\"/>");
source = ".";
}
}
@@ -287,7 +287,7 @@ public class AntGeneratorMojo extends Ab
if (project.getTestResources().size() > 1) {
break;
}
- pw.println(" <fileset dir=\".\" excludes=\"**/*.java, pom.xml, build.xml, target\"/>");
+ pw.println(" <fileset dir=\".\" excludes=\"**/*.java, **/.*/**, pom.xml, build*.xml, target/**\"/>");
source = ".";
}
}