Target Explorer: Provide a second Maven project file to allow includation of o.e.tcf.te.tests plug-in in dependent test plug-in's

3 files changed, 290 insertions, 273 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom-tests.xml b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom-tests.xml
new file mode 100644
index 000000000..5781dd59e
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom-tests.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.tcf.te</groupId>
+		<artifactId>te-tests.maven-master</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../pom-tests.xml</relativePath>
+	</parent>
+
+	<version>1.1.0.qualifier</version>
+	<artifactId>org.eclipse.tcf.te.tests</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<properties>
+		<jacoco.append>true</jacoco.append>
+		
+		<sdk-version>3.8.0</sdk-version>
+		<te-version>1.1.0</te-version>
+		
+		<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<testSuite>org.eclipse.tcf.te.tests</testSuite>
+					<testClass>org.eclipse.tcf.te.tests.suites.AllTests</testClass>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>true</useUIThread>
+<!--	  			    <debugPort>8003</debugPort> -->
+					<product>org.eclipse.platform.ide</product>
+					<argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
+					<application>org.eclipse.ui.ide.workbench</application>
+					<dependencies>
+						<dependency>
+							<type>p2-installable-unit</type>
+							<artifactId>org.eclipse.sdk.feature.group</artifactId>
+							<version>${sdk-version}</version>
+						</dependency>
+						<dependency>
+							<type>p2-installable-unit</type>
+							<artifactId>org.eclipse.tcf.te.feature.feature.group</artifactId>
+							<version>${te-version}</version>
+						</dependency>
+					</dependencies>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.codehaus.gmaven</groupId>
+				<artifactId>gmaven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+						<configuration>
+							<source>
+							project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'].replace('qualifier', project.properties['buildQualifier'])
+							</source>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-report</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<typedef resource="org/jacoco/ant/antlib.xml"/>
+								<echo message="Coverage report"/>
+								<report>
+									<executiondata>
+										<fileset dir="${project.build.directory}" includes="jacoco.exec"/>
+									</executiondata>
+									<structure name="Code Coverage - Target Explorer">
+										<group name="org.eclipse.tcf.te.core">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.core/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.core/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.core.cdt">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.core.cdt/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.core.cdt/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.launch.core">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.launch.core/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.launch.core/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.runtime">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.runtime.concurrent">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.concurrent/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.concurrent/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.runtime.model">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.model/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.model/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.runtime.persistence">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.persistence/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.persistence/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.runtime.services">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.services/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.services/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.runtime.statushandler">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.statushandler/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.statushandler/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.runtime.stepper">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.stepper/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.stepper/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.tcf.core">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.tcf.core.model">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core.model/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core.model/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.tcf.filesystem.core">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.filesystem.core/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.filesystem.core/src"/>
+											</sourcefiles>
+										</group>
+
+										<group name="org.eclipse.tcf.te.tcf.launch.core">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.launch.core/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.launch.core/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.tcf.locator">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.locator/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.locator/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.tcf.log.core">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.log.core/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.log.core/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.tcf.processes.core">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.processes.core/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.processes.core/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.tcf.services.contexts">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.services.contexts/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.services.contexts/src"/>
+											</sourcefiles>
+										</group>
+										
+										<group name="org.eclipse.tcf.te.tcf.terminals.core">
+											<classfiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.terminals.core/target/classes"/>
+											</classfiles>
+											<sourcefiles>
+												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.terminals.core/src"/>
+											</sourcefiles>
+										</group>
+										
+									</structure>
+								
+									<html destdir="${project.build.directory}/coverage"
+										  footer="Code Coverage Report for Target Explorer ${qualified.bundle.version}"
+										  locale="de"/>
+									<csv destfile="${project.build.directory}/coverage/coverage.csv"/>
+									<xml destfile="${project.build.directory}/coverage/coverage.xml"/>
+								</report>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.jacoco</groupId>
+						<artifactId>org.jacoco.ant</artifactId>
+						<version>${jacoco-version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			
+		</plugins>
+	</build>
+</project>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml
index 5781dd59e..e865d8e0b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml
@@ -13,276 +13,5 @@
 
 	<version>1.1.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.tests</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
-
-	<properties>
-		<jacoco.append>true</jacoco.append>
-		
-		<sdk-version>3.8.0</sdk-version>
-		<te-version>1.1.0</te-version>
-		
-		<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
-	</properties>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<testSuite>org.eclipse.tcf.te.tests</testSuite>
-					<testClass>org.eclipse.tcf.te.tests.suites.AllTests</testClass>
-					<useUIHarness>true</useUIHarness>
-					<useUIThread>true</useUIThread>
-<!--	  			    <debugPort>8003</debugPort> -->
-					<product>org.eclipse.platform.ide</product>
-					<argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
-					<application>org.eclipse.ui.ide.workbench</application>
-					<dependencies>
-						<dependency>
-							<type>p2-installable-unit</type>
-							<artifactId>org.eclipse.sdk.feature.group</artifactId>
-							<version>${sdk-version}</version>
-						</dependency>
-						<dependency>
-							<type>p2-installable-unit</type>
-							<artifactId>org.eclipse.tcf.te.feature.feature.group</artifactId>
-							<version>${te-version}</version>
-						</dependency>
-					</dependencies>
-				</configuration>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.codehaus.gmaven</groupId>
-				<artifactId>gmaven-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>execute</goal>
-						</goals>
-						<configuration>
-							<source>
-							project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'].replace('qualifier', project.properties['buildQualifier'])
-							</source>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-report</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<typedef resource="org/jacoco/ant/antlib.xml"/>
-								<echo message="Coverage report"/>
-								<report>
-									<executiondata>
-										<fileset dir="${project.build.directory}" includes="jacoco.exec"/>
-									</executiondata>
-									<structure name="Code Coverage - Target Explorer">
-										<group name="org.eclipse.tcf.te.core">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.core/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.core/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.core.cdt">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.core.cdt/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.core.cdt/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.launch.core">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.launch.core/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.launch.core/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.runtime">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.runtime.concurrent">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.concurrent/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.concurrent/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.runtime.model">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.model/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.model/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.runtime.persistence">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.persistence/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.persistence/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.runtime.services">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.services/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.services/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.runtime.statushandler">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.statushandler/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.statushandler/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.runtime.stepper">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.stepper/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.stepper/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.tcf.core">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.tcf.core.model">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core.model/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core.model/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.tcf.filesystem.core">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.filesystem.core/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.filesystem.core/src"/>
-											</sourcefiles>
-										</group>
-
-										<group name="org.eclipse.tcf.te.tcf.launch.core">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.launch.core/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.launch.core/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.tcf.locator">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.locator/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.locator/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.tcf.log.core">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.log.core/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.log.core/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.tcf.processes.core">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.processes.core/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.processes.core/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.tcf.services.contexts">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.services.contexts/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.services.contexts/src"/>
-											</sourcefiles>
-										</group>
-										
-										<group name="org.eclipse.tcf.te.tcf.terminals.core">
-											<classfiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.terminals.core/target/classes"/>
-											</classfiles>
-											<sourcefiles>
-												<fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.terminals.core/src"/>
-											</sourcefiles>
-										</group>
-										
-									</structure>
-								
-									<html destdir="${project.build.directory}/coverage"
-										  footer="Code Coverage Report for Target Explorer ${qualified.bundle.version}"
-										  locale="de"/>
-									<csv destfile="${project.build.directory}/coverage/coverage.csv"/>
-									<xml destfile="${project.build.directory}/coverage/coverage.xml"/>
-								</report>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.jacoco</groupId>
-						<artifactId>org.jacoco.ant</artifactId>
-						<version>${jacoco-version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			
-		</plugins>
-	</build>
+	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/target_explorer/pom-tests.xml b/target_explorer/pom-tests.xml
index 990166fac..94402d25a 100644
--- a/target_explorer/pom-tests.xml
+++ b/target_explorer/pom-tests.xml
@@ -22,7 +22,7 @@
 		<module>../pom.xml</module>
 
 		<!-- The test module executing the tests -->
-		<module>plugins/org.eclipse.tcf.te.tests</module>
+		<module>plugins/org.eclipse.tcf.te.tests/pom-tests.xml</module>
 	</modules>
 
 	<build>