[jbosstools-commits] JBoss Tools SVN: r42103 - in trunk: maven/tests/org.jboss.tools.maven.ui.bot.test and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Jun 20 09:43:52 EDT 2012
Author: mickael_istria
Date: 2012-06-20 09:43:51 -0400 (Wed, 20 Jun 2012)
New Revision: 42103
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.test/requirements.properties
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/requirements.properties
trunk/portlet/tests/org.jboss.tools.portlet.core.test/requirements.properties
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/requirements.properties
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
Log:
JBIDE-11714:
* Maven tests using maven-download-plugin
* AS tests using mixed maven-download-plugin and maven-dependency-plugin
* Portlet tests using maven-download-plugin
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2012-06-20 13:42:50 UTC (rev 42102)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2012-06-20 13:43:51 UTC (rev 42103)
@@ -11,15 +11,115 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <jbosstools.test.jboss.home.3.2>${requirement.build.root}/jboss-3.2.8.SP1</jbosstools.test.jboss.home.3.2>
- <jbosstools.test.jboss.home.4.0>${requirement.build.root}/jboss-4.0.5.GA</jbosstools.test.jboss.home.4.0>
- <jbosstools.test.jboss.home.4.2>${requirement.build.root}/jboss-4.2.3.GA</jbosstools.test.jboss.home.4.2>
- <jbosstools.test.jboss.home.5.0>${requirement.build.root}/jboss-5.0.1.GA</jbosstools.test.jboss.home.5.0>
- <jbosstools.test.jboss.home.5.1>${requirement.build.root}/jboss-5.1.0.GA</jbosstools.test.jboss.home.5.1>
- <jbosstools.test.jboss.home.6.0>${requirement.build.root}/jboss-6.0.0.Final</jbosstools.test.jboss.home.6.0>
- <jbosstools.test.jboss.home.7.0>${requirement.build.root}/jboss-7.0.0.Beta3</jbosstools.test.jboss.home.7.0>
+ <jbosstools.test.jboss.home.3.2>${project.build.directory}/jboss-3.2.8.SP1</jbosstools.test.jboss.home.3.2>
+ <jbosstools.test.jboss.home.4.0>${project.build.directory}/jboss-4.0.5.GA</jbosstools.test.jboss.home.4.0>
+ <jbosstools.test.jboss.home.4.2>${project.build.directory}/jboss-4.2.3.GA</jbosstools.test.jboss.home.4.2>
+ <jbosstools.test.jboss.home.5.0>${project.build.directory}/jboss-5.0.1.GA</jbosstools.test.jboss.home.5.0>
+ <jbosstools.test.jboss.home.5.1>${project.build.directory}/jboss-5.1.0.GA</jbosstools.test.jboss.home.5.1>
+ <jbosstools.test.jboss.home.6.0>${project.build.directory}/jboss-6.0.0.Final</jbosstools.test.jboss.home.6.0>
+ <jbosstools.test.jboss.home.7.0>${project.build.directory}/jboss-as-7.0.0.Final</jbosstools.test.jboss.home.7.0>
<systemProperties>-Djbosstools.test.jboss.home.3.2=${jbosstools.test.jboss.home.3.2} -Djbosstools.test.jboss.home.4.0=${jbosstools.test.jboss.home.4.0} -Djbosstools.test.jboss.home.4.2=${jbosstools.test.jboss.home.4.2} -Djbosstools.test.jboss.home.5.0=${jbosstools.test.jboss.home.5.0} -Djbosstools.test.jboss.home.5.1=${jbosstools.test.jboss.home.5.1} -Djbosstools.test.jboss.home.6.0=${jbosstools.test.jboss.home.6.0} -Djbosstools.test.jboss.home.7.0=${jbosstools.test.jboss.home.7.0} </systemProperties>
<coverage.filter>org.jboss.ide.eclipse.as.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.ide.eclipse.as.core</emma.instrument.bundles>
</properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-as</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <version>4.2.3.GA</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-distribution</artifactId>
+ <version>6.0.0.Final</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <version>7.0.0.Final</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>maven-download-plugin</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>install-as-3.2.8</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://repository.jboss.org/sourceforge/jboss-3.2.8.SP1.zip</url>
+ <md5>97147374ee5b048e4462c7ebaf3cccb5</md5>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-as-4.0.5</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://repository.jboss.org/sourceforge/jboss-4.0.5.GA.zip</url>
+ <md5>a39e85981958fea2411e9346e218aa39</md5>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-as-5.0.1</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://repository.jboss.org/sourceforge/jboss-5.0.1.GA.zip</url>
+ <md5>dd308175c43796db824692cb0cdea82d</md5>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-as-5.1.0</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://repository.jboss.org/sourceforge/jboss-5.1.0.GA.zip</url>
+ <md5>78322c75ca0c13002a04418b4a8bc920</md5>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.test/requirements.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/requirements.properties 2012-06-20 13:42:50 UTC (rev 42102)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/requirements.properties 2012-06-20 13:43:51 UTC (rev 42103)
@@ -1 +0,0 @@
-requirements=jbossas
\ No newline at end of file
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-06-20 13:42:50 UTC (rev 42102)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-06-20 13:43:51 UTC (rev 42103)
@@ -13,11 +13,71 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.6.0=${requirement.build.root}/jboss-6.0.0.Final -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.6.0=${project.build.directory}/jboss-6.0.0.Final -Djbosstools.test.jboss.home.5.1=${project.build.directory}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${project.build.directory}/jboss-seam-2.2.0.GA</systemProperties>
</properties>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-as-6.0.0</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-distribution</artifactId>
+ <version>6.0.0.Final</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>maven-download-plugin</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>install-seam</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <skip>${swtbot.test.skip}</skip>
+ <url>http://repository.jboss.org/sourceforge/jboss-seam-2.2.0.GA.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <md5>febaf032f989240fe3828a8f0f7fe98a</md5>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-as-5.1.0</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <skip>${swtbot.test.skip}</skip>
+ <url>http://repository.jboss.org/sourceforge/jboss-5.1.0.GA.zip</url>
+ <md5>78322c75ca0c13002a04418b4a8bc920</md5>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
Deleted: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/requirements.properties
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/requirements.properties 2012-06-20 13:42:50 UTC (rev 42102)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/requirements.properties 2012-06-20 13:43:51 UTC (rev 42103)
@@ -1 +0,0 @@
-requirements=jbossas-5.1.0.GA,seam-2.2.0.GA,jbossas-6.0.0.Final
\ No newline at end of file
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.core.test/requirements.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/requirements.properties 2012-06-20 13:42:50 UTC (rev 42102)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/requirements.properties 2012-06-20 13:43:51 UTC (rev 42103)
@@ -1 +0,0 @@
-requirements=jbossesb
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-06-20 13:42:50 UTC (rev 42102)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-06-20 13:43:51 UTC (rev 42103)
@@ -13,11 +13,11 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <jbosstools.test.jboss-gatein.home>${requirement.build.root}/GateIn-3.1.0-GA</jbosstools.test.jboss-gatein.home>
- <jbosstools.test.jboss-seam-2.2.home>${requirement.build.root}/jboss-seam-2.2.1.Final</jbosstools.test.jboss-seam-2.2.home>
- <jbosstools.test.jboss-portal.home>${requirement.build.root}/jboss-portal-2.7.2</jbosstools.test.jboss-portal.home>
- <jbosstools.test.jboss-seam-2.0.home>${requirement.build.root}/jboss-seam-2.0.1.GA</jbosstools.test.jboss-seam-2.0.home>
- <jbosstools.test.jboss-portlet-bridge.home>${requirement.build.root}</jbosstools.test.jboss-portlet-bridge.home>
+ <jbosstools.test.jboss-gatein.home>${project.build.directory}/GateIn-3.1.0-GA</jbosstools.test.jboss-gatein.home>
+ <jbosstools.test.jboss-seam-2.2.home>${project.build.directory}/jboss-seam-2.2.1.Final</jbosstools.test.jboss-seam-2.2.home>
+ <jbosstools.test.jboss-portal.home>${project.build.directory}/jboss-portal-2.7.2</jbosstools.test.jboss-portal.home>
+ <jbosstools.test.jboss-seam-2.0.home>${project.build.directory}/jboss-seam-2.0.1.GA</jbosstools.test.jboss-seam-2.0.home>
+ <jbosstools.test.jboss-portlet-bridge.home>${project.build.directory}</jbosstools.test.jboss-portlet-bridge.home>
<configurations.dir>resources/project_config_files</configurations.dir>
<additionalSystemProperties></additionalSystemProperties>
<systemProperties>${additionalSystemProperties} -Djbosstools.test.jboss-gatein.home=${jbosstools.test.jboss-gatein.home} -Djbosstools.test.jboss-seam-2.2.home=${jbosstools.test.jboss-seam-2.2.home} -Djbosstools.test.jboss-portal.home=${jbosstools.test.jboss-portal.home} -Djbosstools.test.jboss-seam-2.0.home=${jbosstools.test.jboss-seam-2.0.home} -Djbosstools.test.jboss-portlet-bridge.home=${jbosstools.test.jboss-portlet-bridge.home} -Dtest.configurations.dir=${configurations.dir} -Dorg.eclipse.swtbot.screenshots.dir=${project.build.directory}/screenshots</systemProperties>
@@ -36,6 +36,84 @@
<build>
<plugins>
<plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>maven-download-plugin</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>install-gatein</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://downloads.sourceforge.net/project/jboss/GateIn/Portal/3.1.0-FINAL/GateIn-3.1.0-FINAL-jbossas.zip</url>
+ <md5>e8c35a21f8f1e33181adc80a0b32d7f2</md5>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-seam-2.0.1</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://repository.jboss.org/sourceforge/jboss-seam-2.0.1.GA.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <md5>0a1accf94fd37e40ab1091ee593b8b75</md5>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-seam-2.2.1</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://downloads.sourceforge.net/project/jboss/JBoss%20Seam/2.2.1.Final/jboss-seam-2.2.1.Final.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <md5>b490d794e805aef78cb9fee510073850</md5>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-jboss-portal</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://sourceforge.net/projects/jboss/files/JBoss%20Portal/JBoss-Portal-2.7.2.GA/jboss-portal-2.7.2-bundled.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <md5>83aa628f5451f47ebce4845d8799144e</md5>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-jboss-portlet-bridge</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://sourceforge.net/projects/jboss/files/JBoss%20Portal/JBossPortletBridge-2.1.0.FINAL/JBossPortletBridge-2.1.0.FINAL.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <md5>44a7b67d0b6e0995bec97e8c81bacab3</md5>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/requirements.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/requirements.properties 2012-06-20 13:42:50 UTC (rev 42102)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/requirements.properties 2012-06-20 13:43:51 UTC (rev 42103)
@@ -1 +0,0 @@
-requirements=gatein-3.1.0.Final,seam-2.2.1.Final,JBoss-Portal-2.7.2.GA,seam-2.0.1.GA,JBossPortletBridge-2.1.0.FINAL
\ No newline at end of file
More information about the jbosstools-commits
mailing list