refs #12

- added test project
eclipse-efx · Feb 23, 2017 · 689fac4 · 689fac4
1 parent 302f5b7
commit 689fac4
Show file tree

Hide file tree

Showing 26 changed files with 642 additions and 0 deletions.
diff --git a/testcases/test-apps/test.issue12.app.feature/.project b/testcases/test-apps/test.issue12.app.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>test.issue12.app.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/testcases/test-apps/test.issue12.app.feature/build.properties b/testcases/test-apps/test.issue12.app.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/testcases/test-apps/test.issue12.app.feature/feature.xml b/testcases/test-apps/test.issue12.app.feature/feature.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+	id="test.issue12.app.feature"
+	label="TestIssue12 Application Feature"
+	version="1.0.0.qualifier"
+	provider-name="${BundleProject_bundleVendor}"
+	>
+		<description url="http://www.efxclipse.org">
+			TODO FILL WITH CONTENT
+		</description>
+
+		<copyright url="http://www.efxclipse.org">
+			TODO FILL WITH CONTENT
+		</copyright>
+
+		<license url="http://www.efxclipse.org">
+			TODO FILL WITH CONTENT
+		</license>
+
+   		<plugin id="test.issue12.app" install-size="0" version="0.0.0" unpack="false" />
+
+
+</feature>
diff --git a/testcases/test-apps/test.issue12.app.feature/pom.xml b/testcases/test-apps/test.issue12.app.feature/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<name>TestIssue12 - application feature</name>
+	<groupId>test.issue12</groupId>
+	<artifactId>test.issue12.app.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+
+	<parent>
+		<groupId>test.issue12</groupId>
+		<artifactId>test.issue12.app.releng</artifactId>
+		<relativePath>../test.issue12.app.releng/pom.xml</relativePath>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+</project>
diff --git a/testcases/test-apps/test.issue12.app.product/.project b/testcases/test-apps/test.issue12.app.product/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>test.issue12.app.product</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/testcases/test-apps/test.issue12.app.product/pom.xml b/testcases/test-apps/test.issue12.app.product/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<name>TestIssue12 - application product</name>
+	<groupId>test.issue12</groupId>
+	<artifactId>test.issue12.app.product</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<parent>
+		<groupId>test.issue12</groupId>
+		<artifactId>test.issue12.app.releng</artifactId>
+		<relativePath>../test.issue12.app.releng/pom.xml</relativePath>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<build>
+  	<plugins>
+    	<plugin>
+      		<groupId>org.eclipse.tycho</groupId>
+      		<artifactId>tycho-p2-director-plugin</artifactId>
+      		<version>${tycho-version}</version>
+      		<executions>
+        		<execution>
+          			<id>materialize-products</id>
+          			<goals>
+            			<goal>materialize-products</goal>
+          			</goals>
+        		</execution>
+        		<execution>
+          			<id>archive-products</id>
+          			<goals>
+            			<goal>archive-products</goal>
+          			</goals>
+        		</execution>
+      		</executions>
+    	</plugin>
+	</plugins>
+	</build>
+</project>
diff --git a/testcases/test-apps/test.issue12.app.product/test.issue12.app.product.product b/testcases/test-apps/test.issue12.app.product/test.issue12.app.product.product
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="TestIssue12" uid="test.issue12.app.product" id="test.issue12.app.product" application="org.eclipse.fx.ui.workbench.fx.application" version="1.0.0" useFeatures="true" includeLaunchers="false">
+
+	<configIni use="default">
+	</configIni>
+	<launcherArgs>
+		<programArgs>-nosplash</programArgs>
+		<vmArgs>-Dorg.osgi.framework.bundle.parent=ext</vmArgs>
+	</launcherArgs>
+
+	<windowImages/>
+
+	<features>
+		<feature id="test.issue12.app.feature" />
+		<feature id="org.eclipse.fx.runtime.e4fx.feature" />
+	</features>
+	<configurations>
+		<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+		<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+		<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+		<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+		<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+		<plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
+	</configurations>
+</product>
+
diff --git a/testcases/test-apps/test.issue12.app.product/test.issue12.app.product.product.launch b/testcases/test-apps/test.issue12.app.product/test.issue12.app.product.product.launch
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<setAttribute key="additional_plugins"/>
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/test.issue12.app.product.product"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="featureDefaultLocation" value="workspace"/>
+<stringAttribute key="featurePluginResolution" value="workspace"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-test.issue12.app.product"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nl ${target.nl} -consoleLog -nosplash"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.framework.bundle.parent=ext"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="test.issue12.app.product"/>
+<stringAttribute key="productFile" value="/test.issue12.app.product/test.issue12.app.product.product"/>
+<setAttribute key="selected_features">
+<setEntry value="org.eclipse.fx.runtime.e4fx.feature:default"/>
+<setEntry value="test.issue12.app.feature:default"/>
+</setAttribute>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="true"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/testcases/test-apps/test.issue12.app.releng/.project b/testcases/test-apps/test.issue12.app.releng/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>test.issue12.app.releng</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/testcases/test-apps/test.issue12.app.releng/build.xml b/testcases/test-apps/test.issue12.app.releng/build.xml
@@ -0,0 +1,53 @@
+<project name="native-build" default="do-deploy" basedir="."  xmlns:fx="javafx:com.sun.javafx.tools.ant">
+	<property name="eclipse-app-dir" value="../test.issue12.app.product/target/products/test.issue12.app.product/noenv/noenv/noenv" />
+
+	<target name="init-fx-tasks">
+		<taskdef name="fxosgilauncher" classpath="org.eclipse.fx.ide.ant.jar" classname="org.eclipse.fx.ide.ant.FXOsgiLaunchTask" />
+		<path id="fxant">
+			<filelist>
+				<file name="${java.home}\..\lib\ant-javafx.jar"/>
+				<file name="${java.home}\lib\ant-jfxrt.jar"/>
+			</filelist>
+		</path>
+		<taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
+					uri="javafx:com.sun.javafx.tools.ant"
+					classpathref="fxant"/>
+	</target>
+
+	<target name="do-deploy" depends="init-fx-tasks">
+		<fileset id="equinox-launcher" dir="../test.issue12.app.product/target/products/test.issue12.app.product/noenv/noenv/noenv">
+			<filename name="plugins/org.eclipse.equinox.launcher_*.jar"/>
+		</fileset>
+		<fxosgilauncher classpathref="fxant" equinoxlauncherjarref="equinox-launcher"/>
+
+		<fx:resources id="appRes">
+			<fx:fileset dir="." includes="fx-osgi-launch.jar"/>
+			<fx:fileset dir="${eclipse-app-dir}" includes="**/*"/>
+		</fx:resources>
+
+		<fx:application id="fxApplication"
+								name="TestIssue12"
+								mainClass="org.eclipse.equinox.launcher.Main"
+								toolkit="swing"
+
+							/>
+
+		<fx:deploy
+			embedJNLP="false"
+			extension="false"
+			includeDT="false"
+			offlineAllowed="true"
+			outdir="${basedir}/deploy"
+			outfile="fix-ide"
+			nativeBundles="all"
+			updatemode="background"
+			>
+			<fx:platform basedir="${java.home}">
+				<fx:property name="org.osgi.framework.bundle.parent" value="ext"/>
+			</fx:platform>
+			<fx:info title="TestIssue12" vendor=""/>
+			<fx:application refid="fxApplication"/>
+			<fx:resources refid="appRes"/>
+		</fx:deploy>
+	</target>
+</project>
diff --git a/testcases/test-apps/test.issue12.app.releng/org.eclipse.fx.ide.ant.jar b/testcases/test-apps/test.issue12.app.releng/org.eclipse.fx.ide.ant.jar