Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2013-05-28 12:41:41 +0000
committerTom Schindl2013-05-28 12:41:41 +0000
commit2f48d831703e3551a2c6bdf53125113809cb9b6c (patch)
tree3a1a34587512ebd46190b05a9cba2690b81fcd3b
parent31b51636b7a0fb1a56052f7deeb5dcb3536b9491 (diff)
downloadorg.eclipse.efxclipse-2f48d831703e3551a2c6bdf53125113809cb9b6c.tar.gz
org.eclipse.efxclipse-2f48d831703e3551a2c6bdf53125113809cb9b6c.tar.xz
org.eclipse.efxclipse-2f48d831703e3551a2c6bdf53125113809cb9b6c.zip
Bug 408986 - Get rid of org.eclipse.fx.ui.application bundle
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/JFXRealm.java (renamed from bundles/runtime/org.eclipse.fx.ui.databinding/src/org/eclipse/fx/ui/databinding/JFXRealm.java)2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi.util/META-INF/MANIFEST.MF7
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi.util/src/org/eclipse/fx/osgi/util/AbstractJFXApplication.java (renamed from bundles/runtime/org.eclipse.fx.ui.application/src/org/eclipse/fx/ui/application/AbstractJFXApplication.java)4
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/.classpath7
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/.gitignore2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/.project28
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.core.resources.prefs2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.core.runtime.prefs2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.jdt.core.prefs7
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/META-INF/MANIFEST.MF44
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/OSGI-INF/l10n/bundle.properties3
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/about.html28
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/build.properties6
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.application/pom.xml34
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF1
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.fx/META-INF/MANIFEST.MF1
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.fx/src/org/eclipse/fx/ui/workbench/fx/E4Application.java2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask4
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/FXOSGiAppTemplate.java4
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java1
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/OSGiLaunchDef.java1
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/wizard/app/tpl/ApplicationClassTpl.xtend2
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF1
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/contacts.product1
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.e4/E4JFX.product1
-rw-r--r--demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product1
-rw-r--r--demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF1
-rwxr-xr-xdemos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java2
-rwxr-xr-xdemos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product1
-rw-r--r--demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.osgi.di/Di.product.product1
-rw-r--r--demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF2
-rwxr-xr-xdemos/org.eclipse.fx.demo.osgi/OSGiApp.product1
-rw-r--r--demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java2
-rwxr-xr-xreleng/org.eclipse.fx.releng/pom.xml1
-rw-r--r--releng/runtime/org.eclipse.fx.target.feature/feature.xml14
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF1
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.product1
46 files changed, 22 insertions, 219 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.databinding/src/org/eclipse/fx/ui/databinding/JFXRealm.java b/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/JFXRealm.java
index 369cb1aab..8f3fdd3e6 100755
--- a/bundles/runtime/org.eclipse.fx.ui.databinding/src/org/eclipse/fx/ui/databinding/JFXRealm.java
+++ b/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/JFXRealm.java
@@ -8,7 +8,7 @@
* Contributors:
* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
*******************************************************************************/
-package org.eclipse.fx.ui.databinding;
+package org.eclipse.fx.core.databinding;
import javafx.application.Platform;
diff --git a/bundles/runtime/org.eclipse.fx.osgi.util/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.osgi.util/META-INF/MANIFEST.MF
index 682db3790..c15cc8365 100755
--- a/bundles/runtime/org.eclipse.fx.osgi.util/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.osgi.util/META-INF/MANIFEST.MF
@@ -32,9 +32,12 @@ Import-Package: javafx.animation;version="2.0.0",
javafx.scene.web;version="2.0.0",
javafx.stage;version="2.0.0",
javafx.util;version="2.0.0",
+ org.eclipse.equinox.app;version="1.1.0";resolution:=optional,
org.osgi.framework;version="1.6.0",
- org.osgi.framework.wiring;version="1.0.0"
+ org.osgi.framework.wiring;version="1.0.0",
+ org.osgi.service.event;version="1.3.0";resolution:=optional
Export-Package: org.eclipse.fx.osgi.util
Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.fx.core;bundle-version="0.8.1"
+Require-Bundle: org.eclipse.fx.core;bundle-version="0.8.1",
+ org.eclipse.fx.core.databinding;bundle-version="0.8.1";resolution:=optional
Bundle-ActivationPolicy: lazy
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/src/org/eclipse/fx/ui/application/AbstractJFXApplication.java b/bundles/runtime/org.eclipse.fx.osgi.util/src/org/eclipse/fx/osgi/util/AbstractJFXApplication.java
index f7c9d3c0c..820d4f254 100755
--- a/bundles/runtime/org.eclipse.fx.ui.application/src/org/eclipse/fx/ui/application/AbstractJFXApplication.java
+++ b/bundles/runtime/org.eclipse.fx.osgi.util/src/org/eclipse/fx/osgi/util/AbstractJFXApplication.java
@@ -8,7 +8,7 @@
* Contributors:
* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
*******************************************************************************/
-package org.eclipse.fx.ui.application;
+package org.eclipse.fx.osgi.util;
import java.util.HashMap;
import java.util.Map;
@@ -18,7 +18,7 @@ import javafx.stage.Stage;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.fx.ui.databinding.JFXRealm;
+import org.eclipse.fx.core.databinding.JFXRealm;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/.classpath b/bundles/runtime/org.eclipse.fx.ui.application/.classpath
deleted file mode 100755
index b1dabee38..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/.gitignore b/bundles/runtime/org.eclipse.fx.ui.application/.gitignore
deleted file mode 100755
index 4dc009173..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/bin
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/.project b/bundles/runtime/org.eclipse.fx.ui.application/.project
deleted file mode 100755
index 749a256a8..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.fx.ui.application</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.core.resources.prefs b/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index 4824b8026..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.core.runtime.prefs b/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100755
index deae05a97..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.jdt.core.prefs b/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index f42de363a..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.application/META-INF/MANIFEST.MF
deleted file mode 100755
index 51ed30910..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.fx.ui.application
-Bundle-Version: 0.8.1.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.equinox.app;bundle-version="1.3.100",
- org.eclipse.core.databinding;bundle-version="1.4.0",
- org.eclipse.osgi.services;bundle-version="3.3.0",
- org.eclipse.osgi;bundle-version="3.7.0",
- org.eclipse.equinox.event;bundle-version="1.2.0",
- org.eclipse.equinox.ds;bundle-version="1.3.0",
- org.eclipse.fx.ui.databinding;bundle-version="0.8.1"
-Import-Package: javafx.animation;version="2.0.0",
- javafx.application;version="2.0.0",
- javafx.beans;version="2.0.0",
- javafx.beans.binding;version="2.0.0",
- javafx.beans.property;version="2.0.0",
- javafx.beans.value;version="2.0.0",
- javafx.collections;version="2.0.0",
- javafx.concurrent;version="2.0.0",
- javafx.embed.swing;version="2.0.0",
- javafx.event;version="2.0.0",
- javafx.fxml;version="2.0.0",
- javafx.geometry;version="2.0.0",
- javafx.scene;version="2.0.0",
- javafx.scene.chart;version="2.0.0",
- javafx.scene.control;version="2.0.0",
- javafx.scene.control.cell;version="2.0.0",
- javafx.scene.effect;version="2.0.0",
- javafx.scene.image;version="2.0.0",
- javafx.scene.input;version="2.0.0",
- javafx.scene.layout;version="2.0.0",
- javafx.scene.media;version="2.0.0",
- javafx.scene.paint;version="2.0.0",
- javafx.scene.shape;version="2.0.0",
- javafx.scene.text;version="2.0.0",
- javafx.scene.transform;version="2.0.0",
- javafx.scene.web;version="2.0.0",
- javafx.stage;version="2.0.0",
- javafx.util;version="2.0.0"
-Export-Package: org.eclipse.fx.ui.application
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/OSGI-INF/l10n/bundle.properties b/bundles/runtime/org.eclipse.fx.ui.application/OSGI-INF/l10n/bundle.properties
deleted file mode 100755
index 935c54650..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.fx.application
-Bundle-Vendor = BestSolution.at
-Bundle-Name = JavaFX OSGi Application \ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/about.html b/bundles/runtime/org.eclipse.fx.ui.application/about.html
deleted file mode 100755
index ecd1378e9..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 2, 2006</p>
-<h3>License</h3>
-
-<p>The BestSolution.at makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the BestSolution.at, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/build.properties b/bundles/runtime/org.eclipse.fx.ui.application/build.properties
deleted file mode 100755
index bad151d65..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- OSGI-INF/
diff --git a/bundles/runtime/org.eclipse.fx.ui.application/pom.xml b/bundles/runtime/org.eclipse.fx.ui.application/pom.xml
deleted file mode 100755
index 510cda704..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.application/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<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>e(fx)clipse - Runtime - Equinox Application Support</name>
- <groupId>org.eclipse.fx.runtime</groupId>
- <artifactId>org.eclipse.fx.ui.application</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <parent>
- <groupId>org.eclipse.fx</groupId>
- <artifactId>releng</artifactId>
- <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.8.1-SNAPSHOT</version>
- </parent>
-
- <build>
- <resources>
- <!-- to ensure that the feature lookup of the ui test works -->
- <resource>
- <directory>.</directory>
- <includes>
- <include>META-INF/</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project> \ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF
index c56931d7e..77a8fa429 100755
--- a/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.e4.core.contexts;bundle-version="0.9.0",
org.eclipse.e4.core.di;bundle-version="0.9.0",
org.eclipse.fx.osgi.util,
- org.eclipse.fx.ui.application;bundle-version="0.8.1",
org.eclipse.fx.core;bundle-version="0.8.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.0.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java b/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java
index 153162d39..21f55be17 100755
--- a/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java
+++ b/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java
@@ -22,8 +22,8 @@ import org.eclipse.e4.core.contexts.ContextInjectionFactory;
import org.eclipse.e4.core.contexts.EclipseContextFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.equinox.app.IApplicationContext;
+import org.eclipse.fx.osgi.util.AbstractJFXApplication;
import org.eclipse.fx.osgi.util.LoggerCreator;
-import org.eclipse.fx.ui.application.AbstractJFXApplication;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.fx/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.fx/META-INF/MANIFEST.MF
index 7edbbf342..7773e483d 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.fx/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.fx/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
org.eclipse.fx.ui.keybindings.e4;bundle-version="0.8.1",
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.e4.ui.services;bundle-version="0.10.1",
- org.eclipse.fx.ui.application;bundle-version="0.8.1",
org.eclipse.fx.ui.services;bundle-version="0.8.1",
org.eclipse.fx.core;bundle-version="0.8.1",
org.eclipse.fx.ui.di;bundle-version="0.8.1",
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.fx/src/org/eclipse/fx/ui/workbench/fx/E4Application.java b/bundles/runtime/org.eclipse.fx.ui.workbench.fx/src/org/eclipse/fx/ui/workbench/fx/E4Application.java
index 48a88a434..faf4fc50a 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.fx/src/org/eclipse/fx/ui/workbench/fx/E4Application.java
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.fx/src/org/eclipse/fx/ui/workbench/fx/E4Application.java
@@ -68,8 +68,8 @@ import org.eclipse.e4.ui.workbench.modeling.EPlaceholderResolver;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.equinox.app.IApplicationContext;
+import org.eclipse.fx.osgi.util.AbstractJFXApplication;
import org.eclipse.fx.osgi.util.LoggerCreator;
-import org.eclipse.fx.ui.application.AbstractJFXApplication;
import org.eclipse.fx.ui.workbench.fx.internal.LoggerProviderImpl;
import org.eclipse.fx.ui.workbench.fx.internal.WorkbenchJFXActivator;
import org.eclipse.osgi.service.datalocation.Location;
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
index 3b953e925..e7ce210e4 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
@@ -64,7 +64,6 @@ RobotTask {
}
// Required bundles of the project
requiredBundles = {
- "org.eclipse.fx.ui.application",
"org.eclipse.fx.ui.workbench.fx",
"org.eclipse.e4.ui.model.workbench",
"org.eclipse.e4.core.services",
@@ -193,7 +192,6 @@ RobotTask {
vendor = "${BundleProject_bundleVendor}"
plugins = {
"${BundleProject_bundleId}",
- "org.eclipse.fx.ui.application",
"org.eclipse.fx.ui.keybindings",
"org.eclipse.fx.ui.keybindings.e4",
"org.eclipse.fx.ui.keybindings.generic",
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask
index be90289d7..7676f73c0 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask
@@ -48,7 +48,6 @@ RobotTask {
}
// Required bundles of the project
requiredBundles = {
- "org.eclipse.fx.ui.application",
"org.eclipse.fx.ui.workbench.fx",
"org.eclipse.e4.ui.model.workbench",
"org.eclipse.e4.core.services",
@@ -231,7 +230,6 @@ RobotTask {
vendor = "${BundleProject_bundleVendor}"
plugins = {
"${BundleProject_bundleId}",
- "org.eclipse.fx.ui.application",
"org.eclipse.fx.ui.keybindings",
"org.eclipse.fx.ui.keybindings.e4",
"org.eclipse.fx.ui.keybindings.generic",
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask b/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
index af27c5ca2..6dcd0a6c8 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
@@ -65,7 +65,7 @@ RobotTask {
}
requiredBundles = {
"org.eclipse.fx.javafx",
- "org.eclipse.fx.ui.application",
+ "org.eclipse.fx.osgi.util",
"org.eclipse.fx.core.databinding",
"org.eclipse.fx.ui.databinding",
"org.eclipse.fx.ui.di" excluded-if "javascript" /# !EclipseDI; #/,
@@ -212,9 +212,7 @@ RobotTask {
"${BundleProject_bundleId}",
fragment "org.eclipse.fx.osgi",
"org.eclipse.fx.javafx",
- "org.eclipse.fx.ui.application",
"org.eclipse.fx.core.databinding",
- "org.eclipse.fx.ui.application",
"org.eclipse.fx.ui.di" excluded-if "javascript" /# !EclipseDI; #/,
"org.eclipse.fx.core" excluded-if "javascript" /# !EclipseDI; #/,
"org.eclipse.fx.osgi.util" excluded-if "javascript" /# !EclipseDI; #/,
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/FXOSGiAppTemplate.java b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/FXOSGiAppTemplate.java
index e2bb93b72..cf6218252 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/FXOSGiAppTemplate.java
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/FXOSGiAppTemplate.java
@@ -220,7 +220,6 @@ public class FXOSGiAppTemplate extends FXPDETemplateSection {
l.addAll(Arrays.asList(model.getPluginBase().getId(),
"org.eclipse.fx.osgi",
"org.eclipse.fx.javafx",
- "org.eclipse.fx.ui.application",
"org.eclipse.fx.core.databinding",
"org.eclipse.fx.ui.databinding",
"org.eclipse.core.databinding",
@@ -256,10 +255,9 @@ public class FXOSGiAppTemplate extends FXPDETemplateSection {
}
public IPluginReference[] getDependencies(String schemaVersion) {
- IPluginReference[] dep = new IPluginReference[3];
+ IPluginReference[] dep = new IPluginReference[2];
dep[0] = new PluginReference("org.eclipse.equinox.app", null, 0); //$NON-NLS-1$
dep[1] = new PluginReference("org.eclipse.osgi", null, 0); //$NON-NLS-1$
- dep[2] = new PluginReference("org.eclipse.fx.ui.application", null, 0); //$NON-NLS-1$
return dep;
}
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java
index 1df972959..4d6899a9f 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java
@@ -69,7 +69,6 @@ public class JemmyLaunchDef extends BasicLaunchDef {
public static Collection<PluginLaunchDef> getTargetPluginsE4() {
Set<PluginLaunchDef> l = new HashSet<PluginLaunchDef>();
l.addAll(getTargetPluginsOSGi());
- l.add(new PluginLaunchDef("org.eclipse.fx.ui.application"));
l.add(new PluginLaunchDef("org.eclipse.fx.ui.keybindings.e4"));
l.add(new PluginLaunchDef("org.eclipse.fx.ui.keybindings.generic"));
l.add(new PluginLaunchDef("org.eclipse.fx.ui.keybindings"));
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/OSGiLaunchDef.java b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/OSGiLaunchDef.java
index 5300bd6ed..971098d1f 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/OSGiLaunchDef.java
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/OSGiLaunchDef.java
@@ -16,7 +16,6 @@ import java.util.Set;
public class OSGiLaunchDef extends BasicLaunchDef {
public static Set<PluginLaunchDef> getTargetDefinitions() {
Set<PluginLaunchDef> set = new HashSet<PluginLaunchDef>();
- set.add(PluginLaunchDef.parse("org.eclipse.fx.ui.application@default:default"));
set.add(PluginLaunchDef.parse("org.eclipse.fx.core.databinding@default:default"));
set.add(PluginLaunchDef.parse("org.eclipse.fx.ui.databinding@default:default"));
set.add(PluginLaunchDef.parse("org.eclipse.fx.javafx@default:default"));
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/wizard/app/tpl/ApplicationClassTpl.xtend b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/wizard/app/tpl/ApplicationClassTpl.xtend
index 20fa467af..90fcef28e 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/wizard/app/tpl/ApplicationClassTpl.xtend
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/wizard/app/tpl/ApplicationClassTpl.xtend
@@ -22,7 +22,7 @@ import javafx.application.Application;
import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.fx.ui.application.AbstractJFXApplication;
+import org.eclipse.fx.osgi.util.AbstractJFXApplication;
public class MainApplication extends AbstractJFXApplication {
protected void jfxStart(IApplicationContext applicationContext, Application jfxApplication, Stage primaryStage) {
diff --git a/demos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF
index 6eaf39f84..e98a0ed7f 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.fx.demo.contacts.app;singleton:=true
Bundle-Version: 0.9.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.fx.ui.application,
org.eclipse.fx.ui.workbench.fx,
javax.inject;bundle-version="1.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
diff --git a/demos/org.eclipse.fx.demo.contacts.app/contacts.product b/demos/org.eclipse.fx.demo.contacts.app/contacts.product
index 5b3be890c..403cd19bc 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/contacts.product
+++ b/demos/org.eclipse.fx.demo.contacts.app/contacts.product
@@ -80,7 +80,6 @@
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.fx.ui.dialogs"/>
diff --git a/demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch b/demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch
index 8c085ce11..5bd2420de 100644
--- a/demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch
+++ b/demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.contacts.app.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.contacts.app/contacts.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.demo.contacts@default:default,org.eclipse.fx.emf.databinding@default:default,org.eclipse.fx.emf.edit.ui@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.demo.contacts@default:default,org.eclipse.fx.emf.databinding@default:default,org.eclipse.fx.emf.edit.ui@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.e4/E4JFX.product b/demos/org.eclipse.fx.demo.e4/E4JFX.product
index a01a5ec82..c13dc6930 100755
--- a/demos/org.eclipse.fx.demo.e4/E4JFX.product
+++ b/demos/org.eclipse.fx.demo.e4/E4JFX.product
@@ -70,7 +70,6 @@
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.fx.ui.dialogs"/>
diff --git a/demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch b/demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch
index fafe84707..c6ebf62d3 100644
--- a/demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch
+++ b/demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.e4.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.e4/E4JFX.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.e4@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.e4@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product b/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product
index 96f841965..cfb311814 100755
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product
@@ -46,7 +46,6 @@
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.services"/>
diff --git a/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch b/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch
index dba9371b5..87e70d450 100644
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.fxgraph.osgi.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.fxgraph.osgi/FXML.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.inject@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.fxgraph.osgi@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.fxgraph.osgi@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.databinding@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF
index 957a75713..3888cf603 100755
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.fx.demo.fxgraph.osgi; singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.demo.fxgraph.osgi.Activator
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.fx.ui.application,
org.eclipse.fx.osgi.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.0.0",
diff --git a/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java b/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java
index 596ad41f2..65944b9e3 100755
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java
@@ -7,8 +7,8 @@ import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.fx.demo.fxgraph.osgi.model.User;
import org.eclipse.fx.demo.fxgraph.osgi.security.Authenticator;
+import org.eclipse.fx.osgi.util.AbstractJFXApplication;
import org.eclipse.fx.osgi.util.OSGiFXMLLoader;
-import org.eclipse.fx.ui.application.AbstractJFXApplication;
import javafx.fxml.FXMLLoader;
import javafx.fxml.JavaFXBuilderFactory;
diff --git a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product
index 90ae6d9f6..69cedddb8 100755
--- a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product
+++ b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product
@@ -59,7 +59,6 @@
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
<plugin id="org.eclipse.fx.ui.animation"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.fx.ui.dialogs"/>
diff --git a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch
index 2845025f7..5e848b69f 100644
--- a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch
+++ b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.media.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.commons.logging@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.media@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.animation@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.media@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.animation@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.osgi.di/Di.product.product b/demos/org.eclipse.fx.demo.osgi.di/Di.product.product
index 460e6c6fc..62feea630 100755
--- a/demos/org.eclipse.fx.demo.osgi.di/Di.product.product
+++ b/demos/org.eclipse.fx.demo.osgi.di/Di.product.product
@@ -50,7 +50,6 @@
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.osgi"/>
diff --git a/demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch b/demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch
index 1e63584b5..aeef606ed 100644
--- a/demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch
+++ b/demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.osgi.di.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.osgi.di/Di.product.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.osgi.di@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.osgi.di@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF
index 0029d7bcb..a03838249 100755
--- a/demos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.fx.demo.osgi;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.demo.osgi.Activator
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.fx.ui.application
+ org.eclipse.fx.osgi.util
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.0.0",
diff --git a/demos/org.eclipse.fx.demo.osgi/OSGiApp.product b/demos/org.eclipse.fx.demo.osgi/OSGiApp.product
index 84b5c5772..9db1ca40d 100755
--- a/demos/org.eclipse.fx.demo.osgi/OSGiApp.product
+++ b/demos/org.eclipse.fx.demo.osgi/OSGiApp.product
@@ -44,7 +44,6 @@
<plugin id="org.eclipse.fx.demo.osgi"/>
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.services"/>
diff --git a/demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch b/demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch
index f4ace3cad..aed3642ae 100644
--- a/demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch
+++ b/demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.osgi.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.osgi/OSGiApp.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.inject@default:default,javax.servlet@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.osgi@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.osgi@default:default,org.eclipse.fx.ui.databinding@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java b/demos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java
index da7951baf..1035ca9f3 100755
--- a/demos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java
+++ b/demos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java
@@ -20,7 +20,7 @@ import javafx.stage.Stage;
import javafx.util.Duration;
import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.fx.ui.application.AbstractJFXApplication;
+import org.eclipse.fx.osgi.util.AbstractJFXApplication;
/**
* This class controls all aspects of the application's execution
diff --git a/releng/org.eclipse.fx.releng/pom.xml b/releng/org.eclipse.fx.releng/pom.xml
index 3206005d4..a4e2da6ba 100755
--- a/releng/org.eclipse.fx.releng/pom.xml
+++ b/releng/org.eclipse.fx.releng/pom.xml
@@ -34,7 +34,6 @@
<module>../../bundles/runtime/org.eclipse.fx.core.guice</module>
<!-- UI Modules -->
<module>../../bundles/runtime/org.eclipse.fx.ui.databinding</module>
- <module>../../bundles/runtime/org.eclipse.fx.ui.application</module>
<module>../../bundles/runtime/org.eclipse.fx.ui.di</module>
<!-- module>../../bundles/runtime/org.eclipse.fx.ui.di.interopt</module-->
<module>../../bundles/runtime/org.eclipse.fx.ui.animation</module>
diff --git a/releng/runtime/org.eclipse.fx.target.feature/feature.xml b/releng/runtime/org.eclipse.fx.target.feature/feature.xml
index 0e4ac7145..d51fa1f37 100644
--- a/releng/runtime/org.eclipse.fx.target.feature/feature.xml
+++ b/releng/runtime/org.eclipse.fx.target.feature/feature.xml
@@ -25,13 +25,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.fx.ui.application"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.fx.ui.keybindings"
download-size="0"
install-size="0"
@@ -192,13 +185,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.fx.ui.application.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.fx.ui.keybindings.source"
download-size="0"
install-size="0"
diff --git a/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF b/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
index 189139c45..da436c12e 100755
--- a/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
+++ b/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.fx.testcases.e4;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.eclipse.fx.testcases.e4.Activator
Require-Bundle: javax.inject;bundle-version="1.0.0",
- org.eclipse.fx.ui.application,
org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1",
org.eclipse.e4.core.services;bundle-version="1.0.0",
org.eclipse.e4.core.di;bundle-version="1.1.0",
diff --git a/testcases/org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.product b/testcases/org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.product
index ea392a7b0..7a55bd169 100755
--- a/testcases/org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.product
+++ b/testcases/org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.product
@@ -69,7 +69,6 @@
<plugin id="org.eclipse.fx.osgi.util"/>
<plugin id="org.eclipse.fx.testcases.e4"/>
<plugin id="org.eclipse.fx.ui.animation"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.fx.ui.dialogs"/>

Back to the top