Author: dgolovin Date: 2010-06-04 18:59:58 -0400 (Fri, 04 Jun 2010) New Revision: 22577 Modified: trunk/struts/tests/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF trunk/struts/tests/org.jboss.tools.struts.text.ext.test/build.properties trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/build.properties trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix for struts tests Modified: trunk/struts/tests/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF 2010-06-04 22:45:46 UTC (rev 22576) +++ trunk/struts/tests/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF 2010-06-04 22:59:58 UTC (rev 22577) @@ -10,7 +10,12 @@ org.eclipse.jface.text, org.eclipse.ui.ide, org.jboss.tools.jst.jsp.test, - org.jboss.tools.jst.web + org.jboss.tools.jst.web, + org.jboss.tools.struts;bundle-version="3.1.0", + org.jboss.tools.struts.text.ext;bundle-version="3.1.0", + org.jboss.tools.struts.ui;bundle-version="3.1.0", + org.jboss.tools.struts.validator.ui;bundle-version="3.1.0", + org.jboss.tools.struts.verification;bundle-version="3.1.0" Export-Package: org.jboss.tools.struts.text.tests Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Modified: trunk/struts/tests/org.jboss.tools.struts.text.ext.test/build.properties =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.text.ext.test/build.properties 2010-06-04 22:45:46 UTC (rev 22576) +++ trunk/struts/tests/org.jboss.tools.struts.text.ext.test/build.properties 2010-06-04 22:59:58 UTC (rev 22577) @@ -1,4 +1,5 @@ source.. = src/ bin.includes = META-INF/,\ .,\ - plugin.properties + plugin.properties,\ + projects/ Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF 2010-06-04 22:45:46 UTC (rev 22576) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF 2010-06-04 22:59:58 UTC (rev 22577) @@ -10,7 +10,10 @@ org.jboss.tools.common.text.ext, org.jboss.tools.common.model, org.jboss.tools.vpe.xulrunner, - org.junit + org.junit, + org.jboss.tools.struts.vpe.struts;bundle-version="3.1.0", + org.jboss.tools.vpe.jsp;bundle-version="3.1.0", + org.jboss.tools.vpe.html;bundle-version="3.1.0" Bundle-ActivationPolicy: lazy Bundle-ClassPath: struts-test.jar Export-Package: org.jboss.tools.struts.vpe.struts.test Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/build.properties =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/build.properties 2010-06-04 22:45:46 UTC (rev 22576) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/build.properties 2010-06-04 22:59:58 UTC (rev 22577) @@ -1,13 +1,13 @@ bin.includes = META-INF/,\ resources/,\ - struts-test.jar,\ plugin.properties,\ - plugin.xml -jars.compile.order = struts-test.jar + plugin.xml,\ + . +jars.compile.order = . src.includes = src/,\ resources/,\ META-INF/,\ build.properties,\ plugin.xml -source.struts-test.jar = src/ -output.struts-test.jar = bin/ +source.. = src/ +output.. = bin/ Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2010-06-04 22:45:46 UTC (rev 22576) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2010-06-04 22:59:58 UTC (rev 22577) @@ -11,4 +11,23 @@ <artifactId>org.jboss.tools.struts.vpe.struts.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <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>