Author: dgolovin Date: 2010-06-04 15:09:50 -0400 (Fri, 04 Jun 2010) New Revision: 22559 Removed: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/org.hibernate.eclipse.console.test.test Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/build.properties trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/build.properties trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/build.properties trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/pom.xml trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/build.properties Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests hibernateide tests are ported to work with tycho: - manifest jars removed to let tycho recognize tests - pom.xml's adjusted to unpack tests before execution - swtbot tests are marked as regular plugins until we figure how to start them - test plugins not included in builds before marked as eclipse-plugins Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2010-06-04 19:09:50 UTC (rev 22559) @@ -3,7 +3,7 @@ Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.console.test Bundle-Version: 3.3.0.qualifier -Bundle-ClassPath: org.hibernate.eclipse.console.test.test/, +Bundle-ClassPath: ., lib/hibernate-tools-tests.jar, lib/hsqldb.jar, lib/jaxen-1.1-beta-7.jar, Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/build.properties =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/build.properties 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/build.properties 2010-06-04 19:09:50 UTC (rev 22559) @@ -1,7 +1,4 @@ -source.org.hibernate.eclipse.console.test.test/ = src/ -output.org.hibernate.eclipse.console.test.test/ = build/eclipse/ bin.includes = plugin.xml,\ - org.hibernate.eclipse.console.test.test/,\ META-INF/,\ lib/hibernate-tools-tests.jar,\ lib/hsqldb.jar,\ @@ -19,7 +16,8 @@ lib/jmock-2.5.1/objenesis-1.0.jar,\ res/,\ about.html,\ - plugin.properties + plugin.properties,\ + . src.includes = about.html,\ src/,\ res/,\ @@ -33,3 +31,7 @@ .project,\ .cvsignore,\ .classpath +jars.compile.order = . +source.. = src/ +output.. = bin/ +source.. = src/ Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/org.hibernate.eclipse.console.test.test =================================================================== (Binary files differ) Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2010-06-04 19:09:50 UTC (rev 22559) @@ -11,4 +11,17 @@ <artifactId>org.hibernate.eclipse.console.test</artifactId> <version>3.3.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.hibernate.eclipse.console.test</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF 2010-06-04 19:09:50 UTC (rev 22559) @@ -16,7 +16,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.hibernate.eclipse.jdt.ui.test Bundle-Activator: org.hibernate.eclipse.jdt.ui.test.HibernateJDTuiTestPlugin -Bundle-ClassPath: org.hibernate.eclipse.jdt.ui.test.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/build.properties =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/build.properties 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/build.properties 2010-06-04 19:09:50 UTC (rev 22559) @@ -1,11 +1,9 @@ bin.includes = META-INF/,\ testresources/,\ - org.hibernate.eclipse.jdt.ui.test.jar,\ plugin.properties,\ - res/ -jars.compile.order = org.hibernate.eclipse.jdt.ui.test.jar -source.org.hibernate.eclipse.jdt.ui.test.jar = src/ -output.org.hibernate.eclipse.jdt.ui.test.jar = bin/ + res/,\ + . +jars.compile.order = . src.includes = testresources/,\ src/,\ build.properties,\ @@ -13,4 +11,5 @@ .project,\ .classpath,\ res/ -source.org.hibernate.eclipse.jdt.ui.test.jar = src/ +source.. = src/ +output.. = bin/ Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml 2010-06-04 19:09:50 UTC (rev 22559) @@ -11,4 +11,18 @@ <artifactId>org.hibernate.eclipse.jdt.ui.test</artifactId> <version>3.3.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.hibernate.eclipse.jdt.ui.test</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF 2010-06-04 19:09:50 UTC (rev 22559) @@ -17,7 +17,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.hibernate.jpt.core.test Bundle-Activator: org.jboss.tools.hibernate.jpt.core.test.HibernateJPTuiTestPlugin -Bundle-ClassPath: org.jboss.tools.hibernate.jpt.core.test.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Import-Package: org.eclipse.core.resources, Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/build.properties =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/build.properties 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/build.properties 2010-06-04 19:09:50 UTC (rev 22559) @@ -1,11 +1,11 @@ bin.includes = META-INF/,\ - org.jboss.tools.hibernate.jpt.core.test.jar,\ - plugin.properties -jars.compile.order = org.jboss.tools.hibernate.jpt.core.test.jar -source.org.jboss.tools.hibernate.jpt.core.test.jar = src/ -output.org.jboss.tools.hibernate.jpt.core.test.jar = bin/ + plugin.properties,\ + . +jars.compile.order = . src.includes = src/,\ build.properties,\ META-INF/,\ .project,\ .classpath +source.. = src/ +output.. = bin/ Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml 2010-06-04 19:09:50 UTC (rev 22559) @@ -10,5 +10,5 @@ <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.hibernate.jpt.core.test</artifactId> <version>3.3.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/pom.xml =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/pom.xml 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/pom.xml 2010-06-04 19:09:50 UTC (rev 22559) @@ -10,5 +10,5 @@ <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.hibernate.ui.bot.test</artifactId> <version>3.3.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF 2010-06-04 19:09:50 UTC (rev 22559) @@ -14,7 +14,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.hibernate.ui.test Bundle-Activator: org.jboss.tools.hibernate.ui.test.UiTestPlugin -Bundle-ClassPath: org.jboss.tools.hibernate.ui.diagram.test.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Import-Package: org.eclipse.core.resources Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/build.properties =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/build.properties 2010-06-04 18:53:40 UTC (rev 22558) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/build.properties 2010-06-04 19:09:50 UTC (rev 22559) @@ -1,11 +1,11 @@ bin.includes = META-INF/,\ - org.jboss.tools.hibernate.ui.diagram.test.jar,\ - plugin.properties -jars.compile.order = org.jboss.tools.hibernate.ui.diagram.test.jar -source.org.jboss.tools.hibernate.ui.diagram.test.jar = src/ -output.org.jboss.tools.hibernate.ui.diagram.test.jar = bin/ + plugin.properties,\ + . +jars.compile.order = . src.includes = src/,\ build.properties,\ META-INF/,\ .project,\ .classpath +source.. = src/ +output.. = bin/