Author: dgolovin Date: 2011-06-08 19:44:32 -0400 (Wed, 08 Jun 2011) New Revision: 31934 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml trunk/jsf/tests/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml trunk/vpe/tests/pom.xml Log: https://issues.jboss.org/browse/JBIDE-8777 configuration problem is fixed for jsf tests Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -22,7 +22,7 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <explodedBundles> + <explodedBundles combine.children="append"> <bundle>org.jboss.tools.jsf.test</bundle> </explodedBundles> </configuration> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -15,17 +15,4 @@ <emma.filter>org.jboss.tools.jsf.ui*</emma.filter> <emma.instrument.bundles>org.jboss.tools.jsf.ui</emma.instrument.bundles> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <product>org.jboss.tools.tests.product</product> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -15,23 +15,4 @@ <emma.filter>org.jboss.tools.jsf.vpe.ajax4jsf*</emma.filter> <emma.instrument.bundles>org.jboss.tools.jsf.vpe.ajax4jsf</emma.instrument.bundles> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <explodedBundles> - <bundle>org.jboss.tools.jsf.vpe.ajax4jsf</bundle> - <bundle>org.jboss.tools.vpe</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -23,14 +23,9 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <explodedBundles> - <bundle>org.jboss.tools.vpe</bundle> + <explodedBundles combine.children="append"> <bundle>org.jboss.tools.jsf.vpe.richfaces</bundle> <bundle>org.jboss.tools.jsf.vpe.jsf.test</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> </explodedBundles> </configuration> </plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -23,13 +23,8 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <explodedBundles> + <explodedBundles combine.children="append"> <bundle>org.jboss.tools.jsf.vpe.richfaces</bundle> - <bundle>org.jboss.tools.vpe</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> </explodedBundles> </configuration> </plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -23,14 +23,9 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <explodedBundles> - <bundle>org.jboss.tools.vpe</bundle> + <explodedBundles combine.children="append"> <bundle>org.jboss.tools.jsf.vpe.richfaces</bundle> <bundle>org.jboss.tools.jsf.vpe.seam</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> </explodedBundles> </configuration> </plugin> Modified: trunk/jsf/tests/pom.xml =================================================================== --- trunk/jsf/tests/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/jsf/tests/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -26,5 +26,27 @@ <module>org.jboss.tools.jsf.vpe.richfaces.test</module> <module>org.jboss.tools.jsf.vpe.seam.test</module> </modules> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <product>org.jboss.tools.tests.product</product> + <!-- default is 1800 sec = 30 min --> + <surefire.timeout>3600</surefire.timeout> + <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> + + <explodedBundles> + <bundle>org.jboss.tools.vpe</bundle> + <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> + <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> + <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> + <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -13,23 +13,4 @@ <properties> <emma.filter>org.jboss.tools*</emma.filter> </properties> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <product>org.jboss.tools.tests</product> - <explodedBundles> - <bundle>org.jboss.tools.vpe</bundle> - <bundle>org.mozilla.xulrunner.carbon.macosx</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -17,27 +17,4 @@ <emma.filter>org.jboss.tools.vpe.html*</emma.filter> <emma.instrument.bundles>org.jboss.tools.vpe.html</emma.instrument.bundles> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <product>org.jboss.tools.tests.product</product> - <!-- default is 1800 sec = 30 min --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> - - <explodedBundles> - <bundle>org.jboss.tools.vpe</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -16,26 +16,4 @@ <emma.filter>org.jboss.tools.vpe*</emma.filter> <emma.instrument.bundles>org.jboss.tools.vpe</emma.instrument.bundles> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <!-- default is 1800 sec = 30 min --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> - <product>org.jboss.tools.tests</product> - <explodedBundles> - <bundle>org.jboss.tools.vpe</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -14,25 +14,4 @@ <properties> <emma.filter>org.jboss.tools*</emma.filter> </properties> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <!-- default is 1800 sec = 30 min --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> - <product>org.jboss.tools.tests</product> - <explodedBundles> - <bundle>org.jboss.tools.vpe</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -23,26 +23,9 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <!-- default is 1800 sec = 30 min --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> - <product>org.jboss.tools.tests.product</product> - <explodedBundles> - <bundle>org.jboss.tools.vpe</bundle> + <explodedBundles combine.children="append"> <bundle>org.jboss.tools.vpe.ui.test</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> </explodedBundles> - <dependencies> - <dependency> - <groupId>org.jboss.tools.vpe.plugins</groupId> - <artifactId>org.jboss.tools.xulrunner.initializer</artifactId> - <version>3.1.0</version> - <type>eclipse-plugin</type> - </dependency> - </dependencies> </configuration> </plugin> </plugins> Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -16,34 +16,4 @@ <emma.filter>org.jboss.tools.vpe.xulrunner*</emma.filter> <emma.instrument.bundles>org.jboss.tools.vpe.xulrunner</emma.instrument.bundles> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <!-- default is 1800 sec = 30 min --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> - <product>org.jboss.tools.tests</product> - <explodedBundles> - <bundle>org.jboss.tools.vpe</bundle> - <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> - <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> - <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> - </explodedBundles> - <dependencies> - <dependency> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.xulrunner.initializer</artifactId> - <version>3.1.0</version> - <type>eclipse-plugin</type> - </dependency> - </dependencies> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: trunk/vpe/tests/pom.xml =================================================================== --- trunk/vpe/tests/pom.xml 2011-06-08 23:39:52 UTC (rev 31933) +++ trunk/vpe/tests/pom.xml 2011-06-08 23:44:32 UTC (rev 31934) @@ -20,4 +20,26 @@ <module>org.jboss.tools.vpe.ui.bot.test</module> <module>org.jboss.tools.vpe.xulrunner.test</module> </modules> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <product>org.jboss.tools.tests.product</product> + <!-- default is 1800 sec = 30 min --> + <surefire.timeout>3600</surefire.timeout> + <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> + + <explodedBundles> + <bundle>org.jboss.tools.vpe</bundle> + <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> + <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> + <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> + <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> </project>