Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2014-02-03 13:52:55 -0500
committerTom Schindl2014-02-03 18:04:09 -0500
commit4dd1f873961389e214d36b1665a54be35c1a78a0 (patch)
tree9acbb5d9e23b9054299711638bde42f699743ed9
parentb2fcaa674325c4242cfa1772b455bc6d53d44794 (diff)
downloadorg.eclipse.efxclipse-4dd1f873961389e214d36b1665a54be35c1a78a0.tar.gz
org.eclipse.efxclipse-4dd1f873961389e214d36b1665a54be35c1a78a0.tar.xz
org.eclipse.efxclipse-4dd1f873961389e214d36b1665a54be35c1a78a0.zip
Bug 421141 - Runtime integration for Luna
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.databinding/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.databinding/pom.xml2
-rw-r--r--bundles/runtime/org.eclipse.fx.core.di.context/.gitignore1
-rw-r--r--bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.di.context/pom.xml2
-rw-r--r--bundles/runtime/org.eclipse.fx.core.di/.gitignore1
-rw-r--r--bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.di/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.guice/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.guice/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.log4j/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.p2/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.p2/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF3
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core/build.properties2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.emf.databinding/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.emf.databinding/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.emf.edit.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.emf.edit.ui/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.formats.svg/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.formats.svg/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.javafx/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi.util/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi.util/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/META-INF/MANIFEST.MF4
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/hookconfigurators.properties2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/pom.xml2
-rw-r--r--[-rwxr-xr-x]bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoader.java929
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoaderDelegate.java84
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoadingConfigurator.java46
-rw-r--r--bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassloaderConfigurator.java14
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFAdaptorHook.java154
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFBundleFile.java195
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFBundleWrapper.java41
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFConfigurator.java61
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFStorageHook.java151
-rwxr-xr-xbundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PatchListener.java52
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.animation/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.animation/pom.xml2
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/.classpath1
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/ETabFolder.java70
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.databinding/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.databinding/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.di.interopt/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.di/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.dialogs/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.dialogs/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.keybindings.e4/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.keybindings.generic/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.keybindings/pom.xml2
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.lifecycle/META-INF/MANIFEST.MF2
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.lifecycle/pom.xml2
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.mobile/.gitignore1
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.mobile/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.mobile/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.panes/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.panes/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.services/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.services/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.theme/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.theme/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.base/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.fx/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.fx/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/pom.xml2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench3/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench3/pom.xml2
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ant/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.converter/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.jfx/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.jfx/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml2
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.fxml/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.java6/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.model/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/.classpath7
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/.gitignore2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/.project28
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.core.resources.prefs2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.core.runtime.prefs2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.jdt.core.prefs7
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/META-INF/MANIFEST.MF11
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/OSGI-INF/l10n/bundle.properties3
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/about.html28
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/build.properties6
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/pom.xml34
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.adapter/src/org/eclipse/pde/core/IClasspathContributor.java58
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/.classpath7
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/.gitignore2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/.project28
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.pde.fragment/.project.swpbin12288 -> 0 bytes
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.core.resources.prefs2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.core.runtime.prefs2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.jdt.core.prefs7
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/IP-TODO.txt1
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/META-INF/MANIFEST.MF12
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/OSGI-INF/l10n/bundle.properties3
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/about.html28
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/build.properties7
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/fragment.xml6
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/pom.xml34
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/schema/pluginClasspathContributors.exsd119
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.fragment/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java510
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF3
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF5
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml2
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml2
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.ui/pom.xml2
-rwxr-xr-xdemos/org.eclipse.fx.demo.charts/build.fxbuild2
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF2
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch6
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch4
-rwxr-xr-xdemos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/profile.fxml2
-rwxr-xr-xdemos/org.eclipse.fx.demo.fxgraph/src/org/eclipse/fx/demo/fxgraph/profile.fxml2
-rwxr-xr-xdemos/org.eclipse.fx.demo.logo/build.fxbuild2
-rw-r--r--demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch34
-rw-r--r--demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch4
-rw-r--r--releng/org.eclipse.fx.ide.compiler.releng/build.xml8
-rwxr-xr-xreleng/org.eclipse.fx.ide.releng/pom.xml20
-rw-r--r--releng/org.eclipse.fx.ide.updatesite/pom.xml2
-rw-r--r--releng/org.eclipse.fx.ide.updatesite/site.xml22
-rwxr-xr-xreleng/org.eclipse.fx.releng/pom.xml6
-rw-r--r--releng/org.eclipse.fx.updatesite/pom.xml2
-rw-r--r--releng/org.eclipse.fx.updatesite/site.xml6
-rw-r--r--releng/runtime/org.eclipse.fx.core.feature/feature.xml2
-rw-r--r--releng/runtime/org.eclipse.fx.core.feature/pom.xml2
-rw-r--r--releng/runtime/org.eclipse.fx.target.feature/feature.xml2
-rw-r--r--releng/runtime/org.eclipse.fx.target.feature/pom.xml2
-rw-r--r--releng/runtime/org.eclipse.fx.target.rcp.feature/feature.xml2
-rw-r--r--releng/runtime/org.eclipse.fx.target.rcp.feature/pom.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/.gitignore1
-rw-r--r--releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/.project17
-rw-r--r--releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/build.properties1
-rw-r--r--releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/feature.xml118
-rw-r--r--releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/pom.xml16
-rw-r--r--releng/tooling/org.eclipse.fx.ide.basic.feature/feature.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.basic.feature/pom.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.converter.feature/feature.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.converter.feature/pom.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.css.feature/feature.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.css.feature/pom.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.feature/.gitignore (renamed from releng/tooling/org.eclipse.fx.ide.all.kepler.feature/.gitignore)0
-rw-r--r--releng/tooling/org.eclipse.fx.ide.feature/.project (renamed from releng/tooling/org.eclipse.fx.ide.all.kepler.feature/.project)2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.feature/build.properties (renamed from releng/tooling/org.eclipse.fx.ide.all.kepler.feature/build.properties)0
-rw-r--r--releng/tooling/org.eclipse.fx.ide.feature/feature.xml (renamed from releng/tooling/org.eclipse.fx.ide.all.kepler.feature/feature.xml)4
-rw-r--r--releng/tooling/org.eclipse.fx.ide.feature/pom.xml (renamed from releng/tooling/org.eclipse.fx.ide.all.kepler.feature/pom.xml)6
-rw-r--r--releng/tooling/org.eclipse.fx.ide.fxgraph.feature/feature.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.fxgraph.feature/pom.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.fxml.feature/feature.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.fxml.feature/pom.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.mobile.feature/feature.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.mobile.feature/pom.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.pde.feature/feature.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.pde.feature/pom.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/.gitignore1
-rw-r--r--releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/.project17
-rw-r--r--releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/build.properties1
-rw-r--r--releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/feature.xml125
-rw-r--r--releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/pom.xml16
-rw-r--r--releng/tooling/org.eclipse.fx.ide.rrobot.feature/feature.xml2
-rw-r--r--releng/tooling/org.eclipse.fx.ide.rrobot.feature/pom.xml2
212 files changed, 727 insertions, 2762 deletions
diff --git a/bundles/runtime/org.eclipse.fx.core.databinding/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.databinding/META-INF/MANIFEST.MF
index cdedeb62a..3ed1b61b0 100755
--- a/bundles/runtime/org.eclipse.fx.core.databinding/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.databinding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.core.databinding
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.databinding.observable;bundle-version="1.4.0",
org.eclipse.core.databinding.property;bundle-version="1.4.0",
diff --git a/bundles/runtime/org.eclipse.fx.core.databinding/pom.xml b/bundles/runtime/org.eclipse.fx.core.databinding/pom.xml
index 61cb01ec7..891da98f0 100755
--- a/bundles/runtime/org.eclipse.fx.core.databinding/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.core.databinding/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/.gitignore b/bundles/runtime/org.eclipse.fx.core.di.context/.gitignore
index 5e56e040e..934e0e06f 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/.gitignore
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/.gitignore
@@ -1 +1,2 @@
/bin
+/target
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF
index 327b13d5c..110888538 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Context
Bundle-SymbolicName: org.eclipse.fx.core.di.context
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.fx.core.di;bundle-version="0.9.0",
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/pom.xml b/bundles/runtime/org.eclipse.fx.core.di.context/pom.xml
index 8cf2d73fa..a8876834e 100755
--- a/bundles/runtime/org.eclipse.fx.core.di.context/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.core.di/.gitignore b/bundles/runtime/org.eclipse.fx.core.di/.gitignore
index 5e56e040e..934e0e06f 100644
--- a/bundles/runtime/org.eclipse.fx.core.di/.gitignore
+++ b/bundles/runtime/org.eclipse.fx.core.di/.gitignore
@@ -1 +1,2 @@
/bin
+/target
diff --git a/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
index 84b426b99..8612a7346 100644
--- a/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Di
Bundle-SymbolicName: org.eclipse.fx.core.di
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Import-Package: javax.inject;version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.fx.core;bundle-version="0.9.0"
diff --git a/bundles/runtime/org.eclipse.fx.core.di/pom.xml b/bundles/runtime/org.eclipse.fx.core.di/pom.xml
index 3a263926f..009f8d4c1 100755
--- a/bundles/runtime/org.eclipse.fx.core.di/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.core.di/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.core.guice/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.guice/META-INF/MANIFEST.MF
index 0fc0f9998..55ade3cf1 100755
--- a/bundles/runtime/org.eclipse.fx.core.guice/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.guice/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.core.guice
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: com.google.inject;bundle-version="2.0.0",
org.eclipse.fx.core;bundle-version="0.9.0",
org.eclipse.osgi;bundle-version="3.7.2";resolution:=optional
diff --git a/bundles/runtime/org.eclipse.fx.core.guice/pom.xml b/bundles/runtime/org.eclipse.fx.core.guice/pom.xml
index 513549b05..0c6ffd594 100755
--- a/bundles/runtime/org.eclipse.fx.core.guice/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.core.guice/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF
index 0efbcbfc5..7a8a3c10c 100755
--- a/bundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.core.log4j
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Require-Bundle: org.apache.log4j;bundle-version="1.2.15",
diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/pom.xml b/bundles/runtime/org.eclipse.fx.core.log4j/pom.xml
index dc7d147a9..fd411f488 100755
--- a/bundles/runtime/org.eclipse.fx.core.log4j/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.core.p2/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.p2/META-INF/MANIFEST.MF
index e72cdbeed..0e54cf84a 100755
--- a/bundles/runtime/org.eclipse.fx.core.p2/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.p2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: P2
Bundle-SymbolicName: org.eclipse.fx.core.p2
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.core.p2.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
diff --git a/bundles/runtime/org.eclipse.fx.core.p2/pom.xml b/bundles/runtime/org.eclipse.fx.core.p2/pom.xml
index e886a12dc..f43bfa307 100755
--- a/bundles/runtime/org.eclipse.fx.core.p2/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.core.p2/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
index ae14b61ef..5f9f46906 100755
--- a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.core
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.2.0",
javafx.application;version="2.2.0",
@@ -47,3 +47,4 @@ Bundle-Vendor: %Bundle-Vendor
Service-Component: OSGI-INF/services/jlogger.xml,
OSGI-INF/services/adapterservice.xml
Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional
diff --git a/bundles/runtime/org.eclipse.fx.core/build.properties b/bundles/runtime/org.eclipse.fx.core/build.properties
index e9c706d29..67344cd64 100755
--- a/bundles/runtime/org.eclipse.fx.core/build.properties
+++ b/bundles/runtime/org.eclipse.fx.core/build.properties
@@ -4,5 +4,3 @@ bin.includes = META-INF/,\
about.html,\
OSGI-INF/
source.. = src/
-additional.bundles = org.eclipse.jdt.annotation
-jars.extra.classpath = platform:/plugin/org.eclipse.jdt.annotation
diff --git a/bundles/runtime/org.eclipse.fx.core/pom.xml b/bundles/runtime/org.eclipse.fx.core/pom.xml
index 73a5c4f84..451ba7d24 100755
--- a/bundles/runtime/org.eclipse.fx.core/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.core/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.emf.databinding/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.emf.databinding/META-INF/MANIFEST.MF
index 654184ec6..6ede61634 100755
--- a/bundles/runtime/org.eclipse.fx.emf.databinding/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.emf.databinding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF Databinding for JavaFX
Bundle-SymbolicName: org.eclipse.fx.emf.databinding
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.2.0",
diff --git a/bundles/runtime/org.eclipse.fx.emf.databinding/pom.xml b/bundles/runtime/org.eclipse.fx.emf.databinding/pom.xml
index b962b597a..262203d18 100755
--- a/bundles/runtime/org.eclipse.fx.emf.databinding/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.emf.databinding/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.emf.edit.ui/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.emf.edit.ui/META-INF/MANIFEST.MF
index 10d02d9b7..d73ee393a 100755
--- a/bundles/runtime/org.eclipse.fx.emf.edit.ui/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.emf.edit.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF Edit UI for JavaFX
Bundle-SymbolicName: org.eclipse.fx.emf.edit.ui
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.2.0",
javafx.application;version="2.2.0",
diff --git a/bundles/runtime/org.eclipse.fx.emf.edit.ui/pom.xml b/bundles/runtime/org.eclipse.fx.emf.edit.ui/pom.xml
index 5907732f3..64e136982 100755
--- a/bundles/runtime/org.eclipse.fx.emf.edit.ui/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.emf.edit.ui/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.formats.svg/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.formats.svg/META-INF/MANIFEST.MF
index 8fb3b2233..4f0c6ec8b 100755
--- a/bundles/runtime/org.eclipse.fx.formats.svg/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.formats.svg/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.fx.formats.svg;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/runtime/org.eclipse.fx.formats.svg/pom.xml b/bundles/runtime/org.eclipse.fx.formats.svg/pom.xml
index 2af08151c..4071c89aa 100755
--- a/bundles/runtime/org.eclipse.fx.formats.svg/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.formats.svg/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.javafx/pom.xml b/bundles/runtime/org.eclipse.fx.javafx/pom.xml
index 51903febb..754983cf0 100755
--- a/bundles/runtime/org.eclipse.fx.javafx/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.javafx/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
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 184b5b8f9..a5853a2e5 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.osgi.util
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.0.0",
javafx.application;version="2.0.0",
diff --git a/bundles/runtime/org.eclipse.fx.osgi.util/pom.xml b/bundles/runtime/org.eclipse.fx.osgi.util/pom.xml
index 8deaf6b77..1d5d0ba1c 100755
--- a/bundles/runtime/org.eclipse.fx.osgi.util/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.osgi.util/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.osgi/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.osgi/META-INF/MANIFEST.MF
index d7c2dbf4b..f9d5b6e01 100755
--- a/bundles/runtime/org.eclipse.fx.osgi/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.osgi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.osgi
-Bundle-Version: 0.9.0.qualifier
-Fragment-Host: org.eclipse.osgi;bundle-version="3.6.0"
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.osgi;bundle-version="3.10.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/runtime/org.eclipse.fx.osgi/hookconfigurators.properties b/bundles/runtime/org.eclipse.fx.osgi/hookconfigurators.properties
index 2289ed19c..3f2e95493 100755
--- a/bundles/runtime/org.eclipse.fx.osgi/hookconfigurators.properties
+++ b/bundles/runtime/org.eclipse.fx.osgi/hookconfigurators.properties
@@ -1 +1 @@
-hook.configurators=org.eclipse.fx.osgi.fxloader.FXClassLoadingConfigurator,org.eclipse.fx.osgi.patch.PFConfigurator \ No newline at end of file
+hook.configurators=org.eclipse.fx.osgi.luna.FXClassloaderConfigurator \ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.osgi/pom.xml b/bundles/runtime/org.eclipse.fx.osgi/pom.xml
index 9c9d0ed2b..0395bc3ab 100755
--- a/bundles/runtime/org.eclipse.fx.osgi/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.osgi/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoader.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoader.java
index f401ebd84..8dd50cacd 100755..100644
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoader.java
+++ b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoader.java
@@ -1,507 +1,422 @@
-/*******************************************************************************
- * Copyright (c) 2012 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.fxloader;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.security.ProtectionDomain;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.osgi.baseadaptor.BaseAdaptor;
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry;
-import org.eclipse.osgi.baseadaptor.hooks.AdaptorHook;
-import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingHook;
-import org.eclipse.osgi.baseadaptor.loader.BaseClassLoader;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathEntry;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathManager;
-import org.eclipse.osgi.framework.adaptor.BundleProtectionDomain;
-import org.eclipse.osgi.framework.adaptor.ClassLoaderDelegate;
-import org.eclipse.osgi.framework.log.FrameworkLog;
-import org.eclipse.osgi.internal.baseadaptor.DefaultClassLoader;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * Hook to overwrite OSGis default classloading
- */
-@SuppressWarnings("deprecation")
-public class FXClassLoader implements ClassLoadingHook, AdaptorHook {
-
- private ServiceTracker<PackageAdmin, PackageAdmin> paTracker;
-
- private ServiceTracker<Location,Location> instanceLocationTracker = null;
-
- private ServiceTracker<?,?> preferenceServiceTracker = null;
-
- private ServiceTracker<Location, Location> installLocation = null;
-
- private BundleContext context = null;
-
- /*
- * Remember the classloader for use in post look ups because of native classloading by javafx' native code
- * See http://javafx-jira.kenai.com/browse/RT-20883
- */
- static MyBundleClassLoader LOADER;
-
- @Override
- public byte[] processClass(String name, byte[] classbytes, ClasspathEntry classpathEntry, BundleEntry entry, ClasspathManager manager) {
- return null;
- }
-
- @Override
- public boolean addClassPathEntry(ArrayList<ClasspathEntry> cpEntries, String cp, ClasspathManager hostmanager, BaseData sourcedata, ProtectionDomain sourcedomain) {
- return false;
- }
-
- @Override
- public String findLibrary(BaseData data, String libName) {
- return null;
- }
-
- @Override
- public ClassLoader getBundleClassLoaderParent() {
- return null;
- }
-
- @Override
- public BaseClassLoader createClassLoader(ClassLoader parent, final ClassLoaderDelegate delegate, BundleProtectionDomain domain, BaseData data, String[] bundleclasspath) {
- if (data.getBundle().getSymbolicName().equals("org.eclipse.fx.javafx")) { //$NON-NLS-1$
- try {
- MyBundleClassLoader cl = new MyBundleClassLoader(getPackageAdmin(), parent, delegate, domain, data, bundleclasspath, this.context);
- LOADER = cl;
- return cl;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return null;
- }
-
- @Override
- public void initializedClassLoader(BaseClassLoader baseClassLoader, BaseData data) {
- //NOTHING to be done
- }
-
- static class MyBundleClassLoader extends DefaultClassLoader {
- private URLClassLoader fxClassLoader;
- private boolean swtAvailable;
- private boolean implicitExitSet;
-
- public MyBundleClassLoader(PackageAdmin admin, ClassLoader parent, ClassLoaderDelegate delegate, ProtectionDomain domain, BaseData bundledata, String[] classpath, BundleContext context) throws Exception {
- super(parent, delegate, domain, bundledata, classpath);
-
- ClassLoader parentLoader = parent;
- // Trying to locate swt bundle so that if the swt integration is
- // used
- // we can load those
- Bundle[] bundles = admin.getBundles("org.eclipse.swt", null); //$NON-NLS-1$
-
- if (bundles != null) {
- for (int i = 0; i < bundles.length; i++) {
- if ((bundles[i].getState() & Bundle.INSTALLED) == 0) {
- // Ensure the bundle is started else we are unable to
- // extract the
- // classloader
- if ((bundles[i].getState() & Bundle.ACTIVE) != 0) {
- bundles[i].start();
- }
- parentLoader = bundles[i].adapt(BundleWiring.class).getClassLoader();
- this.swtAvailable = true;
- break;
- }
- }
- }
-
- this.fxClassLoader = createClassloader(parentLoader, admin, bundledata, context, this.swtAvailable);
- }
-
- private static URLClassLoader createJREBundledClassloader(ClassLoader parent, boolean swtAvailable) {
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - Started"); //$NON-NLS-1$
- }
-
- try {
- File javaHome;
- try {
- javaHome= new File (System.getProperty("java.home")).getCanonicalFile(); //$NON-NLS-1$
- } catch (IOException e) {
- throw new IllegalStateException("Unable to locate java home", e); //$NON-NLS-1$
- }
- if (!javaHome.exists()) {
- throw new IllegalStateException("The java home '"+javaHome.getAbsolutePath()+"' does not exits"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- // Java 8 and maybe one day Java 7
- File jarFile = new File(new File(new File(javaHome.getAbsolutePath(),"lib"),"ext"),"jfxrt.jar"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - Assumed location (Java 8/Java 7): " + jarFile.getAbsolutePath()); //$NON-NLS-1$
- }
-
- if( jarFile.exists() ) {
- // if SWT is available we need to construct a new URL-Classloader with SWT
- // bundles classloader as the parent
- if( swtAvailable ) {
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - SWT is available use different loading strategy"); //$NON-NLS-1$
- }
-
- // Since JDK8b113 the swt stuff is in its own jar
- File swtFX = new File(new File(javaHome.getAbsolutePath(),"lib"),"jfxswt.jar"); //$NON-NLS-1$ //$NON-NLS-2$
-
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - Searching for SWT-FX integration at " + swtFX.getAbsolutePath()); //$NON-NLS-1$
- }
-
- if( swtFX.exists() ) {
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - Found SWT/FX"); //$NON-NLS-1$
- }
-
- ClassLoader extClassLoader = ClassLoader.getSystemClassLoader().getParent();
- if( extClassLoader.getClass().getName().equals("sun.misc.Launcher$ExtClassLoader") ) { //$NON-NLS-1$
- return new URLClassLoader(new URL[] { swtFX.getCanonicalFile().toURI().toURL() }, new SWTFXClassloader(parent,extClassLoader));
- }
- return new URLClassLoader(new URL[] { jarFile.getCanonicalFile().toURI().toURL(), swtFX.getCanonicalFile().toURI().toURL() }, parent);
- } else {
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - Assume that SWT-FX part of jfxrt.jar"); //$NON-NLS-1$
- }
-
- URL url = jarFile.getCanonicalFile().toURI().toURL();
- return new URLClassLoader(new URL[] { url }, parent);
- }
- } else {
- // we should be able to delegate to the URL-Extension-Classloader, which is essential for ScenicView
- // which installs an JMX-Component
- try {
- ClassLoader extClassLoader = ClassLoader.getSystemClassLoader().getParent();
- if( extClassLoader.getClass().getName().equals("sun.misc.Launcher$ExtClassLoader") ) { //$NON-NLS-1$
- return new URLClassLoader(new URL[] {}, extClassLoader);
- }
- } catch(Throwable t) {
- t.printStackTrace();
- }
- URL url = jarFile.getCanonicalFile().toURI().toURL();
- URLClassLoader cl = new URLClassLoader(new URL[] { url }, parent);
- return cl;
- }
- }
-
- // Java 7
- jarFile = new File(new File(javaHome.getAbsolutePath(),"lib"),"jfxrt.jar"); //$NON-NLS-1$ //$NON-NLS-2$
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - Assumed location (Java 7): " + jarFile.getAbsolutePath()); //$NON-NLS-1$
- }
-
- if( jarFile.exists() ) {
- URL url = jarFile.getCanonicalFile().toURI().toURL();
- return new URLClassLoader(new URL[] { url }, parent);
- } else {
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - File does not exist."); //$NON-NLS-1$
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createJREBundledClassloader - Ended"); //$NON-NLS-1$
- }
- }
-
- return null;
- }
-
- private static URLClassLoader createClassloader(ClassLoader parent, PackageAdmin admin, BaseData bundledata, BundleContext context, boolean swtAvailable) throws Exception {
- URLClassLoader loader;
-
- {
- if( FXClassLoadingConfigurator.DEBUG ) {
- System.err.println("MyBundleClassLoader#createClassloader - checking for JRE bundled javafx"); //$NON-NLS-1$
- }
-
- loader = createJREBundledClassloader(parent, swtAvailable);
- }
-
- if (loader != null) {
- return loader;
- }
-
- throw new IllegalStateException("You need to run at least Java7u6"); //$NON-NLS-1$
- }
-
- @Override
- public Class<?> findLocalClass(String classname) throws ClassNotFoundException {
- try {
- Class<?> cl = this.fxClassLoader.loadClass(classname);
- if( this.swtAvailable && ! this.implicitExitSet && "javafx.embed.swt.FXCanvas".equals(classname) ) { //$NON-NLS-1$
- try {
- Class<?> platformClass = this.fxClassLoader.loadClass("javafx.application.Platform"); //$NON-NLS-1$
- Method method = platformClass.getDeclaredMethod("setImplicitExit", boolean.class); //$NON-NLS-1$
- method.invoke(null, Boolean.FALSE);
- this.implicitExitSet = true;
- } catch (Throwable e) {
- System.err.println("Unable to setImplicitExit to false"); //$NON-NLS-1$
- e.printStackTrace();
- }
- }
- return cl;
- } catch (ClassNotFoundException e) {
- return super.findLocalClass(classname);
- } catch (NoClassDefFoundError e) {
- return super.findLocalClass(classname);
- }
- }
-
- @Override
- public URL findLocalResource(String resource) {
- try {
- URL url = this.fxClassLoader.findResource(resource);
- if (url == null) {
- url = super.findLocalResource(resource);
- }
- return url;
- } catch (Throwable e) {
- return super.findLocalResource(resource);
- }
- }
-
- @Override
- protected Enumeration<URL> findResources(String name) throws IOException {
- try {
- List<URL> tmp = new ArrayList<URL>();
-
- Enumeration<URL> rv = this.fxClassLoader.findResources(name);
- while (rv.hasMoreElements()) {
- tmp.add(rv.nextElement());
- }
-
- rv = super.findResources(name);
- while (rv.hasMoreElements()) {
- tmp.add(rv.nextElement());
- }
-
- return Collections.enumeration(tmp);
- } catch (Throwable e) {
- return super.findResources(name);
- }
- }
- }
-
- @Override
- public void initialize(BaseAdaptor adaptor) {
- // Nothing to be done
-
- }
-
- @Override
- public void frameworkStart(BundleContext context) throws BundleException {
- this.context = context;
-
- this.paTracker = new ServiceTracker<PackageAdmin, PackageAdmin>(context, PackageAdmin.class.getName(), null);
- this.paTracker.open();
-
- try {
- Filter filter = context.createFilter(Location.INSTANCE_FILTER);
- this.instanceLocationTracker = new ServiceTracker<Location,Location>(context, filter, null);
- this.instanceLocationTracker.open();
- } catch (InvalidSyntaxException e) {
- e.printStackTrace();
- }
-
- try {
- Filter filter = context.createFilter(Location.INSTALL_FILTER);
- this.installLocation = new ServiceTracker<Location,Location>(context, filter, null);
- this.installLocation.open();
- } catch (InvalidSyntaxException e) {
- e.printStackTrace();
- }
-
- this.preferenceServiceTracker = new ServiceTracker<Object,Object>(context, "org.eclipse.core.runtime.preferences.IPreferencesService", null); //$NON-NLS-1$
- this.preferenceServiceTracker.open();
- }
-
- @Override
- public void frameworkStop(BundleContext context) throws BundleException {
- this.paTracker.close();
- this.paTracker = null;
-
- this.instanceLocationTracker.close();
- this.instanceLocationTracker = null;
-
- this.installLocation.close();
- this.installLocation = null;
-
- this.preferenceServiceTracker.close();
- this.preferenceServiceTracker = null;
- }
-
- private PackageAdmin getPackageAdmin() {
- ServiceTracker<PackageAdmin, PackageAdmin> tracker = this.paTracker;
- if (tracker == null)
- return null;
- return tracker.getService();
- }
-
- @Override
- public void frameworkStopping(BundleContext context) {
- // Nothing todo
- }
-
- @Override
- public void addProperties(Properties properties) {
- // Nothing todo
- }
-
- @Override
- public URLConnection mapLocationToURLConnection(String location) throws IOException {
- return null;
- }
-
- @Override
- public void handleRuntimeError(Throwable error) {
- // Nothing todo
- }
-
- @Override
- public FrameworkLog createFrameworkLog() {
- return null;
- }
-
- static class SWTFXClassloader extends ClassLoader {
- private final ClassLoader lastResortLoader;
- private final ClassLoader primaryLoader;
-
- public SWTFXClassloader(ClassLoader lastResortLoader, ClassLoader primaryLoader) {
- this.lastResortLoader = lastResortLoader;
- this.primaryLoader = primaryLoader;
- }
-
- @Override
- protected Class<?> findClass(String name) throws ClassNotFoundException {
- try {
- return this.primaryLoader.loadClass(name);
- } catch( ClassNotFoundException c ) {
- try {
- return this.lastResortLoader.loadClass(name);
- } catch( ClassNotFoundException tmp ) {
- throw c;
- }
- }
- }
-
- @Override
- protected URL findResource(String name) {
- URL url = this.primaryLoader.getResource(name);
- if( url == null ) {
- url = this.lastResortLoader.getResource(name);
- }
- return url;
- }
-
- @Override
- protected Enumeration<URL> findResources(String name) throws IOException {
- final Enumeration<URL> en1 = this.primaryLoader.getResources(name);
- final Enumeration<URL> en2 = this.lastResortLoader.getResources(name);
-
- return new Enumeration<URL>() {
- @Override
- public boolean hasMoreElements() {
- if( en1.hasMoreElements() ) {
- return true;
- }
- return en2.hasMoreElements();
- }
-
- @Override
- public URL nextElement() {
- if( ! en1.hasMoreElements() ) {
- return en2.nextElement();
- }
- return en1.nextElement();
- }
- };
- }
-
- @Override
- public URL getResource(String name) {
- URL url = this.primaryLoader.getResource(name);
- if( url == null ) {
- url = this.lastResortLoader.getResource(name);
- }
- return url;
- }
-
- @SuppressWarnings("resource")
- @Override
- public InputStream getResourceAsStream(String name) {
- InputStream in = this.primaryLoader.getResourceAsStream(name);
- if( in == null ) {
- in = this.lastResortLoader.getResourceAsStream(name);
- }
- return in;
- }
-
- @Override
- public Enumeration<URL> getResources(String name) throws IOException {
- final Enumeration<URL> en1 = this.primaryLoader.getResources(name);
- final Enumeration<URL> en2 = this.lastResortLoader.getResources(name);
-
- return new Enumeration<URL>() {
- @Override
- public boolean hasMoreElements() {
- if( en1.hasMoreElements() ) {
- return true;
- }
- return en2.hasMoreElements();
- }
-
- @Override
- public URL nextElement() {
- if( ! en1.hasMoreElements() ) {
- return en2.nextElement();
- }
- return en1.nextElement();
- }
- };
- }
-
- @Override
- public Class<?> loadClass(String name) throws ClassNotFoundException {
- try {
- return this.primaryLoader.loadClass(name);
- } catch( ClassNotFoundException c ) {
- try {
- return this.lastResortLoader.loadClass(name);
- } catch( ClassNotFoundException tmp ) {
- throw c;
- }
- }
- }
- }
-}
+package org.eclipse.fx.osgi.fxloader;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Enumeration;
+
+import org.eclipse.osgi.internal.debug.Debug;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
+import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook;
+import org.eclipse.osgi.internal.loader.BundleLoader;
+import org.eclipse.osgi.internal.loader.ModuleClassLoader;
+import org.eclipse.osgi.internal.loader.classpath.ClasspathManager;
+import org.eclipse.osgi.storage.BundleInfo.Generation;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.wiring.BundleWiring;
+
+/**
+ * Hook to overwrite OSGis default classloading
+ */
+public class FXClassLoader extends ClassLoaderHook {
+ private static final String FX_SYMBOLIC_NAME = "org.eclipse.fx.javafx";
+ private static final String SWT_SYMBOLIC_NAME = "org.eclipse.swt";
+
+ public ModuleClassLoader createClassLoader(ClassLoader parent,
+ EquinoxConfiguration configuration, BundleLoader delegate,
+ Generation generation) {
+ if (FX_SYMBOLIC_NAME.equals(generation.getRevision().getBundle()
+ .getSymbolicName())) {
+ ClassLoader swtClassloader = getSWTClassloader(generation);
+ URLClassLoader cl = createJREBundledClassloader(swtClassloader == null ? parent : swtClassloader,swtClassloader != null);
+ return new FXModuleClassloader(cl, parent, configuration, delegate,
+ generation);
+ }
+ return null;
+ }
+
+ private static ClassLoader getSWTClassloader(Generation generation) {
+ for( Bundle b : generation.getRevision().getBundle().getBundleContext().getBundles() ) {
+ if( SWT_SYMBOLIC_NAME.equals(b.getSymbolicName()) ) {
+ if ((b.getState() & Bundle.INSTALLED) == 0) {
+ // Ensure the bundle is started else we are unable to
+ // extract the
+ // classloader
+ if ((b.getState() & Bundle.ACTIVE) != 0) {
+ try {
+ b.start();
+ } catch (BundleException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ return b.adapt(BundleWiring.class).getClassLoader();
+ }
+
+ }
+ }
+
+ return null;
+ }
+
+
+ static class FXModuleClassloader extends ModuleClassLoader {
+ private final EquinoxConfiguration configuration;
+ private final BundleLoader delegate;
+ private final Generation generation;
+
+ private ClasspathManager classpathManager;
+
+ public FXModuleClassloader(final URLClassLoader fxClassloader,
+ ClassLoader parent, EquinoxConfiguration configuration,
+ BundleLoader delegate, Generation generation) {
+ super(parent);
+ this.configuration = configuration;
+ this.delegate = delegate;
+ this.generation = generation;
+ this.classpathManager = new ClasspathManager(generation, this) {
+ @Override
+ public Class<?> findLocalClass(String classname)
+ throws ClassNotFoundException {
+ return fxClassloader.loadClass(classname);
+ }
+
+ @Override
+ public URL findLocalResource(String resource) {
+ return fxClassloader.findResource(resource);
+ }
+
+ @Override
+ public Enumeration<URL> findLocalResources(String resource) {
+ try {
+ return fxClassloader.findResources(resource);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return EmptyEnumeration.INSTANCE;
+ }
+ };
+ }
+
+ @Override
+ protected Generation getGeneration() {
+ return generation;
+ }
+
+ @Override
+ protected Debug getDebug() {
+ return configuration.getDebug();
+ }
+
+ @Override
+ public ClasspathManager getClasspathManager() {
+ return classpathManager;
+ }
+
+ @Override
+ protected EquinoxConfiguration getConfiguration() {
+ return configuration;
+ }
+
+ @Override
+ public BundleLoader getBundleLoader() {
+ return delegate;
+ }
+
+ @Override
+ public boolean isRegisteredAsParallel() {
+ return false;
+ }
+
+// @Override
+// public Class<?> findLocalClass(String classname)
+// throws ClassNotFoundException {
+// return fxClassloader.loadClass(classname);
+// }
+//
+// @Override
+// public URL findLocalResource(String resource) {
+// return fxClassloader.findResource(resource);
+// }
+//
+// @Override
+// public Enumeration<URL> findLocalResources(String resource) {
+// try {
+// return fxClassloader.findResources(resource);
+// } catch (IOException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+// return Collections.emptyEnumeration();
+// }
+//
+// @Override
+// protected Generation getGeneration() {
+// // TODO Auto-generated method stub
+// return null;
+// }
+
+ }
+
+ private static URLClassLoader createJREBundledClassloader(
+ ClassLoader parent, boolean swtAvailable) {
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - Started");
+ }
+
+ try {
+ File javaHome;
+ try {
+ javaHome = new File(System.getProperty("java.home")).getCanonicalFile(); //$NON-NLS-1$
+ } catch (IOException e) {
+ throw new IllegalStateException("Unable to locate java home", e);
+ }
+ if (!javaHome.exists()) {
+ throw new IllegalStateException("The java home '"
+ + javaHome.getAbsolutePath() + "' does not exits");
+ }
+
+ // Java 8 and maybe one day Java 7
+ File jarFile = new File(new File(new File(
+ javaHome.getAbsolutePath(), "lib"), "ext"), "jfxrt.jar");
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - Assumed location (Java 8/Java 7): "
+ + jarFile.getAbsolutePath());
+ }
+
+ if (jarFile.exists()) {
+ // if SWT is available we need to construct a new
+ // URL-Classloader with SWT
+ // bundles classloader as the parent
+ if (swtAvailable) {
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - SWT is available use different loading strategy");
+ }
+
+ // Since JDK8b113 the swt stuff is in its own jar
+ File swtFX = new File(new File(javaHome.getAbsolutePath(),
+ "lib"), "jfxswt.jar");
+
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - Searching for SWT-FX integration at "
+ + swtFX.getAbsolutePath());
+ }
+
+ if (swtFX.exists()) {
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - Found SWT/FX");
+ }
+
+ ClassLoader extClassLoader = ClassLoader
+ .getSystemClassLoader().getParent();
+ if (extClassLoader.getClass().getName()
+ .equals("sun.misc.Launcher$ExtClassLoader")) {
+ return new URLClassLoader(
+ new URL[] { swtFX.getCanonicalFile()
+ .toURI().toURL() },
+ new SWTFXClassloader(parent, extClassLoader));
+ }
+ return new URLClassLoader(new URL[] {
+ jarFile.getCanonicalFile().toURI().toURL(),
+ swtFX.getCanonicalFile().toURI().toURL() },
+ parent);
+ } else {
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - Assume that SWT-FX part of jfxrt.jar");
+ }
+
+ URL url = jarFile.getCanonicalFile().toURI().toURL();
+ return new URLClassLoader(new URL[] { url }, parent);
+ }
+ } else {
+ // we should be able to delegate to the
+ // URL-Extension-Classloader, which is essential for
+ // ScenicView
+ // which installs an JMX-Component
+ try {
+ ClassLoader extClassLoader = ClassLoader
+ .getSystemClassLoader().getParent();
+ if (extClassLoader.getClass().getName()
+ .equals("sun.misc.Launcher$ExtClassLoader")) {
+ return new URLClassLoader(new URL[] {},
+ extClassLoader);
+ }
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ URL url = jarFile.getCanonicalFile().toURI().toURL();
+ URLClassLoader cl = new URLClassLoader(new URL[] { url },
+ parent);
+ return cl;
+ }
+ }
+
+ // Java 7
+ jarFile = new File(new File(javaHome.getAbsolutePath(), "lib"),
+ "jfxrt.jar");
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - Assumed location (Java 7): "
+ + jarFile.getAbsolutePath());
+ }
+
+ if (jarFile.exists()) {
+ URL url = jarFile.getCanonicalFile().toURI().toURL();
+ return new URLClassLoader(new URL[] { url }, parent);
+ } else {
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - File does not exist.");
+ }
+ }
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ } finally {
+ if (FXClassloaderConfigurator.DEBUG) {
+ System.err
+ .println("MyBundleClassLoader#createJREBundledClassloader - Ended");
+ }
+ }
+
+ return null;
+ }
+
+ static class EmptyEnumeration implements Enumeration<URL> {
+ static Enumeration<URL> INSTANCE = new EmptyEnumeration();
+
+ @Override
+ public boolean hasMoreElements() {
+ return false;
+ }
+
+ @Override
+ public URL nextElement() {
+ return null;
+ }
+
+ }
+
+ static class SWTFXClassloader extends ClassLoader {
+ private final ClassLoader lastResortLoader;
+ private final ClassLoader primaryLoader;
+
+ public SWTFXClassloader(ClassLoader lastResortLoader,
+ ClassLoader primaryLoader) {
+ this.lastResortLoader = lastResortLoader;
+ this.primaryLoader = primaryLoader;
+ }
+
+ @Override
+ protected Class<?> findClass(String name) throws ClassNotFoundException {
+ try {
+ return primaryLoader.loadClass(name);
+ } catch (ClassNotFoundException c) {
+ try {
+ return lastResortLoader.loadClass(name);
+ } catch (ClassNotFoundException tmp) {
+ throw c;
+ }
+ }
+ }
+
+ @Override
+ protected URL findResource(String name) {
+ URL url = primaryLoader.getResource(name);
+ if (url == null) {
+ url = lastResortLoader.getResource(name);
+ }
+ return url;
+ }
+
+ @Override
+ protected Enumeration<URL> findResources(String name)
+ throws IOException {
+ final Enumeration<URL> en1 = primaryLoader.getResources(name);
+ final Enumeration<URL> en2 = lastResortLoader.getResources(name);
+
+ return new Enumeration<URL>() {
+ @Override
+ public boolean hasMoreElements() {
+ if (en1.hasMoreElements()) {
+ return true;
+ }
+ return en2.hasMoreElements();
+ }
+
+ @Override
+ public URL nextElement() {
+ if (!en1.hasMoreElements()) {
+ return en2.nextElement();
+ }
+ return en1.nextElement();
+ }
+ };
+ }
+
+ @Override
+ public URL getResource(String name) {
+ URL url = primaryLoader.getResource(name);
+ if (url == null) {
+ url = lastResortLoader.getResource(name);
+ }
+ return url;
+ }
+
+ @Override
+ public InputStream getResourceAsStream(String name) {
+ InputStream in = primaryLoader.getResourceAsStream(name);
+ if (in == null) {
+ in = lastResortLoader.getResourceAsStream(name);
+ }
+ return in;
+ }
+
+ @Override
+ public Enumeration<URL> getResources(String name) throws IOException {
+ final Enumeration<URL> en1 = primaryLoader.getResources(name);
+ final Enumeration<URL> en2 = lastResortLoader.getResources(name);
+
+ return new Enumeration<URL>() {
+ @Override
+ public boolean hasMoreElements() {
+ if (en1.hasMoreElements()) {
+ return true;
+ }
+ return en2.hasMoreElements();
+ }
+
+ @Override
+ public URL nextElement() {
+ if (!en1.hasMoreElements()) {
+ return en2.nextElement();
+ }
+ return en1.nextElement();
+ }
+ };
+ }
+
+ @Override
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
+ try {
+ return primaryLoader.loadClass(name);
+ } catch (ClassNotFoundException c) {
+ try {
+ return lastResortLoader.loadClass(name);
+ } catch (ClassNotFoundException tmp) {
+ throw c;
+ }
+ }
+ }
+ }
+}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoaderDelegate.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoaderDelegate.java
deleted file mode 100755
index 96b6bdbd4..000000000
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoaderDelegate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.fxloader;
-
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.eclipse.osgi.framework.adaptor.BundleClassLoader;
-import org.eclipse.osgi.framework.adaptor.BundleData;
-import org.eclipse.osgi.framework.adaptor.ClassLoaderDelegateHook;
-
-/*
- * Remember the classloader for use in post look ups because of native classloading by javafx' native code
- * See http://javafx-jira.kenai.com/browse/RT-20883
- */
-/**
- * Final resort delegate for FX
- */
-public class FXClassLoaderDelegate implements ClassLoaderDelegateHook {
- private boolean flag;
-
- @Override
- public Class<?> preFindClass(String name, BundleClassLoader classLoader, BundleData data) throws ClassNotFoundException {
- return null;
- }
-
- @Override
- public Class<?> postFindClass(String name, BundleClassLoader classLoader, BundleData data) throws ClassNotFoundException {
- if ("org.eclipse.swt".equals(data.getSymbolicName())) { //$NON-NLS-1$
- if (FXClassLoader.LOADER != null && name.startsWith("com.sun.glass") && !this.flag) { //$NON-NLS-1$
- try {
- // Avoid endless loop
- this.flag = true;
- return FXClassLoader.LOADER.loadClass(name);
- } catch (Throwable t) {
- t.printStackTrace();
- } finally {
- this.flag = false;
- }
- }
- }
- return null;
- }
-
- @Override
- public URL preFindResource(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException {
- return null;
- }
-
- @Override
- public URL postFindResource(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException {
- return null;
- }
-
- @Override
- public Enumeration<URL> preFindResources(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException {
- return null;
- }
-
- @Override
- public Enumeration<URL> postFindResources(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException {
- return null;
- }
-
- @Override
- public String preFindLibrary(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException {
- return null;
- }
-
- @Override
- public String postFindLibrary(String name, BundleClassLoader classLoader, BundleData data) {
- return null;
- }
-
-}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoadingConfigurator.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoadingConfigurator.java
deleted file mode 100755
index 3e7070e75..000000000
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassLoadingConfigurator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.fxloader;
-
-import org.eclipse.osgi.baseadaptor.HookConfigurator;
-import org.eclipse.osgi.baseadaptor.HookRegistry;
-
-/**
- * Configurations for FX
- */
-public class FXClassLoadingConfigurator implements HookConfigurator {
- /**
- * Debug enabled
- */
- public static final boolean DEBUG = Boolean.getBoolean("efxclipse.osgi.hook.debug"); //$NON-NLS-1$
-
- /**
- *
- */
- public FXClassLoadingConfigurator() {
- if( DEBUG ) {
- System.err.println("FXClassLoadingConfigurator - This is the classloading configurator"); //$NON-NLS-1$
- }
-
- }
-
- @Override
- public void addHooks(HookRegistry hookRegistry) {
- if( DEBUG ) {
- System.err.println("FXClassLoadingConfigurator - Adding hooks for classloading"); //$NON-NLS-1$
- }
- FXClassLoader cl = new FXClassLoader();
- hookRegistry.addAdaptorHook(cl);
- hookRegistry.addClassLoadingHook(cl);
- hookRegistry.addClassLoaderDelegateHook(new FXClassLoaderDelegate());
- }
-
-}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassloaderConfigurator.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassloaderConfigurator.java
new file mode 100644
index 000000000..94b171807
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/fxloader/FXClassloaderConfigurator.java
@@ -0,0 +1,14 @@
+package org.eclipse.fx.osgi.fxloader;
+
+import org.eclipse.osgi.internal.hookregistry.HookConfigurator;
+import org.eclipse.osgi.internal.hookregistry.HookRegistry;
+
+public class FXClassloaderConfigurator implements HookConfigurator {
+ public static final boolean DEBUG = true;
+
+ @Override
+ public void addHooks(HookRegistry hookRegistry) {
+ hookRegistry.addClassLoaderHook(new FXClassLoader());
+ }
+
+}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFAdaptorHook.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFAdaptorHook.java
deleted file mode 100755
index bdd278938..000000000
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFAdaptorHook.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.patch;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URLConnection;
-import java.util.Collection;
-import java.util.Properties;
-
-import org.eclipse.osgi.baseadaptor.BaseAdaptor;
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.eclipse.osgi.baseadaptor.hooks.AdaptorHook;
-import org.eclipse.osgi.framework.log.FrameworkLog;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * AdaptorHook hook into the lifecycle of the BaseAdaptor. This hook
- * is needed to access the system.bundle BundleContext to track
- * PackageAdmin and add a BundleListener.
- */
-@SuppressWarnings("deprecation")
-public class PFAdaptorHook implements AdaptorHook {
- /**
- * Tracks PackageAdmin
- */
- private volatile ServiceTracker<PackageAdmin,PackageAdmin> paTracker;
- /**
- * The BaseAdpator
- */
- private volatile BaseAdaptor baseAdaptor;
- /**
- * A BundleListener that listens for when patched content becomes uninstalled or unresolved
- */
- private volatile PatchListener patchListener;
-
- @Override
- public void addProperties(Properties properties) {
- // nothing
- }
-
- @Override
- public FrameworkLog createFrameworkLog() {
- // nothing
- return null;
- }
-
- /**
- * Opens the ServiceTracker for PackageAdmin and registers the PatchListener.
- */
- @Override
- public void frameworkStart(BundleContext context) {
- this.paTracker = new ServiceTracker<PackageAdmin,PackageAdmin>(context, PackageAdmin.class.getName(), null);
- this.paTracker.open();
- this.patchListener = new PatchListener();
- context.addBundleListener(this.patchListener);
- }
-
- /**
- * Removes the PatchListener and closes the PackageAdmin ServiceTracker.
- */
- @Override
- public void frameworkStop(BundleContext context) {
- context.removeBundleListener(this.patchListener);
- this.patchListener = null;
- this.paTracker.close();
- this.paTracker = null;
- }
-
- @Override
- public void frameworkStopping(BundleContext context) {
- // nothing
- }
-
- @Override
- public void handleRuntimeError(Throwable error) {
- // nothing
- }
-
- @Override
- public void initialize(BaseAdaptor adaptor) {
- this.baseAdaptor = adaptor;
- }
-
- @Override
- public URLConnection mapLocationToURLConnection(String location) {
- // nothing
- return null;
- }
-
- /**
- * @param pattern
- * @param dnChain
- * @return always <code>false</code>
- */
- public static boolean matchDNChain(String pattern, String[] dnChain) {
- // nothing
- return false;
- }
-
- /**
- * Gets the PackageAdmin service from the tracker
- * @return the PackageAdmin service or null if it is not available
- */
- PackageAdmin getPackageAdmin() {
- ServiceTracker<?,PackageAdmin> tracker = this.paTracker;
- if (tracker == null)
- return null;
- return tracker.getService();
- }
-
- /**
- * Convenience method for creating dev classpath BundleFiles
- * @param devFile the dev classpath file
- * @param fragmentData the fragment for the dev classpath
- * @return a BundleFile to be used for a dev classpath.
- */
- BundleFile createDevClasspathBundleFile(File devFile, BaseData fragmentData) {
- BaseAdaptor adaptor = this.baseAdaptor;
- if (adaptor == null)
- return null;
- try {
- return adaptor.createBundleFile(devFile, fragmentData);
- } catch (IOException e) {
- return null;
- }
- }
-
- /**
- * Associates the list of bundles with a PFBundleFile.
- * If any of the bundles in the list become unresolved then the PFBundleFile
- * is reset.
- * @param bundlesToListen the bundles to listen for
- * @param bundleFile the PFBundleFile associated with the bundles.
- */
- void listenToPatches(Collection<Bundle> bundlesToListen, PFBundleFile bundleFile) {
- PatchListener listener = this.patchListener;
- if (listener == null)
- return;
- listener.listenToPatches(bundlesToListen, bundleFile);
- }
-}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFBundleFile.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFBundleFile.java
deleted file mode 100755
index a154c6303..000000000
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFBundleFile.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.patch;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.eclipse.osgi.framework.internal.core.AbstractBundle;
-import org.eclipse.osgi.internal.baseadaptor.DevClassPathHelper;
-import org.osgi.framework.Bundle;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * A bundle file that wraps the content of another bundle file.
- * A list of bundle files is used to patch the content of the
- * wrapped bundle file. The list of patches is searched
- * before the wrapped bundle file. This allows the
- * content of the patches to override (or patch) the
- * content of the wrapped bundle file.
- */
-@SuppressWarnings("deprecation")
-public class PFBundleFile extends BundleFile {
- /**
- * The wrapped bundle file that is being patched
- */
- private final BundleFile wrapped;
- /**
- * The BaseData for the wrapped bundle file
- */
- private final BaseData patchedData;
- /**
- * The adaptor hook
- */
- private final PFAdaptorHook pfAdaptorHook;
- /**
- * Indicates that the list of patches is current and ready to use
- */
- private boolean processed = false;
- /**
- * The list of patch bundle files that are associated with this bundle file.
- */
- private BundleFile[] patches;
-
- /**
- * @param wrapped
- * @param patchedData
- * @param pfAdaptorHook
- */
- public PFBundleFile(BundleFile wrapped, BaseData patchedData, PFAdaptorHook pfAdaptorHook) {
- // use the base file from the wrapped bundle file
- super(wrapped.getBaseFile());
- this.wrapped = wrapped;
- this.patchedData = patchedData;
- this.pfAdaptorHook = pfAdaptorHook;
- }
-
- @Override
- public void close() throws IOException {
- this.wrapped.close();
- }
-
- @Override
- public boolean containsDir(String dir) {
- return this.wrapped.containsDir(dir);
- }
-
- @Override
- public BundleEntry getEntry(String path) {
- // see if there are any patches available
- BundleFile[] patchFiles = getPatches();
- if (patchFiles == null) // none available just use the wrapped content
- return this.wrapped.getEntry(path);
- if ("META-INF/MANIFEST.MF".equals(path)) //$NON-NLS-1$
- return this.wrapped.getEntry(path); // don't patch manifest
- for (int i = 0; i < patchFiles.length; i++) {
- BundleEntry entry = patchFiles[i].getEntry(path);
- if (entry != null) { // found patched content; return it
- if (PFConfigurator.DEBUG)
- System.out.println("Found patch for \"" + path + "\" in \"" + patchFiles[i] + "\""); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- return entry;
- }
- }
- // no patched content found for the path; use the wrapped content
- return this.wrapped.getEntry(path);
- }
-
- @Override
- public Enumeration<String> getEntryPaths(String path) {
- // we simply call the wrapped bundle file here because
- // we do not want to return more entries than what the original content has
- return this.wrapped.getEntryPaths(path);
- }
-
- @Override
- public File getFile(String path, boolean nativeCode) {
- // see if there are any patches available
- BundleFile[] patchFiles = getPatches();
- if (patchFiles == null) // none available just use the wrapped content
- return this.wrapped.getFile(path, nativeCode);
- for (int i = 0; i < patchFiles.length; i++) {
- File file = patchFiles[i].getFile(path, nativeCode);
- if (file != null) // found patched content; return it
- return file;
- }
- // no patched content found for the path; use the wrapped content
- return this.wrapped.getFile(path, nativeCode);
- }
-
- @Override
- public void open() throws IOException {
- this.wrapped.open();
- }
-
- private synchronized BundleFile[] getPatches() {
- if (this.processed) // the patches list is current; return it
- return this.patches;
- Bundle bundle = this.patchedData.getBundle();
- if (bundle == null)
- // BundleFile objects are created before the Bundle object
- return null; // we don't know yet
- // bundle is not resolved; we can only patch after the bundle is resolved
- if (((Bundle.INSTALLED | Bundle.UNINSTALLED) & bundle.getState()) != 0)
- return null; // we can only patch if resolved;
- // bundle is resolved; now check package admin for patch fragments
- PackageAdmin pa = this.pfAdaptorHook.getPackageAdmin();
- if (pa == null)
- return null; // we cannot know without PA
- // collect a list of bundles we need to listen for UNRESOLVED/UNINSTALLED events
- Collection<Bundle> bundlesToListen = new ArrayList<Bundle>();
- try {
- if ((pa.getBundleType(bundle) & PackageAdmin.BUNDLE_TYPE_FRAGMENT) == 0)
- bundlesToListen.add(bundle); // Always listen to the host bundle
- else
- return null; // we don't patch fragments; no need to listen
- Bundle[] fragments = pa.getFragments(bundle);
- if (fragments == null)
- return null; // no fragments
- // search the fragments for patch fragments
- ArrayList<BundleFile> patchList = new ArrayList<BundleFile>(fragments.length);
- for (int i = 0; i < fragments.length; i++) {
- AbstractBundle fragment = (AbstractBundle) fragments[i];
- BaseData fragmentData = (BaseData) fragment.getBundleData();
- // The PFStorageHook knows if this is a patch fragment
- PFStorageHook storageHook = (PFStorageHook) fragmentData.getStorageHook(PFStorageHook.KEY);
- if (storageHook.isPatchFragment()) {
- if (PFConfigurator.DEBUG)
- System.out.println("Found patch fragment: " + fragmentData.toString()); //$NON-NLS-1$
- patchList.add(fragmentData.getBundleFile());
- // need to listen to this fragment
- bundlesToListen.add(fragment);
- // add in dev classpaths
- if (DevClassPathHelper.inDevelopmentMode()) {
- String[] devPath = DevClassPathHelper.getDevClassPath(fragmentData.getSymbolicName());
- if (devPath != null) {
- for (int j = 0; j < devPath.length; j++) {
- File devFile = fragmentData.getBundleFile().getFile(devPath[i], false);
- patchList.add(this.pfAdaptorHook.createDevClasspathBundleFile(devFile, fragmentData));
- }
- }
- }
- }
- this.patches = (BundleFile[]) patchList.toArray(new BundleFile[patchList.size()]);
- }
- } finally {
- // tell the listener about the list to listen
- this.pfAdaptorHook.listenToPatches(bundlesToListen, this);
- // mark the patches as processed
- this.processed = true;
- }
- return this.patches;
- }
-
- synchronized void resetPatches() {
- // reset the patches list so it will be re-computed.
- this.processed = false;
- this.patches = null;
- }
-
- @Override
- public String toString() {
- return this.patchedData.toString();
- }
-}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFBundleWrapper.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFBundleWrapper.java
deleted file mode 100755
index a70a484ca..000000000
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFBundleWrapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.patch;
-
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.eclipse.osgi.baseadaptor.hooks.BundleFileWrapperFactoryHook;
-
-/**
- * Wraps bundle files so that they can be patched with content from
- * patch fragments.
- */
-public class PFBundleWrapper implements BundleFileWrapperFactoryHook {
- private final PFAdaptorHook adaptorHook;
-
- /**
- * @param adaptorHook
- */
- public PFBundleWrapper(PFAdaptorHook adaptorHook) {
- this.adaptorHook = adaptorHook;
- }
-
- @Override
- public BundleFile wrapBundleFile(BundleFile bundleFile, Object content, BaseData data, boolean base) {
- if (data.getBundleID() == 0)
- // it is usually a bad idea to modify the behavior of the system.bundle file.
- return null;
- // at this point we do not know if the BaseData is a host or a fragment;
- // we just create a PFBundleFile for all bundles
- return new PFBundleFile(bundleFile, data, this.adaptorHook);
- }
-
-}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFConfigurator.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFConfigurator.java
deleted file mode 100755
index 6c9369de7..000000000
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFConfigurator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.patch;
-
-import org.eclipse.osgi.baseadaptor.HookConfigurator;
-import org.eclipse.osgi.baseadaptor.HookRegistry;
-import org.eclipse.osgi.framework.debug.FrameworkDebugOptions;
-
-/**
- * A hook configurator that enables patch fragments. Patch fragments
- * are fragments that get their root content prepended to their host
- * bundle's content.
- * <p>
- * A fragment bundle specifies that it is a patch fragment by
- * using the Equinox-BundleType header with the patch.fragment value
- * <pre>
- * Equinox-BundleType: patch.fragment
- * </pre>
- * When a patch fragment is attached to a host bundle then its root content
- * is prepended to the host content. This allows it to override files from
- * the host bundle with patched content.
- * </p>
- * <p>
- * This adaptor is for demonstration purposes. It has not been productized.
- * </p>
- */
-public class PFConfigurator implements HookConfigurator {
- static final boolean DEBUG;
- private static final String PF_NAME = "org.eclipse.equinox.examples.patchfragments"; //$NON-NLS-1$
- private static final String OPTION_DEBUG = PFConfigurator.PF_NAME + "/debug"; //$NON-NLS-1$
- static {
- FrameworkDebugOptions options = FrameworkDebugOptions.getDefault();
- // may be null if debugging is not enabled
- if (options == null)
- DEBUG = false;
- else
- DEBUG = options.getBooleanOption(OPTION_DEBUG, false);
- }
-
- @Override
- public void addHooks(HookRegistry hookRegistry) {
- // this is where you add the needed hooks
-
- // an adaptor hook is needed to track PackageAdmin and add a BundleListener
- PFAdaptorHook adaptorHook = new PFAdaptorHook();
- hookRegistry.addAdaptorHook(adaptorHook);
- // a storage adaptor is needed to record the fragments which are patch fragments
- hookRegistry.addStorageHook(new PFStorageHook());
- // a bundle file wrapper is needed to intercept bundle entry requests to allow patched content
- hookRegistry.addBundleFileWrapperFactoryHook(new PFBundleWrapper(adaptorHook));
- }
-
-}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFStorageHook.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFStorageHook.java
deleted file mode 100755
index 5fd84e194..000000000
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PFStorageHook.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.patch;
-
-import java.io.*;
-import java.util.Dictionary;
-
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.hooks.StorageHook;
-import org.eclipse.osgi.framework.util.KeyedElement;
-import org.osgi.framework.Constants;
-
-/**
- * A storage hook that records if a bundle is a
- * patch fragment or not.
- */
-public class PFStorageHook implements StorageHook {
- /**
- * The convention is to use the class name as the key for the keyed element
- * for storage hooks
- */
- public static final String KEY = PFStorageHook.class.getName();
- /**
- * The key hash code is constant
- */
- public static final int HASHCODE = KEY.hashCode();
- /**
- * The header used to specify a patch fragment
- */
- public static final String BUNDLE_TYPE_HEADER = "Equinox-BundleType"; //$NON-NLS-1$
- /**
- * The value of the {@link #BUNDLE_TYPE_HEADER} that indicates a patch fragment
- */
- public static final String BUNDLE_TYPE_PATCH = "fxpatch.fragment"; //$NON-NLS-1$
-
- /**
- * Indicates if this storage hook is for a patch fragment
- */
- private volatile boolean patchFragment = false;
-
- @Override
- public void copy(StorageHook storageHook) {
- // nothing; Equinox-BundleType will be reread
- }
-
- @Override
- public StorageHook create(BaseData bundledata) {
- return new PFStorageHook();
- }
-
- @Override
- public boolean forgetStartLevelChange(int startlevel) {
- // nothing
- return false;
- }
-
- @Override
- public boolean forgetStatusChange(int status) {
- // nothing
- return false;
- }
-
- @Override
- public Dictionary<String, String> getManifest(boolean firstLoad) {
- // nothing
- return null;
- }
-
- @Override
- public int getStorageVersion() {
- return 0;
- }
-
- /**
- * Checks the manifest for a patch fragment
- */
- @Override
- public void initialize(Dictionary<String, String> manifest) {
- // make sure this is a fragment manifest
- if (manifest.get(Constants.FRAGMENT_HOST) == null)
- return; // not a fragment;
- String type = (String) manifest.get(BUNDLE_TYPE_HEADER);
- this.patchFragment = BUNDLE_TYPE_PATCH.equals(type);
- }
-
- /**
- * Loads a PFStorageHook from an input stream. The only data stored
- * is a boolean to indicate if the storage hook is a patch fragment.
- */
- @Override
- public StorageHook load(BaseData bundledata, DataInputStream is) throws IOException {
- // This method should always create a new storage hook object to load the data into
- PFStorageHook loadHook = new PFStorageHook();
- loadHook.patchFragment = is.readBoolean();
- return loadHook;
- }
-
- /**
- * @param pattern
- * @return always false
- */
- public static boolean matchDNChain(String pattern) {
- // nothing
- return false;
- }
-
- /**
- * Saves the patch fragment. The only data stored is a boolean
- * to indicate if the storage hook is a patch fragment.
- */
- @Override
- public void save(DataOutputStream os) throws IOException {
- os.writeBoolean(this.patchFragment);
- }
-
- @Override
- public void validate() throws IllegalArgumentException {
- // nothing
- }
-
- @Override
- public int getKeyHashCode() {
- return HASHCODE;
- }
-
- @Override
- public boolean compare(KeyedElement other) {
- return other.getKey() == KEY;
- }
-
- @Override
- public Object getKey() {
- return KEY;
- }
-
- /**
- * Indicates if this storage hook is for a patch fragment
- * @return true if this storage hook is for a patch fragment
- */
- boolean isPatchFragment() {
- return this.patchFragment;
- }
-}
diff --git a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PatchListener.java b/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PatchListener.java
deleted file mode 100755
index 623e2ba26..000000000
--- a/bundles/runtime/org.eclipse.fx.osgi/src/org/eclipse/fx/osgi/patch/PatchListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.osgi.patch;
-
-import java.util.*;
-import java.util.Map.Entry;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.SynchronousBundleListener;
-
-/**
- * Listener to patch a bundle
- */
-public class PatchListener implements SynchronousBundleListener {
- private final HashMap<PFBundleFile,Collection<Bundle>> patches = new HashMap<PFBundleFile,Collection<Bundle>>();
-
- @Override
- public void bundleChanged(BundleEvent event) {
- if ((event.getType() & (BundleEvent.UNINSTALLED | BundleEvent.UNRESOLVED)) == 0)
- return; // only reset on resolved/unresolved and uninstalled events
- synchronized (this.patches) {
- for (Iterator<Entry<PFBundleFile,Collection<Bundle>>> entries = this.patches.entrySet().iterator(); entries.hasNext();) {
- Entry<PFBundleFile,Collection<Bundle>> entry = entries.next();
- Collection<Bundle> bundles = entry.getValue();
- if (bundles.contains(event.getBundle())) {
- PFBundleFile bundleFile = (PFBundleFile) entry.getKey();
- bundleFile.resetPatches();
- entries.remove();
- }
- }
- }
- }
-
- /**
- * @param bundles
- * @param patched
- */
- public void listenToPatches(Collection<Bundle> bundles, PFBundleFile patched) {
- synchronized (this.patches) {
- this.patches.put(patched, bundles);
- }
- }
-}
diff --git a/bundles/runtime/org.eclipse.fx.ui.animation/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.animation/META-INF/MANIFEST.MF
index bccdfae7f..ddb5a873d 100755
--- a/bundles/runtime/org.eclipse.fx.ui.animation/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.animation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Animationutils
Bundle-SymbolicName: org.eclipse.fx.ui.animation;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Import-Package: javafx.animation;version="2.0.0",
javafx.application;version="2.0.0",
javafx.beans;version="2.0.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.animation/pom.xml b/bundles/runtime/org.eclipse.fx.ui.animation/pom.xml
index fa3a6a0e5..197c6c355 100755
--- a/bundles/runtime/org.eclipse.fx.ui.animation/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.animation/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/.classpath b/bundles/runtime/org.eclipse.fx.ui.controls/.classpath
index eca7bdba8..db83a474a 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/.classpath
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-sample"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/ETabFolder.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/ETabFolder.java
index 41a415a84..75a7bb11f 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/ETabFolder.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/ETabFolder.java
@@ -10,9 +10,77 @@
*******************************************************************************/
package org.eclipse.fx.ui.controls;
+import org.eclipse.fx.ui.controls.internal.ETabFolderSkin;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.Skin;
+
/**
* A tab folder which special features
*/
-public class ETabFolder {
+public class ETabFolder extends Control {
+ public enum State {
+ DEFAULT,
+ MINIMIZED,
+ MAXIMIZED
+ }
+
+ public enum ToolDisplay {
+ END,
+ END_WRAP,
+ FILL
+ }
+
+ private ObservableList<ETab> tabs = FXCollections.observableArrayList();
+ private ObservableList<Node> toolItems = FXCollections.observableArrayList();
+ private ObservableList<MenuItem> menuItems = FXCollections.observableArrayList();
+ private ObjectProperty<State> state = new SimpleObjectProperty<ETabFolder.State>(this, "state", State.DEFAULT);
+ private ObjectProperty<ToolDisplay> tooldisplay = new SimpleObjectProperty<ETabFolder.ToolDisplay>(this, "tooldisplay", ToolDisplay.END);
+
+ public ObservableList<ETab> getTabs() {
+ return tabs;
+ }
+
+ public ObservableList<Node> getToolItems() {
+ return toolItems;
+ }
+
+ public ObservableList<MenuItem> getMenuItems() {
+ return menuItems;
+ }
+
+ public ObjectProperty<State> stateProperty() {
+ return state;
+ }
+
+ public void setState(State state) {
+ this.state.set(state);
+ }
+
+ public State getState() {
+ return state.get();
+ }
+
+ public ObjectProperty<ToolDisplay> toolDisplayProperty() {
+ return tooldisplay;
+ }
+
+ public void setTooldisplay(ToolDisplay tooldisplay) {
+ this.tooldisplay.set(tooldisplay);
+ }
+
+ public ToolDisplay getTooldisplay() {
+ return this.tooldisplay.get();
+ }
+ @Override
+ protected Skin<?> createDefaultSkin() {
+ return new ETabFolderSkin(this);
+ }
}
diff --git a/bundles/runtime/org.eclipse.fx.ui.databinding/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.databinding/META-INF/MANIFEST.MF
index 9dc3a5952..a8e94af02 100644
--- a/bundles/runtime/org.eclipse.fx.ui.databinding/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.databinding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Databinding
Bundle-SymbolicName: org.eclipse.fx.ui.databinding
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.databinding.observable;bundle-version="1.4.1",
org.eclipse.fx.core.databinding;bundle-version="0.9.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.databinding/pom.xml b/bundles/runtime/org.eclipse.fx.ui.databinding/pom.xml
index a418f3684..547d4abdc 100755
--- a/bundles/runtime/org.eclipse.fx.ui.databinding/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.databinding/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.di.interopt/pom.xml b/bundles/runtime/org.eclipse.fx.ui.di.interopt/pom.xml
index 0508f7273..09ade8c9f 100755
--- a/bundles/runtime/org.eclipse.fx.ui.di.interopt/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.di.interopt/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
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 e5219c7c6..892d9adff 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ui.di
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
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",
diff --git a/bundles/runtime/org.eclipse.fx.ui.di/pom.xml b/bundles/runtime/org.eclipse.fx.ui.di/pom.xml
index 97c366041..1d3ee17d4 100755
--- a/bundles/runtime/org.eclipse.fx.ui.di/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.di/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.dialogs/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.dialogs/META-INF/MANIFEST.MF
index 0362bdd39..f31ce01d9 100755
--- a/bundles/runtime/org.eclipse.fx.ui.dialogs/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.dialogs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Dialogs
Bundle-SymbolicName: org.eclipse.fx.ui.dialogs
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.fx.ui.panes;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.0.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.dialogs/pom.xml b/bundles/runtime/org.eclipse.fx.ui.dialogs/pom.xml
index 907be1cf2..02167dd05 100755
--- a/bundles/runtime/org.eclipse.fx.ui.dialogs/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.dialogs/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF
index 862f1e0e5..11ab6759a 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: E4
Bundle-SymbolicName: org.eclipse.fx.ui.keybindings.e4
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.fx.ui.keybindings;bundle-version="0.9.0",
org.eclipse.e4.core.contexts;bundle-version="1.1.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/pom.xml b/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/pom.xml
index 81c191f97..1747507a8 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF
index 5b732ec3f..4ce8b858f 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Generic
Bundle-SymbolicName: org.eclipse.fx.ui.keybindings.generic
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.commands;bundle-version="3.6.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/pom.xml b/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/pom.xml
index 461f8d6a6..7abe56fe8 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF
index 7b6758ef4..6ea8baa8b 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Bindings
Bundle-SymbolicName: org.eclipse.fx.ui.keybindings
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.commands;bundle-version="3.6.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings/pom.xml b/bundles/runtime/org.eclipse.fx.ui.keybindings/pom.xml
index a8499c202..db5156c6e 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.lifecycle/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.lifecycle/META-INF/MANIFEST.MF
index 9fcff3728..795322649 100644
--- a/bundles/runtime/org.eclipse.fx.ui.lifecycle/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.lifecycle/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Lifecycle
Bundle-SymbolicName: org.eclipse.fx.ui.lifecycle
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.e4.ui.model.workbench,
org.eclipse.e4.core.di,
diff --git a/bundles/runtime/org.eclipse.fx.ui.lifecycle/pom.xml b/bundles/runtime/org.eclipse.fx.ui.lifecycle/pom.xml
index c2bd3e133..6ece0f5c8 100644
--- a/bundles/runtime/org.eclipse.fx.ui.lifecycle/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.lifecycle/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.mobile/.gitignore b/bundles/runtime/org.eclipse.fx.ui.mobile/.gitignore
index 5e56e040e..934e0e06f 100644
--- a/bundles/runtime/org.eclipse.fx.ui.mobile/.gitignore
+++ b/bundles/runtime/org.eclipse.fx.ui.mobile/.gitignore
@@ -1 +1,2 @@
/bin
+/target
diff --git a/bundles/runtime/org.eclipse.fx.ui.mobile/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.mobile/META-INF/MANIFEST.MF
index 8976e3be6..08ef6a8f5 100644
--- a/bundles/runtime/org.eclipse.fx.ui.mobile/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.mobile/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mobile
Bundle-SymbolicName: org.eclipse.fx.ui.mobile
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Export-Package: org.eclipse.fx.ui.mobile,
org.eclipse.fx.ui.mobile.animations
Import-Package: javafx.animation;version="2.2.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.mobile/pom.xml b/bundles/runtime/org.eclipse.fx.ui.mobile/pom.xml
index 6c1540a0b..eba2d7649 100755
--- a/bundles/runtime/org.eclipse.fx.ui.mobile/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.mobile/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.panes/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.panes/META-INF/MANIFEST.MF
index 0f7402fac..03dcd70d5 100755
--- a/bundles/runtime/org.eclipse.fx.ui.panes/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.panes/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ui.panes
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.eclipse.fx.ui.panes
diff --git a/bundles/runtime/org.eclipse.fx.ui.panes/pom.xml b/bundles/runtime/org.eclipse.fx.ui.panes/pom.xml
index c9ac57556..4e2bd6553 100755
--- a/bundles/runtime/org.eclipse.fx.ui.panes/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.panes/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.services/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.services/META-INF/MANIFEST.MF
index c9ee74dff..a85d1c2d8 100755
--- a/bundles/runtime/org.eclipse.fx.ui.services/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ui.services
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.fx.ui.services,
org.eclipse.fx.ui.services.commands,
diff --git a/bundles/runtime/org.eclipse.fx.ui.services/pom.xml b/bundles/runtime/org.eclipse.fx.ui.services/pom.xml
index 2856384e3..fcae7d665 100755
--- a/bundles/runtime/org.eclipse.fx.ui.services/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.services/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.theme/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.theme/META-INF/MANIFEST.MF
index 2307c0721..06914b2df 100755
--- a/bundles/runtime/org.eclipse.fx.ui.theme/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.theme/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ui.theme;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.ui.theme.internal.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.fx.ui.services,
diff --git a/bundles/runtime/org.eclipse.fx.ui.theme/pom.xml b/bundles/runtime/org.eclipse.fx.ui.theme/pom.xml
index 0b0f25834..58d7c58fd 100755
--- a/bundles/runtime/org.eclipse.fx.ui.theme/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.theme/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF
index 5f21caee5..b4346da9a 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Base
Bundle-SymbolicName: org.eclipse.fx.ui.workbench.base
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.e4.core.contexts;bundle-version="1.1.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1"
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.base/pom.xml b/bundles/runtime/org.eclipse.fx.ui.workbench.base/pom.xml
index 25c9a3fd6..d3083319a 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.base/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.base/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/META-INF/MANIFEST.MF
index 73d76b995..7974ad4d2 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Controls
Bundle-SymbolicName: org.eclipse.fx.ui.workbench.fx.controls
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.fx.core;bundle-version="0.9.0"
Import-Package: com.sun.javafx;version="2.2.0",
com.sun.javafx.css;version="2.2.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/pom.xml b/bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/pom.xml
index 43b3ca1ce..ac570effc 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
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 cedb60a28..9c892c22c 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Fx
Bundle-SymbolicName: org.eclipse.fx.ui.workbench.fx;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: javax.inject;bundle-version="1.0.0",
org.eclipse.e4.core.contexts;bundle-version="1.1.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.fx/pom.xml b/bundles/runtime/org.eclipse.fx.ui.workbench.fx/pom.xml
index 2207d8de9..e40696394 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.fx/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.fx/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF
index 18378fad9..f933d552d 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Base
Bundle-SymbolicName: org.eclipse.fx.ui.workbench.renderers.base
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1",
org.eclipse.e4.core.contexts;bundle-version="1.1.0",
org.eclipse.e4.core.services;bundle-version="1.0.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/pom.xml b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/pom.xml
index 5e04983bf..0258ad405 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF
index 29c6b50d5..003b9cc5b 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Fx
Bundle-SymbolicName: org.eclipse.fx.ui.workbench.renderers.fx
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1",
org.eclipse.fx.ui.panes;bundle-version="0.9.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/pom.xml b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/pom.xml
index 444d66083..f99599480 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench3/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench3/META-INF/MANIFEST.MF
index bf60097e1..c68e857f2 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench3/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench3/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ui.workbench3
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.7.0";visibility:=reexport,
org.eclipse.swt;bundle-version="3.7.0";visibility:=reexport,
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench3/pom.xml b/bundles/runtime/org.eclipse.fx.ui.workbench3/pom.xml
index 4ae4fbe77..3fa9343a4 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench3/pom.xml
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench3/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ant/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ant/pom.xml
index 9e2801d86..18ef69050 100644
--- a/bundles/tooling/org.eclipse.fx.ide.ant/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ant/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.fx.ide.ant</groupId>
<artifactId>org.eclipse.fx.ide.ant</artifactId>
- <version>0.9.0</version>
+ <version>1.0.0</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
diff --git a/bundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF
index e03617251..d404182a5 100755
--- a/bundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Converter
Bundle-SymbolicName: org.eclipse.fx.ide.converter;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources;bundle-version="3.7.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.converter/pom.xml b/bundles/tooling/org.eclipse.fx.ide.converter/pom.xml
index 556202e01..8284f1237 100755
--- a/bundles/tooling/org.eclipse.fx.ide.converter/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.converter/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
index 961718d48..72f0c3dab 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.fx.ide.css.cssext.ui
Bundle-Vendor: BestSolution.at
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.fx.ide.css.cssext;visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml
index 3e562825b..9bda09e06 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
index 3e06b4a55..977696f44 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.fx.ide.css.cssext
Bundle-Vendor: BestSolution.at
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml
index e4d7dc6b8..f27cc0332 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.jfx/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.jfx/META-INF/MANIFEST.MF
index ead4adf44..bb3701efd 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.jfx/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.jfx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ide.css.jfx
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.fx.ide.css.ui;bundle-version="0.9.0",
org.eclipse.swt;bundle-version="3.7.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.jfx/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.jfx/pom.xml
index 748b53d7d..69f5ebecf 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.jfx/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.jfx/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF
index cb04e5c78..e9ed556e7 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.css.tests;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.fx.ide.css;bundle-version="0.0.14",
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF
index ae0d93e4c..64c491d1f 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.css.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.fx.ide.css;bundle-version="0.9.0";visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml
index 1f6926dc3..a1321e80d 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF
index 0a9e99711..04c08739b 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.css;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0";visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css/pom.xml
index 812d2fb7e..28ccf9587 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF
index 6675aeafa..8a01d54e6 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.fxgraph.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.fx.ide.fxgraph;visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml
index 3579b89ee..199a7e86e 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF
index 95dcc3cdf..7ce44dc54 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.fxgraph; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0";visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml
index 2d7aaf8a0..07e5aedb8 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF
index c83acff49..8faf67c1f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Compiler
Bundle-SymbolicName: org.eclipse.fx.ide.fxml.compiler
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava,
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml
index e764aa052..6556e82f0 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF
index b837dff35..7789a8cb2 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Fxml
Bundle-SymbolicName: org.eclipse.fx.ide.fxml;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.ide.fxml.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml
index 4a714437d..94c889d50 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF
index 4e2f2bd91..a5ef14053 100755
--- a/bundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JavaFX Tooling Java Check
Bundle-SymbolicName: org.eclipse.fx.ide.java6;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: BestSolution.at
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui;bundle-version="3.7.0"
diff --git a/bundles/tooling/org.eclipse.fx.ide.java6/pom.xml b/bundles/tooling/org.eclipse.fx.ide.java6/pom.xml
index e730d679a..4b61c3934 100755
--- a/bundles/tooling/org.eclipse.fx.ide.java6/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.java6/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF
index 046fcdc46..4183019de 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ide.jdt.core;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.jdt.core;bundle-version="3.7.0",
org.eclipse.equinox.common;bundle-version="3.6.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml b/bundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml
index 07dad9ba4..90a6f9873 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF
index 9837d556a..8921b95ab 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ide.jdt.ui;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.ide.jdt.ui.internal.JavaFXUIPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml
index 65dd3e6de..388ed4880 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF
index 4f673c8d7..329146d12 100755
--- a/bundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Model
Bundle-SymbolicName: org.eclipse.fx.ide.model;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.ide.model.FXPlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jdt.core;bundle-version="3.7.0"
diff --git a/bundles/tooling/org.eclipse.fx.ide.model/pom.xml b/bundles/tooling/org.eclipse.fx.ide.model/pom.xml
index aed153ddb..6426e3173 100755
--- a/bundles/tooling/org.eclipse.fx.ide.model/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.model/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.classpath b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.classpath
deleted file mode 100755
index b1dabee38..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.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/tooling/org.eclipse.fx.ide.pde.adapter/.gitignore b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.gitignore
deleted file mode 100755
index 4dc009173..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/bin
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.project b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.project
deleted file mode 100755
index f83f8fd35..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.fx.ide.pde.adapter</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/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.core.resources.prefs b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index 4824b8026..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.core.runtime.prefs b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100755
index deae05a97..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.jdt.core.prefs b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index f42de363a..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/.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/tooling/org.eclipse.fx.ide.pde.adapter/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/META-INF/MANIFEST.MF
deleted file mode 100755
index 7a2361d63..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.fx.ide.pde.adapter
-Bundle-Version: 0.9.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core;bundle-version="[3.7.0,3.9.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.pde.core
-Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/OSGI-INF/l10n/bundle.properties b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/OSGI-INF/l10n/bundle.properties
deleted file mode 100755
index 02d9d97d9..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.fx.ide.pde.adapter
-Bundle-Vendor = BestSolution.at
-Bundle-Name = Adaptors for PDE \ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/about.html b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/about.html
deleted file mode 100755
index ecd1378e9..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/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/tooling/org.eclipse.fx.ide.pde.adapter/build.properties b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/build.properties
deleted file mode 100755
index bad151d65..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- OSGI-INF/
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/pom.xml
deleted file mode 100755
index 141de9f29..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/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 - IDE - PDE Classpath Enhancer</name>
- <groupId>org.eclipse.fx.ide</groupId>
- <artifactId>org.eclipse.fx.ide.pde.adapter</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <parent>
- <groupId>org.eclipse.fx.ide</groupId>
- <artifactId>releng</artifactId>
- <relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-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/tooling/org.eclipse.fx.ide.pde.adapter/src/org/eclipse/pde/core/IClasspathContributor.java b/bundles/tooling/org.eclipse.fx.ide.pde.adapter/src/org/eclipse/pde/core/IClasspathContributor.java
deleted file mode 100755
index 3ad08a834..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.adapter/src/org/eclipse/pde/core/IClasspathContributor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * BestSolution.at - initial API and implementation
- * IBM Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.core;
-
-import java.util.List;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-
-/**
- * Implementors of this interface can contribute additional {@link IClasspathEntry}
- * to a plug-in project as the classpath is computed. The contributor is consulted
- * when the initial classpath for a plug-in project is calculated as well as whenever
- * a new bundle dependency is created.
- * <p>
- * A classpath contributor is declared as an extension (<code>org.eclipse.pde.core.pluginClasspathContributors</code>).
- * </p>
- * <p>
- * The added classpath entries are only stored as long as the project classpath is and will
- * not be considered during plug-in or feature export.
- * </p>
- *
- * @since 3.9
- */
-public interface IClasspathContributor {
-
- /**
- * Get any additional classpath entries to add to a project when its classpath is
- * first computed. The provided {@link BundleDescription} describes the plug-in
- * project that the classpath is being computed for. Additional PDE model information
- * can be obtained using {@link PluginRegistry#findModel(BundleDescription)}.
- *
- * @param project the bundle descriptor for the plug-in project having its classpath computed
- * @return additional classpath entries to add to the project, possibly empty, must not be <code>null</code>
- */
- public List<IClasspathEntry> getInitialEntries(BundleDescription project);
-
- /**
- * Get any additional classpath entries to add to a project when a new bundle
- * is being added to the project classpath as a dependency. The {@link BundleDescription}
- * is provided for both the plug-in that the classpath is being calculated for and
- * the dependency being added. The dependency may be a project in the workspace or an
- * external bundle from the target platform.
- *
- * @param project the bundle descriptor for the plug-in project having its classpath computed
- * @param addedDependency the bundle descriptor for the bundle being added to the classpath as a dependency
- * @return additional classpath entries to add to the project, possibly empty, must not be <code>null</code>
- */
- public List<IClasspathEntry> getEntriesForDependency(BundleDescription project, BundleDescription addedDependency);
-}
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.classpath b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.classpath
deleted file mode 100755
index b1dabee38..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.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/tooling/org.eclipse.fx.ide.pde.fragment/.gitignore b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.gitignore
deleted file mode 100755
index 4dc009173..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/bin
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.project b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.project
deleted file mode 100755
index 6c989117a..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.fx.ide.pde.fragment</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/tooling/org.eclipse.fx.ide.pde.fragment/.project.swp b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.project.swp
deleted file mode 100644
index 5d253cbb1..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.project.swp
+++ /dev/null
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.core.resources.prefs b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index 4824b8026..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.core.runtime.prefs b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100755
index deae05a97..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.jdt.core.prefs b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index f42de363a..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/.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/tooling/org.eclipse.fx.ide.pde.fragment/IP-TODO.txt b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/IP-TODO.txt
deleted file mode 100755
index 8072add0d..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/IP-TODO.txt
+++ /dev/null
@@ -1 +0,0 @@
-Class is copied from PDE 3.9 \ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/META-INF/MANIFEST.MF
deleted file mode 100755
index 449c37a3c..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.fx.ide.pde.fragment;singleton:=true
-Bundle-Version: 0.9.0.qualifier
-Fragment-Host: org.eclipse.pde.core;bundle-version="[3.7.0,3.9.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Equinox-BundleType: fxpatch.fragment
-Require-Bundle: org.eclipse.fx.ide.jdt.core;bundle-version="0.9.0",
- org.eclipse.fx.ide.pde.adapter;bundle-version="0.9.0"
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.pde.core
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/OSGI-INF/l10n/bundle.properties b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/OSGI-INF/l10n/bundle.properties
deleted file mode 100755
index 15d7826d0..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.fx.ide.pde.fragment
-Bundle-Vendor = BestSolution.at
-Bundle-Name = Fragment which patches PDE \ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/about.html b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/about.html
deleted file mode 100755
index ecd1378e9..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/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/tooling/org.eclipse.fx.ide.pde.fragment/build.properties b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/build.properties
deleted file mode 100755
index ec79a6ae8..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- OSGI-INF/,\
- fragment.xml
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/fragment.xml b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/fragment.xml
deleted file mode 100755
index f4374ca4b..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/fragment.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<fragment>
- <extension-point id="pluginClasspathContributors" name="pluginClasspathContributors" schema="schema/pluginClasspathContributors.exsd"/>
-
-</fragment>
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/pom.xml
deleted file mode 100755
index 6b8371364..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/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 - IDE - PDE Patch Fragment</name>
- <groupId>org.eclipse.fx.ide</groupId>
- <artifactId>org.eclipse.fx.ide.pde.fragment</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <parent>
- <groupId>org.eclipse.fx.ide</groupId>
- <artifactId>releng</artifactId>
- <relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-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/tooling/org.eclipse.fx.ide.pde.fragment/schema/pluginClasspathContributors.exsd b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/schema/pluginClasspathContributors.exsd
deleted file mode 100755
index 11b06d70c..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/schema/pluginClasspathContributors.exsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.pde.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.pde.core" id="pluginClasspathContributors" name="Plug-in Classpath Contributors"/>
- </appinfo>
- <documentation>
- This extension point provides a mechanism to contribute additional classpath entries to a plug-in project when the PDE classpath is computered. Each plug-in classpath contributor is consulted for additional entries when the initial classpath is calculated as well as whenever a new bundle dependency is added to the project.
-
-The additional classpath entries are only stored as long as the project classpath is. The additional entries will not be considered during plug-in or feature export.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="contributor"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="contributor">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- The class that implements the plug-in classpath contributor. The class must implement &lt;code&gt;IClasspathContributor&lt;/code&gt;
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.pde.core.IClasspathContributor"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- 3.9
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- The following is an example of the classpath contributor
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension
- point=&quot;org.eclipse.pde.core.pluginClasspathContributors&quot;&gt;
- &lt;contribtor
- class=&quot;at.bestsolution.efxclipse.tooling.pde.core.JavaFXClassPathExtender&quot;&gt;
- &lt;/contribtor&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- Each contributor must provide a class that implements &lt;code&gt;org.eclipse.pde.core.IClasspathContributor&lt;/code&gt;
- </documentation>
- </annotation>
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2013 BestSolution.at and others.&amp;lt;br&amp;gt;
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-&amp;lt;a href=&amp;quot;http://www.eclipse.org/legal/epl-v10.html&amp;quot;&amp;gt;http://www.eclipse.org/legal/epl-v10.html&amp;lt;/a&amp;gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java b/bundles/tooling/org.eclipse.fx.ide.pde.fragment/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java
deleted file mode 100755
index 3e9e01f8a..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.fragment/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.core;
-
-import java.io.File;
-import java.util.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.osgi.service.resolver.*;
-import org.eclipse.pde.core.IClasspathContributor;
-import org.eclipse.pde.core.build.IBuild;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.PluginRegistry;
-import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-
-public class RequiredPluginsClasspathContainer extends PDEClasspathContainer implements IClasspathContainer {
-
- private IPluginModelBase fModel;
- private IBuild fBuild;
-
- private static boolean DEBUG = false;
-
- private IClasspathEntry[] fEntries = null;
-
- /**
- * Cached list of {@link IClasspathContributor} from plug-in extensions
- * @see #getClasspathContributors()
- */
- private List<IClasspathContributor> fClasspathContributors = null;
-
- static {
- DEBUG = PDECore.getDefault().isDebugging() && "true".equals(Platform.getDebugOption("org.eclipse.pde.core/classpath")); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Constructor for RequiredPluginsClasspathContainer.
- */
- public RequiredPluginsClasspathContainer(IPluginModelBase model) {
- this(model, null);
- }
-
- public RequiredPluginsClasspathContainer(IPluginModelBase model, IBuild build) {
- fModel = model;
- fBuild = build;
- System.err.println("LAUNCHING PATCHED CLASSPATH CONTAINER");
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jdt.core.IClasspathContainer#getKind()
- */
- public int getKind() {
- return K_APPLICATION;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jdt.core.IClasspathContainer#getPath()
- */
- public IPath getPath() {
- return PDECore.REQUIRED_PLUGINS_CONTAINER_PATH;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jdt.core.IClasspathContainer#getDescription()
- */
- public String getDescription() {
- return PDECoreMessages.RequiredPluginsClasspathContainer_description;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jdt.core.IClasspathContainer#getClasspathEntries()
- */
- public IClasspathEntry[] getClasspathEntries() {
- if (fModel == null) {
- if (DEBUG) {
- System.out.println("********Returned an empty container"); //$NON-NLS-1$
- System.out.println();
- }
- return new IClasspathEntry[0];
- }
- if (fEntries == null) {
- fEntries = computePluginEntries();
- }
- if (DEBUG) {
- System.out.println("Dependencies for plugin '" + fModel.getPluginBase().getId() + "':"); //$NON-NLS-1$ //$NON-NLS-2$
- for (int i = 0; i < fEntries.length; i++) {
- System.out.println(fEntries[i]);
- }
- System.out.println();
- }
- return fEntries;
- }
-
- private IClasspathEntry[] computePluginEntries() {
- System.err.println("COMPUTING ENTRIES");
- ArrayList<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
- try {
- BundleDescription desc = fModel.getBundleDescription();
- if (desc == null)
- return new IClasspathEntry[0];
-
- Map<BundleDescription, ArrayList<Rule>> map = retrieveVisiblePackagesFromState(desc);
-
- // Add any library entries contributed via classpath contributor extension (Bug 363733)
- for (IClasspathContributor cc : getClasspathContributors()) {
- System.err.println("Consulting " + cc);
- List<IClasspathEntry> classpathEntries = cc.getInitialEntries(desc);
- if (classpathEntries == null || classpathEntries.isEmpty()) {
- continue;
- }
- entries.addAll(classpathEntries);
- }
-
- HashSet<BundleDescription> added = new HashSet<BundleDescription>();
-
- // to avoid cycles, e.g. when a bundle imports a package it exports
- added.add(desc);
-
- HostSpecification host = desc.getHost();
- if (host != null) {
- addHostPlugin(host, added, map, entries);
- } else if ("true".equals(System.getProperty("pde.allowCycles"))) { //$NON-NLS-1$ //$NON-NLS-2$
- BundleDescription[] fragments = desc.getFragments();
- for (int i = 0; i < fragments.length; i++) {
- if (fragments[i].isResolved()) {
- addPlugin(fragments[i], false, map, entries);
- }
- }
- }
-
- // add dependencies
- BundleSpecification[] required = desc.getRequiredBundles();
- for (int i = 0; i < required.length; i++) {
- addDependency((BundleDescription) required[i].getSupplier(), added, map, entries);
- }
-
- if (fBuild == null)
- fBuild = ClasspathUtilCore.getBuild(fModel);
- if (fBuild != null)
- addSecondaryDependencies(desc, added, entries);
-
- // add Import-Package
- // sort by symbolicName_version to get a consistent order
- Map<String, BundleDescription> sortedMap = new TreeMap<String, BundleDescription>();
- Iterator<BundleDescription> iter = map.keySet().iterator();
- while (iter.hasNext()) {
- BundleDescription bundle = iter.next();
- sortedMap.put(bundle.toString(), bundle);
- }
-
- iter = sortedMap.values().iterator();
- while (iter.hasNext()) {
- BundleDescription bundle = iter.next();
- IPluginModelBase model = PluginRegistry.findModel(bundle);
- if (model != null && model.isEnabled())
- addDependencyViaImportPackage(model.getBundleDescription(), added, map, entries);
- }
-
- if (fBuild != null)
- addExtraClasspathEntries(added, entries);
-
- } catch (CoreException e) {
- }
- return entries.toArray(new IClasspathEntry[entries.size()]);
- }
-
- /**
- * Return the list of {@link IClasspathContributor}s provided by the
- * <code>org.eclipse.pde.core.pluginClasspathContributors</code> extension point.
- * @return list of classpath contributors from the extension point
- */
- private List<IClasspathContributor> getClasspathContributors() {
- if (fClasspathContributors == null) {
- fClasspathContributors = new ArrayList<IClasspathContributor>();
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = registry.getConfigurationElementsFor("org.eclipse.pde.core.pluginClasspathContributors"); //$NON-NLS-1$
- for (int i = 0; i < elements.length; i++) {
- try {
- fClasspathContributors.add((IClasspathContributor) elements[i].createExecutableExtension("class")); //$NON-NLS-1$
- } catch (CoreException e) {
- PDECore.log(e.getStatus());
- }
- }
- }
- return fClasspathContributors;
- }
-
- private Map<BundleDescription, ArrayList<Rule>> retrieveVisiblePackagesFromState(BundleDescription desc) {
- Map<BundleDescription, ArrayList<Rule>> visiblePackages = new HashMap<BundleDescription, ArrayList<Rule>>();
- StateHelper helper = Platform.getPlatformAdmin().getStateHelper();
- addVisiblePackagesFromState(helper, desc, visiblePackages);
- if (desc.getHost() != null)
- addVisiblePackagesFromState(helper, (BundleDescription) desc.getHost().getSupplier(), visiblePackages);
- return visiblePackages;
- }
-
- private void addVisiblePackagesFromState(StateHelper helper, BundleDescription desc, Map<BundleDescription, ArrayList<Rule>> visiblePackages) {
- if (desc == null)
- return;
- ExportPackageDescription[] exports = helper.getVisiblePackages(desc);
- for (int i = 0; i < exports.length; i++) {
- BundleDescription exporter = exports[i].getExporter();
- if (exporter == null)
- continue;
- ArrayList<Rule> list = visiblePackages.get(exporter);
- if (list == null) {
- list = new ArrayList<Rule>();
- visiblePackages.put(exporter, list);
- }
- Rule rule = getRule(helper, desc, exports[i]);
- if (!list.contains(rule))
- list.add(rule);
- }
- }
-
- private Rule getRule(StateHelper helper, BundleDescription desc, ExportPackageDescription export) {
- Rule rule = new Rule();
- rule.discouraged = helper.getAccessCode(desc, export) == StateHelper.ACCESS_DISCOURAGED;
- String name = export.getName();
- rule.path = (name.equals(".")) ? new Path("*") : new Path(name.replaceAll("\\.", "/") + "/*"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return rule;
- }
-
- protected void addDependencyViaImportPackage(BundleDescription desc, HashSet<BundleDescription> added, Map<BundleDescription, ArrayList<Rule>> map, ArrayList<IClasspathEntry> entries) throws CoreException {
- if (desc == null || !added.add(desc))
- return;
-
- addPlugin(desc, true, map, entries);
-
- if (hasExtensibleAPI(desc) && desc.getContainingState() != null) {
- BundleDescription[] fragments = desc.getFragments();
- for (int i = 0; i < fragments.length; i++) {
- if (fragments[i].isResolved())
- addDependencyViaImportPackage(fragments[i], added, map, entries);
- }
- }
- }
-
- private void addDependency(BundleDescription desc, HashSet<BundleDescription> added, Map<BundleDescription, ArrayList<Rule>> map, ArrayList<IClasspathEntry> entries) throws CoreException {
- addDependency(desc, added, map, entries, true);
- }
-
- private void addDependency(BundleDescription desc, HashSet<BundleDescription> added, Map<BundleDescription, ArrayList<Rule>> map, ArrayList<IClasspathEntry> entries, boolean useInclusion) throws CoreException {
- if (desc == null || !added.add(desc))
- return;
-
- BundleDescription[] fragments = hasExtensibleAPI(desc) ? desc.getFragments() : new BundleDescription[0];
-
- // add fragment patches before host
- for (int i = 0; i < fragments.length; i++) {
- if (fragments[i].isResolved() && ClasspathUtilCore.isPatchFragment(fragments[i])) {
- addDependency(fragments[i], added, map, entries, useInclusion);
- }
- }
-
- addPlugin(desc, useInclusion, map, entries);
-
- // add fragments that are not patches after the host
- for (int i = 0; i < fragments.length; i++) {
- if (fragments[i].isResolved() && !ClasspathUtilCore.isPatchFragment(fragments[i])) {
- addDependency(fragments[i], added, map, entries, useInclusion);
- }
- }
-
- BundleSpecification[] required = desc.getRequiredBundles();
- for (int i = 0; i < required.length; i++) {
- if (required[i].isExported()) {
- addDependency((BundleDescription) required[i].getSupplier(), added, map, entries, useInclusion);
- }
- }
- }
-
- private boolean addPlugin(BundleDescription desc, boolean useInclusions, Map<BundleDescription, ArrayList<Rule>> map, ArrayList<IClasspathEntry> entries) throws CoreException {
- IPluginModelBase model = PluginRegistry.findModel(desc);
- if (model == null || !model.isEnabled())
- return false;
-
- IResource resource = model.getUnderlyingResource();
- Rule[] rules = useInclusions ? getInclusions(map, model) : null;
-
- BundleDescription hostBundle = fModel.getBundleDescription();
- if (desc == null)
- return false;
-
- // Add any library entries contributed via classpath contributor extension (Bug 363733)
- for (IClasspathContributor cc : getClasspathContributors()) {
- List<IClasspathEntry> classpathEntries = cc.getEntriesForDependency(hostBundle, desc);
- if (classpathEntries == null || classpathEntries.isEmpty()) {
- continue;
- }
- entries.addAll(classpathEntries);
- }
-
- if (resource != null) {
- addProjectEntry(resource.getProject(), rules, entries);
- } else {
- addExternalPlugin(model, rules, entries);
- }
- return true;
- }
-
- private Rule[] getInclusions(Map<BundleDescription, ArrayList<Rule>> map, IPluginModelBase model) {
- BundleDescription desc = model.getBundleDescription();
- if (desc == null || "false".equals(System.getProperty("pde.restriction")) //$NON-NLS-1$ //$NON-NLS-2$
- || !(fModel instanceof IBundlePluginModelBase) || TargetPlatformHelper.getTargetVersion() < 3.1)
- return null;
-
- Rule[] rules;
-
- if (desc.getHost() != null)
- rules = getInclusions(map, (BundleDescription) desc.getHost().getSupplier());
- else
- rules = getInclusions(map, desc);
-
- return (rules.length == 0 && !ClasspathUtilCore.hasBundleStructure(model)) ? null : rules;
- }
-
- private Rule[] getInclusions(Map<BundleDescription, ArrayList<Rule>> map, BundleDescription desc) {
- ArrayList<?> list = map.get(desc);
- return list != null ? (Rule[]) list.toArray(new Rule[list.size()]) : new Rule[0];
- }
-
- private void addHostPlugin(HostSpecification hostSpec, HashSet<BundleDescription> added, Map<BundleDescription, ArrayList<Rule>> map, ArrayList<IClasspathEntry> entries) throws CoreException {
- BaseDescription desc = hostSpec.getSupplier();
-
- if (desc instanceof BundleDescription) {
- BundleDescription host = (BundleDescription) desc;
-
- // add host plug-in
- if (added.add(host) && addPlugin(host, false, map, entries)) {
- BundleSpecification[] required = host.getRequiredBundles();
- for (int i = 0; i < required.length; i++) {
- addDependency((BundleDescription) required[i].getSupplier(), added, map, entries);
- }
-
- // add Import-Package
- ImportPackageSpecification[] imports = host.getImportPackages();
- for (int i = 0; i < imports.length; i++) {
- BaseDescription supplier = imports[i].getSupplier();
- if (supplier instanceof ExportPackageDescription) {
- addDependencyViaImportPackage(((ExportPackageDescription) supplier).getExporter(), added, map, entries);
- }
- }
- }
- }
- }
-
- private boolean hasExtensibleAPI(BundleDescription desc) {
- IPluginModelBase model = PluginRegistry.findModel(desc);
- return model != null ? ClasspathUtilCore.hasExtensibleAPI(model) : false;
- }
-
- protected void addExtraClasspathEntries(HashSet<BundleDescription> added, ArrayList<IClasspathEntry> entries) {
- IBuildEntry[] buildEntries = fBuild.getBuildEntries();
- for (int i = 0; i < buildEntries.length; i++) {
- String name = buildEntries[i].getName();
- if (name.equals(IBuildPropertiesConstants.PROPERTY_JAR_EXTRA_CLASSPATH) || name.startsWith(IBuildPropertiesConstants.PROPERTY_EXTRAPATH_PREFIX)) {
- addExtraClasspathEntries(added, entries, buildEntries[i].getTokens());
- }
- }
- }
-
- protected void addExtraClasspathEntries(HashSet<BundleDescription> added, ArrayList<IClasspathEntry> entries, String[] tokens) {
- for (int i = 0; i < tokens.length; i++) {
- IPath path = Path.fromPortableString(tokens[i]);
- if (!path.isAbsolute()) {
- File file = new File(fModel.getInstallLocation(), path.toString());
- if (file.exists()) {
- IFile resource = PDECore.getWorkspace().getRoot().getFileForLocation(new Path(file.getAbsolutePath()));
- if (resource != null && resource.getProject().equals(fModel.getUnderlyingResource().getProject())) {
- addExtraLibrary(resource.getFullPath(), null, entries);
- continue;
- }
- }
- if (path.segmentCount() >= 3 && "..".equals(path.segment(0))) { //$NON-NLS-1$
- path = path.removeFirstSegments(1);
- path = Path.fromPortableString("platform:/plugin/").append(path); //$NON-NLS-1$
- } else {
- continue;
- }
- }
-
- if (!path.toPortableString().startsWith("platform:")) { //$NON-NLS-1$
- addExtraLibrary(path, null, entries);
- } else {
- int count = path.getDevice() == null ? 4 : 3;
- if (path.segmentCount() >= count) {
- String pluginID = path.segment(count - 2);
- if (added.contains(pluginID))
- continue;
- IPluginModelBase model = PluginRegistry.findModel(pluginID);
- if (model != null && model.isEnabled()) {
- path = path.setDevice(null);
- path = path.removeFirstSegments(count - 1);
- if (model.getUnderlyingResource() == null) {
- File file = new File(model.getInstallLocation(), path.toOSString());
- if (file.exists()) {
- addExtraLibrary(new Path(file.getAbsolutePath()), model, entries);
- }
- } else {
- IProject project = model.getUnderlyingResource().getProject();
- IFile file = project.getFile(path);
- if (file.exists()) {
- addExtraLibrary(file.getFullPath(), model, entries);
- }
- }
- }
- }
- }
- }
- }
-
- private void addSecondaryDependencies(BundleDescription desc, HashSet<BundleDescription> added, ArrayList<IClasspathEntry> entries) {
- try {
- IBuildEntry entry = fBuild.getEntry(IBuildEntry.SECONDARY_DEPENDENCIES);
- if (entry != null) {
- String[] tokens = entry.getTokens();
- for (int i = 0; i < tokens.length; i++) {
- String pluginId = tokens[i];
- // Get PluginModelBase first to resolve system.bundle entry if it exists
- IPluginModelBase model = PluginRegistry.findModel(pluginId);
- if (model != null) {
- BundleDescription bundleDesc = model.getBundleDescription();
- if (added.contains(bundleDesc))
- continue;
- Map<BundleDescription, ArrayList<Rule>> rules = new HashMap<BundleDescription, ArrayList<Rule>>();
- findExportedPackages(bundleDesc, desc, rules);
- addDependency(bundleDesc, added, rules, entries, true);
- }
- }
- }
- } catch (CoreException e) {
- return;
- }
- }
-
- protected final void findExportedPackages(BundleDescription desc, BundleDescription projectDesc, Map<BundleDescription, ArrayList<Rule>> map) {
- if (desc != null) {
- Stack<BaseDescription> stack = new Stack<BaseDescription>();
- stack.add(desc);
- while (!stack.isEmpty()) {
- BundleDescription bdesc = (BundleDescription) stack.pop();
- ExportPackageDescription[] expkgs = bdesc.getExportPackages();
- ArrayList<Rule> rules = new ArrayList<Rule>();
- for (int i = 0; i < expkgs.length; i++) {
- Rule rule = new Rule();
- rule.discouraged = restrictPackage(projectDesc, expkgs[i]);
- rule.path = new Path(expkgs[i].getName().replaceAll("\\.", "/") + "/*"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- rules.add(rule);
- }
- map.put(bdesc, rules);
-
- // Look at re-exported Require-Bundles for any other exported packages
- BundleSpecification[] requiredBundles = bdesc.getRequiredBundles();
- for (int i = 0; i < requiredBundles.length; i++)
- if (requiredBundles[i].isExported()) {
- BaseDescription bd = requiredBundles[i].getSupplier();
- if (bd != null && bd instanceof BundleDescription)
- stack.add(bd);
- }
- }
- }
- }
-
- private boolean restrictPackage(BundleDescription desc, ExportPackageDescription pkg) {
- String[] friends = (String[]) pkg.getDirective(ICoreConstants.FRIENDS_DIRECTIVE);
- if (friends != null) {
- String symbolicName = desc.getSymbolicName();
- for (int i = 0; i < friends.length; i++) {
- if (symbolicName.equals(friends[i]))
- return false;
-
- }
- return true;
- }
- return (((Boolean) pkg.getDirective(ICoreConstants.INTERNAL_DIRECTIVE)).booleanValue());
- }
-
- private void addExtraLibrary(IPath path, IPluginModelBase model, ArrayList<IClasspathEntry> entries) {
- if (path.segmentCount() > 1) {
- IPath srcPath = null;
- if (model != null) {
- IPath shortPath = path.removeFirstSegments(path.matchingFirstSegments(new Path(model.getInstallLocation())));
- srcPath = ClasspathUtilCore.getSourceAnnotation(model, shortPath.toString());
- } else {
- String filename = ClasspathUtilCore.getSourceZipName(path.lastSegment());
- IPath candidate = path.removeLastSegments(1).append(filename);
- if (PDECore.getWorkspace().getRoot().getFile(candidate).exists())
- srcPath = candidate;
- }
- IClasspathEntry clsEntry = JavaCore.newLibraryEntry(path, srcPath, null);
- if (!entries.contains(clsEntry))
- entries.add(clsEntry);
- }
- }
-}
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF
index 327e59dd4..b7b058e67 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF
@@ -2,11 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Java7
Bundle-SymbolicName: org.eclipse.fx.ide.pde.java7;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.jdt.core;bundle-version="3.7.0",
org.eclipse.jdt.launching;bundle-version="3.6.0",
- org.eclipse.fx.ide.pde.adapter;bundle-version="0.9.0";resolution:=optional,
org.eclipse.fx.ide.jdt.core;bundle-version="0.9.0",
org.eclipse.pde.core;bundle-version="3.7.0"
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml
index a6227d462..ed1b24d1a 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF
index 6de94d8d8..9791c9916 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: E4 PDE
Bundle-SymbolicName: org.eclipse.fx.ide.pde.ui.e4;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.ide.pde.ui.e4.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml
index eac4fceb6..022e5c2cb 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF
index 648ffe83f..8ed83048f 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ide.pde.ui;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.pde.ui;bundle-version="3.6.100",
org.eclipse.jface;bundle-version="3.7.0",
@@ -24,8 +24,7 @@ Require-Bundle: org.eclipse.pde.ui;bundle-version="3.6.100",
org.eclipse.fx.ide.rrobot.model;bundle-version="0.9.0",
org.eclipse.jdt.ui;bundle-version="3.7.0",
org.eclipse.fx.ide.rrobot;bundle-version="0.9.0",
- org.eclipse.fx.ide.rrobot.dsl;bundle-version="0.9.0",
- org.eclipse.fx.ide.pde.adapter;bundle-version="0.9.0";resolution:=optional
+ org.eclipse.fx.ide.rrobot.dsl;bundle-version="0.9.0"
Bundle-Activator: org.eclipse.fx.ide.pde.ui.Activator
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml
index 8f1f41252..b011bea18 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF
index 0385e9a3e..2a2749669 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: RRobot UI
Bundle-Vendor: My Company
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.rrobot.dsl.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.fx.ide.rrobot.dsl;visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml
index 990b28bc9..a3d4d8795 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF
index bba46ef27..9fc166f50 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.fx.ide.rrobot.dsl
Bundle-Vendor: My Company
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.rrobot.dsl;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml
index 6e1c971a6..eb5b7b387 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF
index 07bef8a6f..259a62b22 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.fx.ide.rrobot.model;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml
index 476ccd1cc..b5e98c879 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF
index ba7d1e0db..e80123bfc 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Rrobot
Bundle-SymbolicName: org.eclipse.fx.ide.rrobot
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0",
org.eclipse.fx.ide.rrobot.model;bundle-version="0.9.0";visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml
index 4f9316389..e6dc38ff9 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF
index 7f89bd645..f14444b45 100644
--- a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Device
Bundle-SymbolicName: org.eclipse.fx.ide.ui.mobile.sim.device
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.2.0",
javafx.application;version="2.2.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml
index 4207cf824..8ca559a56 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF
index 7bb0319b5..7f75f4495 100644
--- a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Launch
Bundle-SymbolicName: org.eclipse.fx.ide.ui.mobile.sim.launch;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.jdt.core;bundle-version="3.8.0",
org.eclipse.core.runtime;bundle-version="3.8.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml
index d8fc1339a..35c0c32c8 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF
index e1da50ef6..041f53d27 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ide.ui.preview;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.ide.ui.preview.bundle.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui;bundle-version="3.7.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml
index ac93aa150..65fcde4b7 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF
index 1c0ed8dff..31051ad38 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.fx.ide.ui;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.ide.ui.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.databinding;bundle-version="1.4.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ui/pom.xml
index c825c4efa..4dcfa6721 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ui/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/demos/org.eclipse.fx.demo.charts/build.fxbuild b/demos/org.eclipse.fx.demo.charts/build.fxbuild
index 94c355803..db88a1b7a 100755
--- a/demos/org.eclipse.fx.demo.charts/build.fxbuild
+++ b/demos/org.eclipse.fx.demo.charts/build.fxbuild
@@ -2,7 +2,7 @@
<anttasks:AntTask xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:anttasks="http://org.eclipse.fx.ide.jdt/1.0" buildDirectory="${workspace}/at.bestsolution.efxclipse.runtime.examples.chart/build">
<deploy>
<application name="Pie Chart Sample" mainclass="org.eclipse.fx.demo.charts.PieChartSample" version="1.0.0"/>
- <info vendor="BestSolution.at"/>
+ <info vendor="estSolution.at"/>
</deploy>
<signjar/>
</anttasks:AntTask>
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 225b340ec..9ce1552cb 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Contacts Plug-in (Incubation)
Bundle-SymbolicName: org.eclipse.fx.demo.contacts.app;singleton:=true
-Bundle-Version: 0.9.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.fx.ui.workbench.fx,
diff --git a/demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch b/demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch
index 955562aa4..8e1a7933d 100644
--- a/demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch
+++ b/demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch
@@ -13,16 +13,16 @@
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/contacts.product"/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-contacts.product"/>
+<stringAttribute key="location" value="/tmp/runtime-contacts.product"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="false"/>
<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.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consoleLog -nosplash"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -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="-Dosgi.framework.extensions=org.eclipse.fx.osgi"/>
<stringAttribute key="pde.version" value="3.3"/>
<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.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@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.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.core@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
+<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.apache.commons.lang@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@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.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.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.emf.databinding@default:default,org.eclipse.fx.emf.edit.ui@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.osgi@default:false,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.lifecycle@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,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.demo.contacts@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
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 5bd2420de..1679b267e 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
@@ -22,8 +22,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<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.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_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.apache.commons.lang@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.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.macosx@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.cdo.ecore.retrofit@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,org.eclipse.team.core@default:default,org.hamcrest.core@default:default,org.junit*4.11.0.v201303080030@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.tests@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.demo.contacts.tests@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.osgi@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.lifecycle@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/src/org/eclipse/fx/demo/fxgraph/osgi/profile.fxml b/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/profile.fxml
index 81bded1d6..7301f7929 100755
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/profile.fxml
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/profile.fxml
@@ -28,7 +28,7 @@
<Separator layoutX="380" layoutY="110" prefHeight="155" orientation="vertical"/>
<Hyperlink fx:id="logout" layoutY="24.0" text="logout" onAction="#processLogout" AnchorPane.rightAnchor="52.0"/>
<Button fx:id="Button" disable="true" maxHeight="2" maxWidth="2.0" text="Continue" defaultButton="true" onAction="#processLogout" AnchorPane.bottomAnchor="15.0" AnchorPane.rightAnchor="52.0"/>
- <Label fx:id="success" layoutX="100.0" layoutY="401.0" opacity="0" text="Profile successfully updated!"/>
+ <Label fx:id="success" layoutX="100.0" layoutY="401.0" opacity="0.0" text="Profile successfully updated!"/>
<Label layoutX="56.0" layoutY="284.0" text="Address:"/>
<TextArea fx:id="address" maxHeight="2.0" maxWidth="2.0" minHeight="85.0" minWidth="448.0" prefHeight="85.0" prefWidth="448.0" AnchorPane.bottomAnchor="69.0" AnchorPane.leftAnchor="149.0" AnchorPane.rightAnchor="52.0" AnchorPane.topAnchor="289.0"/>
</children>
diff --git a/demos/org.eclipse.fx.demo.fxgraph/src/org/eclipse/fx/demo/fxgraph/profile.fxml b/demos/org.eclipse.fx.demo.fxgraph/src/org/eclipse/fx/demo/fxgraph/profile.fxml
index 93a771c8d..40d656c28 100755
--- a/demos/org.eclipse.fx.demo.fxgraph/src/org/eclipse/fx/demo/fxgraph/profile.fxml
+++ b/demos/org.eclipse.fx.demo.fxgraph/src/org/eclipse/fx/demo/fxgraph/profile.fxml
@@ -28,7 +28,7 @@
<Separator layoutX="380" layoutY="110" prefHeight="155" orientation="vertical"/>
<Hyperlink fx:id="logout" layoutY="24.0" text="logout" onAction="#processLogout" AnchorPane.rightAnchor="52.0"/>
<Button fx:id="Button" disable="true" maxHeight="2" maxWidth="2.0" text="Continue" defaultButton="true" onAction="#processLogout" AnchorPane.bottomAnchor="15.0" AnchorPane.rightAnchor="52.0"/>
- <Label fx:id="success" layoutX="100.0" layoutY="401.0" opacity="0" text="Profile successfully updated!"/>
+ <Label fx:id="success" layoutX="100.0" layoutY="401.0" opacity="0.0" text="Profile successfully updated!"/>
<Label layoutX="56.0" layoutY="284.0" text="Address:"/>
<TextArea fx:id="address" maxHeight="2.0" maxWidth="2.0" minHeight="85.0" minWidth="448.0" prefHeight="85.0" prefWidth="448.0" AnchorPane.bottomAnchor="69.0" AnchorPane.leftAnchor="149.0" AnchorPane.rightAnchor="52.0" AnchorPane.topAnchor="289.0"/>
</children>
diff --git a/demos/org.eclipse.fx.demo.logo/build.fxbuild b/demos/org.eclipse.fx.demo.logo/build.fxbuild
index f9cdd3f8f..e1b7912ff 100755
--- a/demos/org.eclipse.fx.demo.logo/build.fxbuild
+++ b/demos/org.eclipse.fx.demo.logo/build.fxbuild
@@ -2,7 +2,7 @@
<anttasks:AntTask xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:anttasks="http://org.eclipse.fx.ide.jdt/1.0" buildDirectory="${workspace}/at.bestsolution.efxclipse.runtime.examples.logo/">
<deploy>
<application name="Logo" mainclass="org.eclipse.fx.demo.logo.LogoAnimation" version="1.0.0"/>
- <info vendor="BestSolution.at"/>
+ <info vendor="estSolution.at"/>
</deploy>
<signjar/>
</anttasks:AntTask>
diff --git a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch
new file mode 100644
index 000000000..1c4f934d7
--- /dev/null
+++ b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.fx.ui.workbench.fx.application"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/org.eclipse.fx.demo.media.product_target"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.fx.demo.media.product"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="false"/>
+<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.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-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="-Dosgi.framework.extensions=org.eclipse.fx.osgi"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<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.lang@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@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.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.fx.ui.animation@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.lifecycle@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,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.demo.media@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
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 167db0bf5..53ca26053 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
@@ -22,8 +22,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<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.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@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.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.lifecycle@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_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.commons.lang@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@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.demo.media@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/releng/org.eclipse.fx.ide.compiler.releng/build.xml b/releng/org.eclipse.fx.ide.compiler.releng/build.xml
index 0357da18e..1cc0693be 100644
--- a/releng/org.eclipse.fx.ide.compiler.releng/build.xml
+++ b/releng/org.eclipse.fx.ide.compiler.releng/build.xml
@@ -50,8 +50,8 @@
<include name="org.apache.commons.logging_1.1.1*.jar"/>
</fileset>
<fileset dir="${efx-prefix}">
- <include name="org.eclipse.fx.ide.fxgraph_0.9.0*.jar"/>
- <include name="org.eclipse.fx.ide.fxml.compiler_0.9.0*.jar"/>
+ <include name="org.eclipse.fx.ide.fxgraph_1.0.0*.jar"/>
+ <include name="org.eclipse.fx.ide.fxml.compiler_1.0.0*.jar"/>
</fileset>
</unzip>
<delete dir="repack/META-INF" />
@@ -71,7 +71,7 @@
<delete file="repack/about_org.eclipse.xtext.xbase.lib.html" />
<delete file="repack/about.html" />
- <jar destfile="target/org.eclipse.fx.fxml.compiler_0.9.0-SNAPSHOT.jar">
+ <jar destfile="target/org.eclipse.fx.fxml.compiler_1.0.0-SNAPSHOT.jar">
<fileset dir="repack">
<include name="**/*"/>
</fileset>
@@ -86,7 +86,7 @@
<mkdir dir="${root-prefix}/efxclipse/compiler-nightly"/>
<copy todir="${root-prefix}/efxclipse/compiler-nightly/">
<fileset dir="target">
- <include name="org.eclipse.fx.fxml.compiler_0.9.0-SNAPSHOT.jar"/>
+ <include name="org.eclipse.fx.fxml.compiler_1.0.0-SNAPSHOT.jar"/>
</fileset>
</copy>
<delete dir="repack" />
diff --git a/releng/org.eclipse.fx.ide.releng/pom.xml b/releng/org.eclipse.fx.ide.releng/pom.xml
index 86208b2e7..dc366e342 100755
--- a/releng/org.eclipse.fx.ide.releng/pom.xml
+++ b/releng/org.eclipse.fx.ide.releng/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho-version>0.18.0</tycho-version>
@@ -21,7 +21,8 @@
<mockito-version>1.8.4</mockito-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<platform-version>[3.7,3.8)</platform-version>
- <runtime_repo>http://download.eclipse.org/efxclipse/runtime-nightly/site/</runtime_repo>
+ <!-- runtime_repo>http://download.eclipse.org/efxclipse/runtime-nightly/site/</runtime_repo-->
+ <runtime_repo>file:/Users/tomschindl/git/efxclipse/releng/org.eclipse.fx.updatesite/target/site</runtime_repo>
<download-publish-path>/home/data/httpd/download.eclipse.org/efxclipse/updates-nightly</download-publish-path>
<eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
</properties>
@@ -32,8 +33,6 @@
<module>../../bundles/tooling/org.eclipse.fx.ide.ui</module>
<module>../../bundles/tooling/org.eclipse.fx.ide.jdt.ui</module>
<module>../../bundles/tooling/org.eclipse.fx.ide.java6</module>
- <module>../../bundles/tooling/org.eclipse.fx.ide.pde.adapter</module>
- <module>../../bundles/tooling/org.eclipse.fx.ide.pde.fragment</module>
<module>../../bundles/tooling/org.eclipse.fx.ide.rrobot.model</module>
<module>../../bundles/tooling/org.eclipse.fx.ide.rrobot</module>
@@ -71,24 +70,17 @@
<module>../tooling/org.eclipse.fx.ide.fxml.feature</module>
<module>../tooling/org.eclipse.fx.ide.converter.feature</module>
<module>../tooling/org.eclipse.fx.ide.pde.feature</module>
- <module>../tooling/org.eclipse.fx.ide.pde.prekepler.feature</module>
<module>../tooling/org.eclipse.fx.ide.mobile.feature</module>
- <module>../tooling/org.eclipse.fx.ide.all.kepler.feature</module>
- <module>../tooling/org.eclipse.fx.ide.all.prekepler.feature</module>
+ <module>../tooling/org.eclipse.fx.ide.feature</module>
<module>../org.eclipse.fx.ide.updatesite</module>
</modules>
<repositories>
<repository>
- <id>kepler</id>
+ <id>luna</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/kepler</url>
- </repository>
- <repository>
- <id>juno</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/juno</url>
+ <url>http://download.eclipse.org/releases/luna</url>
</repository>
<repository>
<id>xtext</id>
diff --git a/releng/org.eclipse.fx.ide.updatesite/pom.xml b/releng/org.eclipse.fx.ide.updatesite/pom.xml
index 0ddfca243..52c4cca1a 100644
--- a/releng/org.eclipse.fx.ide.updatesite/pom.xml
+++ b/releng/org.eclipse.fx.ide.updatesite/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/releng/org.eclipse.fx.ide.updatesite/site.xml b/releng/org.eclipse.fx.ide.updatesite/site.xml
index 3adc30cf2..a7f28f6f7 100644
--- a/releng/org.eclipse.fx.ide.updatesite/site.xml
+++ b/releng/org.eclipse.fx.ide.updatesite/site.xml
@@ -1,33 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.fx.ide.all.kepler.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.all.kepler.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.ide.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.ide.feature" version="1.0.0.qualifier">
<category name="e(fx)clipse - install"/>
</feature>
- <feature url="features/org.eclipse.fx.ide.all.prekepler.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.all.prekepler.feature" version="0.9.0.qualifier">
- <category name="e(fx)clipse - install"/>
- </feature>
- <feature url="features/org.eclipse.fx.ide.basic.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.basic.feature" version="0.9.0.qualifier">
- <category name="e(fx)clipse - single components"/>
- </feature>
- <feature url="features/org.eclipse.fx.ide.css.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.css.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.ide.basic.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.ide.basic.feature" version="1.0.0.qualifier">
<category name="e(fx)clipse - single components"/>
</feature>
- <feature url="features/org.eclipse.fx.ide.fxml.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.fxml.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.ide.css.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.ide.css.feature" version="1.0.0.qualifier">
<category name="e(fx)clipse - single components"/>
</feature>
- <feature url="features/org.eclipse.fx.ide.pde.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.pde.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.ide.fxml.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.ide.fxml.feature" version="1.0.0.qualifier">
<category name="e(fx)clipse - single components"/>
</feature>
- <feature url="features/org.eclipse.fx.ide.pde.prekepler.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.pde.prekepler.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.ide.pde.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.ide.pde.feature" version="1.0.0.qualifier">
<category name="e(fx)clipse - single components"/>
</feature>
- <feature url="features/org.eclipse.fx.ide.rrobot.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.rrobot.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.ide.rrobot.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.ide.rrobot.feature" version="1.0.0.qualifier">
<category name="e(fx)clipse - single components"/>
</feature>
- <feature url="features/org.eclipse.fx.ide.fxgraph.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.fxgraph.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.ide.fxgraph.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.ide.fxgraph.feature" version="1.0.0.qualifier">
<category name="e(fx)clipse - single components"/>
</feature>
- <feature url="features/org.eclipse.fx.ide.converter.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.ide.converter.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.ide.converter.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.ide.converter.feature" version="1.0.0.qualifier">
<category name="e(fx)clipse - single components"/>
</feature>
<category-def name="e(fx)clipse - install" label="e(fx)clipse - install"/>
diff --git a/releng/org.eclipse.fx.releng/pom.xml b/releng/org.eclipse.fx.releng/pom.xml
index f39bcfbbb..c033ceef3 100755
--- a/releng/org.eclipse.fx.releng/pom.xml
+++ b/releng/org.eclipse.fx.releng/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho-version>0.18.0</tycho-version>
@@ -81,9 +81,9 @@
<repositories>
<repository>
- <id>kepler</id>
+ <id>luna</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/kepler</url>
+ <url>http://download.eclipse.org/releases/luna</url>
</repository>
<!-- repository>
<id>kepler-ecf</id>
diff --git a/releng/org.eclipse.fx.updatesite/pom.xml b/releng/org.eclipse.fx.updatesite/pom.xml
index 0c3851034..e0bc29c58 100644
--- a/releng/org.eclipse.fx.updatesite/pom.xml
+++ b/releng/org.eclipse.fx.updatesite/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/releng/org.eclipse.fx.updatesite/site.xml b/releng/org.eclipse.fx.updatesite/site.xml
index d816f588d..4a5ca37ef 100644
--- a/releng/org.eclipse.fx.updatesite/site.xml
+++ b/releng/org.eclipse.fx.updatesite/site.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.fx.core.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.core.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.core.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.core.feature" version="1.0.0.qualifier">
<category name="fxruntime"/>
</feature>
- <feature url="features/org.eclipse.fx.target.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.target.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.target.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.target.feature" version="1.0.0.qualifier">
<category name="fxtarget"/>
</feature>
- <feature url="features/org.eclipse.fx.target.rcp.feature_0.9.0.qualifier.jar" id="org.eclipse.fx.target.rcp.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.fx.target.rcp.feature_1.0.0.qualifier.jar" id="org.eclipse.fx.target.rcp.feature" version="1.0.0.qualifier">
<category name="fxtarget"/>
</feature>
<category-def name="fxruntime" label="FX Runtime"/>
diff --git a/releng/runtime/org.eclipse.fx.core.feature/feature.xml b/releng/runtime/org.eclipse.fx.core.feature/feature.xml
index 9b6e9988a..30d5de0ae 100644
--- a/releng/runtime/org.eclipse.fx.core.feature/feature.xml
+++ b/releng/runtime/org.eclipse.fx.core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.core.feature"
label="e(fx)clipse core Feature"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/runtime/org.eclipse.fx.core.feature/pom.xml b/releng/runtime/org.eclipse.fx.core.feature/pom.xml
index 5bff0dd3b..65712f29b 100644
--- a/releng/runtime/org.eclipse.fx.core.feature/pom.xml
+++ b/releng/runtime/org.eclipse.fx.core.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/runtime/org.eclipse.fx.target.feature/feature.xml b/releng/runtime/org.eclipse.fx.target.feature/feature.xml
index ef80be438..1a649360e 100644
--- a/releng/runtime/org.eclipse.fx.target.feature/feature.xml
+++ b/releng/runtime/org.eclipse.fx.target.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.target.feature"
label="Target Platform Feature"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/runtime/org.eclipse.fx.target.feature/pom.xml b/releng/runtime/org.eclipse.fx.target.feature/pom.xml
index f832a3ea6..86334c4d5 100644
--- a/releng/runtime/org.eclipse.fx.target.feature/pom.xml
+++ b/releng/runtime/org.eclipse.fx.target.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/runtime/org.eclipse.fx.target.rcp.feature/feature.xml b/releng/runtime/org.eclipse.fx.target.rcp.feature/feature.xml
index 441dea18c..28796022f 100644
--- a/releng/runtime/org.eclipse.fx.target.rcp.feature/feature.xml
+++ b/releng/runtime/org.eclipse.fx.target.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.target.rcp.feature"
label="RCP 3.x Target Platform Feature"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/runtime/org.eclipse.fx.target.rcp.feature/pom.xml b/releng/runtime/org.eclipse.fx.target.rcp.feature/pom.xml
index 0f1b29f71..c35cf8b18 100644
--- a/releng/runtime/org.eclipse.fx.target.rcp.feature/pom.xml
+++ b/releng/runtime/org.eclipse.fx.target.rcp.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/.gitignore b/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/.project b/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/.project
deleted file mode 100644
index 1258a30e4..000000000
--- a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.fx.ide.all.prekepler.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/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/build.properties b/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/build.properties
deleted file mode 100644
index 64f93a9f0..000000000
--- a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/feature.xml
deleted file mode 100644
index 2550496c7..000000000
--- a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/feature.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.fx.ide.all.prekepler.feature"
- label="e(fx)clipse - IDE - Juno/Indigo"
- version="0.9.0.qualifier"
- provider-name="BestSolution.at">
-
- <description url="http://www.example.com/description">
- Feature collecting all IDE-Features for Pre-Kepler (Juno/Indigo) installs
- </description>
-
- <copyright url="http://www.bestsolution.at">
- Copyright (c) 2013 BestSolution.at and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <license url="http://www.eclipse.org/org/documents/epl-v10.php">
- Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-&quot;Contribution&quot; means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-&quot;Contributor&quot; means any person or entity that distributes the Program.
-
-&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
-
-&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
- </license>
-
- <includes
- id="org.eclipse.fx.ide.all.kepler.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.fx.ide.pde.prekepler.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/pom.xml
deleted file mode 100644
index 9142f4af4..000000000
--- a/releng/tooling/org.eclipse.fx.ide.all.prekepler.feature/pom.xml
+++ /dev/null
@@ -1,16 +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 - IDE - Features - All in one - Juno/Indigo</name>
- <groupId>org.eclipse.fx.ide</groupId>
- <artifactId>org.eclipse.fx.ide.all.prekepler.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-
- <parent>
- <groupId>org.eclipse.fx.ide</groupId>
- <artifactId>releng</artifactId>
- <relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
- </parent>
-
-</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.basic.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.basic.feature/feature.xml
index bf77a4d4c..b857aafb6 100644
--- a/releng/tooling/org.eclipse.fx.ide.basic.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.basic.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.ide.basic.feature"
label="e(fx)clipse - IDE - Basic"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/tooling/org.eclipse.fx.ide.basic.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.basic.feature/pom.xml
index 1c6c41319..ca439a4c3 100644
--- a/releng/tooling/org.eclipse.fx.ide.basic.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.basic.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.converter.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.converter.feature/feature.xml
index 558d0afac..1ba98738d 100644
--- a/releng/tooling/org.eclipse.fx.ide.converter.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.converter.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.ide.converter.feature"
label="e(fx)clipse - IDE - Converter"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/tooling/org.eclipse.fx.ide.converter.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.converter.feature/pom.xml
index 74e92187b..0d8823d4a 100644
--- a/releng/tooling/org.eclipse.fx.ide.converter.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.converter.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.css.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.css.feature/feature.xml
index a553768b7..217114589 100644
--- a/releng/tooling/org.eclipse.fx.ide.css.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.css.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.ide.css.feature"
label="e(fx)clipse - IDE - CSS"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at"
plugin="org.eclipse.fx.ide.ui">
diff --git a/releng/tooling/org.eclipse.fx.ide.css.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.css.feature/pom.xml
index c9ef7a359..002ae2f0e 100644
--- a/releng/tooling/org.eclipse.fx.ide.css.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.css.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/.gitignore b/releng/tooling/org.eclipse.fx.ide.feature/.gitignore
index ea8c4bf7f..ea8c4bf7f 100644
--- a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/.gitignore
+++ b/releng/tooling/org.eclipse.fx.ide.feature/.gitignore
diff --git a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/.project b/releng/tooling/org.eclipse.fx.ide.feature/.project
index 3c57fa591..10fe44124 100644
--- a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/.project
+++ b/releng/tooling/org.eclipse.fx.ide.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.fx.ide.all.kepler.feature</name>
+ <name>org.eclipse.fx.ide.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/build.properties b/releng/tooling/org.eclipse.fx.ide.feature/build.properties
index 64f93a9f0..64f93a9f0 100644
--- a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/build.properties
+++ b/releng/tooling/org.eclipse.fx.ide.feature/build.properties
diff --git a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.feature/feature.xml
index e2c3ed9b9..feea94bfe 100644
--- a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.feature/feature.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.fx.ide.all.kepler.feature"
+ id="org.eclipse.fx.ide.feature"
label="e(fx)clipse - IDE - Kepler"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.feature/pom.xml
index 8186a41f8..59b5744a9 100644
--- a/releng/tooling/org.eclipse.fx.ide.all.kepler.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.feature/pom.xml
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<name>e(fx)clipse - IDE - Features - All in one - Kepler</name>
<groupId>org.eclipse.fx.ide</groupId>
- <artifactId>org.eclipse.fx.ide.all.kepler.feature</artifactId>
+ <artifactId>org.eclipse.fx.ide.feature</artifactId>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
-</project> \ No newline at end of file
+</project>
diff --git a/releng/tooling/org.eclipse.fx.ide.fxgraph.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.fxgraph.feature/feature.xml
index 798f7f43c..55bc59731 100644
--- a/releng/tooling/org.eclipse.fx.ide.fxgraph.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.fxgraph.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.ide.fxgraph.feature"
label="e(fx)clipse - IDE - FXGraph"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/tooling/org.eclipse.fx.ide.fxgraph.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.fxgraph.feature/pom.xml
index 7c0658eec..6469f07d8 100644
--- a/releng/tooling/org.eclipse.fx.ide.fxgraph.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.fxgraph.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.fxml.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.fxml.feature/feature.xml
index a8d2a5b32..22efe47df 100644
--- a/releng/tooling/org.eclipse.fx.ide.fxml.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.fxml.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.ide.fxml.feature"
label="e(fx)clipse - IDE - FXML"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/tooling/org.eclipse.fx.ide.fxml.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.fxml.feature/pom.xml
index 926d029fa..8550e046d 100644
--- a/releng/tooling/org.eclipse.fx.ide.fxml.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.fxml.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.mobile.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.mobile.feature/feature.xml
index a5b8132e6..bbcced889 100644
--- a/releng/tooling/org.eclipse.fx.ide.mobile.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.mobile.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.ide.mobile.feature"
label="e(fx)clipse - IDE - Mobile"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/tooling/org.eclipse.fx.ide.mobile.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.mobile.feature/pom.xml
index bcc94d581..5dbec419e 100644
--- a/releng/tooling/org.eclipse.fx.ide.mobile.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.mobile.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.pde.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.pde.feature/feature.xml
index 645a1974f..1ecef96f9 100644
--- a/releng/tooling/org.eclipse.fx.ide.pde.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.pde.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.ide.pde.feature"
label="e(fx)clipse - IDE - PDE"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/tooling/org.eclipse.fx.ide.pde.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.pde.feature/pom.xml
index 8a9c477a9..280e19946 100644
--- a/releng/tooling/org.eclipse.fx.ide.pde.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.pde.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/.gitignore b/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/.project b/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/.project
deleted file mode 100644
index dd5f75f08..000000000
--- a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.fx.ide.pde.prekepler.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/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/build.properties b/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/build.properties
deleted file mode 100644
index 64f93a9f0..000000000
--- a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/feature.xml
deleted file mode 100644
index 6e5eb9a45..000000000
--- a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/feature.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.fx.ide.pde.prekepler.feature"
- label="e(fx)clipse - IDE - Juno/Indigo"
- version="0.9.0.qualifier"
- provider-name="BestSolution.at">
-
- <description url="http://www.example.com/description">
- Extra bundles needed to integrate PDE into Juno/Indigo
- </description>
-
- <copyright url="http://www.bestsolution.at">
- Copyright (c) 2013 BestSolution.at and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <license url="http://www.eclipse.org/org/documents/epl-v10.php">
- Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-&quot;Contribution&quot; means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-&quot;Contributor&quot; means any person or entity that distributes the Program.
-
-&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
-
-&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
- </license>
-
- <plugin
- id="org.eclipse.fx.ide.pde.adapter"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ide.pde.fragment"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
-</feature>
diff --git a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/pom.xml
deleted file mode 100644
index 13dac2aaf..000000000
--- a/releng/tooling/org.eclipse.fx.ide.pde.prekepler.feature/pom.xml
+++ /dev/null
@@ -1,16 +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 - IDE - Features - Pre Kepler</name>
- <groupId>org.eclipse.fx.ide</groupId>
- <artifactId>org.eclipse.fx.ide.pde.prekepler.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-
- <parent>
- <groupId>org.eclipse.fx.ide</groupId>
- <artifactId>releng</artifactId>
- <relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
- </parent>
-
-</project> \ No newline at end of file
diff --git a/releng/tooling/org.eclipse.fx.ide.rrobot.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.rrobot.feature/feature.xml
index 0abc53375..b80cb2ce3 100644
--- a/releng/tooling/org.eclipse.fx.ide.rrobot.feature/feature.xml
+++ b/releng/tooling/org.eclipse.fx.ide.rrobot.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.fx.ide.rrobot.feature"
label="e(fx)clipse - IDE - RRobot"
- version="0.9.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="BestSolution.at">
<description url="http://www.example.com/description">
diff --git a/releng/tooling/org.eclipse.fx.ide.rrobot.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.rrobot.feature/pom.xml
index 17a6ed17c..ab08a9b6d 100644
--- a/releng/tooling/org.eclipse.fx.ide.rrobot.feature/pom.xml
+++ b/releng/tooling/org.eclipse.fx.ide.rrobot.feature/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file

Back to the top