Author: nickboldt Date: 2010-04-04 10:27:57 -0400 (Sun, 04 Apr 2010) New Revision: 21255 Modified: branches/modular_build/genpom.xml Log: JBDS-486 fix script so test framework *plugins* are not generated as test plugins Modified: branches/modular_build/genpom.xml =================================================================== --- branches/modular_build/genpom.xml 2010-04-03 16:25:40 UTC (rev 21254) +++ branches/modular_build/genpom.xml 2010-04-04 14:27:57 UTC (rev 21255) @@ -172,20 +172,26 @@ <var name="artifactId" unset="true" /> <var name="artifactVersion" unset="true" /> <if> - <matches string="@{dir}" pattern=".+/test(s+)" /> + <matches string="@{dir}" pattern=".+/features/.+" /> <then> - <echo file=&quot;(a){dir}/pom.xml&quot; append="true">eclipse-test-plugin</echo> + <echo file=&quot;(a){dir}/pom.xml&quot; append="true">eclipse-feature</echo> </then> <elseif> - <matches string="@{dir}" pattern=".+/feature(s+)" /> + <matches string="@{dir}" pattern=".+/.+site" /> <then> - <echo file=&quot;(a){dir}/pom.xml&quot; append="true">eclipse-feature</echo> + <echo file=&quot;(a){dir}/pom.xml&quot; append="true">eclipse-update-site</echo> </then> </elseif> <elseif> - <matches string="@{dir}" pattern=".+/.+site" /> + <and> + <not> + <matches string="@{dir}" pattern=".+/plugins/.+" /> + </not> + <matches string="@{dir}" pattern=".+/tests/.+" /> + </and> <then> - <echo file=&quot;(a){dir}/pom.xml&quot; append="true">eclipse-update-site</echo> + <echo>@{dir} is a test plugin</echo> + <echo file=&quot;(a){dir}/pom.xml&quot; append="true">eclipse-test-plugin</echo> </then> </elseif> <else>