[javafx] Update project dependencies and application model

Change product configuration to use the fx bundles
Migrate Logger to org.eclipse.fx.core.log.Logger

de.emsw.e4.migration/TestApp.e4xmi

@@ -37,10 +37,10 @@
   <commands xmi:id="_1lLHsNO4EeSTQcfhQVYxwA" elementId="de.emsw.e4.migration.command.dialog" commandName="Dialog"/>
   <addons xmi:id="_-eCoJFk6EeCKVNZqayYw8w" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
   <addons xmi:id="_-eCoJVk6EeCKVNZqayYw8w" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
-  <addons xmi:id="_-eCoJlk6EeCKVNZqayYw8w" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
   <addons xmi:id="_-eCoJ1k6EeCKVNZqayYw8w" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
   <addons xmi:id="_-eCoKFk6EeCKVNZqayYw8w" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
   <addons xmi:id="_MkiIIOk8EeKIpMnkiu8aUQ" elementId="org.eclipse.e4.ui.workbench.handler.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
-  <addons xmi:id="_-eCoKVk6EeCKVNZqayYw8w" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
+  <addons xmi:id="_NTMOgNLwEeSTQcfhQVYxwA" elementId="org.eclipse.fx.ui.keybindings.e4.service" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingServiceAddon"/>
+  <addons xmi:id="_XtRAsNLwEeSTQcfhQVYxwA" elementId="org.eclipse.fx.ui.keybindings.e4.model" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingProcessingAddon"/>
   <addons xmi:id="_nmHfsNRkEeSTQcfhQVYxwA" elementId="de.emsw.e4.migration.addon.maximize" contributionURI="bundleclass://de.emsw.e4.migration/de.emsw.e4.migration.addon.MaximizeAddon"/>
 </application:Application>

de.emsw.e4.migration/e4migration.product

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="e4 Migration Test App" uid="de.emsw.gosa.product.test.export" id="de.emsw.e4.migration.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0" useFeatures="false" includeLaunchers="true">
+<product name="e4 Migration Test App" uid="de.emsw.gosa.product.test.export" id="de.emsw.e4.migration.product" application="org.eclipse.fx.ui.workbench.fx.application" version="1.0.0" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
 
    <launcherArgs>
+      <vmArgs>-Dorg.osgi.framework.bundle.parent=ext
+      </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
@@ -27,12 +29,9 @@
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="javax.xml"/>
-      <plugin id="org.apache.batik.css"/>
-      <plugin id="org.apache.batik.util"/>
-      <plugin id="org.apache.batik.util.gui"/>
+      <plugin id="org.apache.commons.lang"/>
       <plugin id="org.eclipse.core.commands"/>
       <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
       <plugin id="org.eclipse.core.databinding.observable"/>
       <plugin id="org.eclipse.core.databinding.property"/>
       <plugin id="org.eclipse.core.expressions"/>
@@ -43,19 +42,10 @@
       <plugin id="org.eclipse.e4.core.di"/>
       <plugin id="org.eclipse.e4.core.di.extensions"/>
       <plugin id="org.eclipse.e4.core.services"/>
-      <plugin id="org.eclipse.e4.ui.bindings"/>
-      <plugin id="org.eclipse.e4.ui.css.core"/>
-      <plugin id="org.eclipse.e4.ui.css.swt"/>
-      <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
       <plugin id="org.eclipse.e4.ui.di"/>
       <plugin id="org.eclipse.e4.ui.model.workbench"/>
       <plugin id="org.eclipse.e4.ui.services"/>
-      <plugin id="org.eclipse.e4.ui.widgets"/>
       <plugin id="org.eclipse.e4.ui.workbench"/>
-      <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench3"/>
       <plugin id="org.eclipse.emf.common"/>
       <plugin id="org.eclipse.emf.ecore"/>
       <plugin id="org.eclipse.emf.ecore.change"/>
@@ -67,18 +57,34 @@
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
       <plugin id="org.eclipse.equinox.util"/>
+      <plugin id="org.eclipse.fx.core"/>
+      <plugin id="org.eclipse.fx.core.databinding"/>
+      <plugin id="org.eclipse.fx.core.di"/>
+      <plugin id="org.eclipse.fx.core.di.context"/>
+      <plugin id="org.eclipse.fx.core.fxml"/>
+      <plugin id="org.eclipse.fx.osgi.util"/>
+      <plugin id="org.eclipse.fx.runtime.swt"/>
+      <plugin id="org.eclipse.fx.runtime.swt.e4"/>
+      <plugin id="org.eclipse.fx.ui.animation"/>
+      <plugin id="org.eclipse.fx.ui.controls"/>
+      <plugin id="org.eclipse.fx.ui.di"/>
+      <plugin id="org.eclipse.fx.ui.dialogs"/>
+      <plugin id="org.eclipse.fx.ui.keybindings"/>
+      <plugin id="org.eclipse.fx.ui.keybindings.e4"/>
+      <plugin id="org.eclipse.fx.ui.keybindings.generic"/>
+      <plugin id="org.eclipse.fx.ui.panes"/>
+      <plugin id="org.eclipse.fx.ui.services"/>
+      <plugin id="org.eclipse.fx.ui.theme"/>
+      <plugin id="org.eclipse.fx.ui.workbench.base"/>
+      <plugin id="org.eclipse.fx.ui.workbench.fx"/>
+      <plugin id="org.eclipse.fx.ui.workbench.renderers.base"/>
+      <plugin id="org.eclipse.fx.ui.workbench.renderers.fx"/>
+      <plugin id="org.eclipse.fx.ui.workbench.services"/>
       <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
       <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.w3c.css.sac"/>
-      <plugin id="org.w3c.dom.events"/>
-      <plugin id="org.w3c.dom.smil"/>
-      <plugin id="org.w3c.dom.svg"/>
    </plugins>
 
 

de.emsw.e4.migration/plugin.xml

@@ -5,16 +5,12 @@
          id="product"
          point="org.eclipse.core.runtime.products">
       <product
-            application="org.eclipse.e4.ui.workbench.swt.E4Application"
+            application="org.eclipse.fx.ui.workbench.fx.application"
             name="e4 Migration Test App">
          <property
                name="appName"
                value="e4 Migration Test App">
          </property>
-         <property
-               name="applicationCSS"
-               value="platform:/plugin/de.emsw.e4.migration/css/default.css">
-         </property>
          <property
                name="lifeCycleURI"
                value="bundleclass://de.emsw.e4.migration/de.emsw.e4.migration.AppLifeCycle">