From eb23e5af9f6971eeaa4c95744c6519d8085cb4b7 Mon Sep 17 00:00:00 2001
From: Markus Knauer
Date: Tue, 31 Jan 2017 11:35:33 +0100
Subject: Remove Thym dependencies from JavaScript package

The Eclipse Thym project does not plan to participate in the Oxygen
Simultaneous Release therefore the dependency from the JavaScript
project needs to be removed.

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511361
Change-Id: Ica88e9f6aa6cecf35b22193e2d5350ca8d138b6a
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
---
 .../epp.website.xml                                       |  2 +-
 .../epp.product                                           |  1 -
 .../org.eclipse.epp.package.javascript/plugin.properties  |  6 +-----
 packages/org.eclipse.epp.package.javascript/plugin.xml    | 15 ---------------
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/packages/org.eclipse.epp.package.javascript.feature/epp.website.xml b/packages/org.eclipse.epp.package.javascript.feature/epp.website.xml
index 774e3272..54902cf2 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/epp.website.xml
@@ -14,7 +14,7 @@
    bugzillaComponentId="javascript-package"
    testPlan="http://www.eclipse.org/epp/testplan.php" >
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[The essential tools for any JavaScript developer, including JavaScript, HTML, CSS, XML languages support, Git client, Mylyn, and tools for Cordova applications.]]></description>
+     <description><![CDATA[The essential tools for any JavaScript developer, including JavaScript, HTML, CSS, XML languages support, Git client, and Mylyn.]]></description>
     <!-- packageTesters is a list of the people that are testing the package -->
      <packageTesters>
       <tester>Mickael Istria</tester>
diff --git a/packages/org.eclipse.epp.package.javascript.product/epp.product b/packages/org.eclipse.epp.package.javascript.product/epp.product
index c10a6c3b..acbbcf74 100644
--- a/packages/org.eclipse.epp.package.javascript.product/epp.product
+++ b/packages/org.eclipse.epp.package.javascript.product/epp.product
@@ -206,7 +206,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.wst.jsdt.chromium.debug.feature" installMode="root"/>
       <feature id="org.eclipse.wst.server_ui.feature" installMode="root"/>
       <feature id="org.eclipse.wst.server_adapters.feature" installMode="root"/>
-      <feature id="org.eclipse.thym.feature" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.rse" installMode="root"/>
    </features>
diff --git a/packages/org.eclipse.epp.package.javascript/plugin.properties b/packages/org.eclipse.epp.package.javascript/plugin.properties
index 50b88b65..3daffc8b 100644
--- a/packages/org.eclipse.epp.package.javascript/plugin.properties
+++ b/packages/org.eclipse.epp.package.javascript/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2016 IBM Corporation and others.
+# Copyright (c) 2000, 2017 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
@@ -14,10 +14,6 @@ providerName=Eclipse Packaging Project
 
 ql.newWebProject.label = Create a new web project
 ql.newWebProject.description = Create a new dynamically configured project that supports JavaScript, CSS, HTML, and other technologies 
-ql.newThymHybridProject.label = Create a new Cordova project
-ql.newThymHybridProject.description = Create a new mobile project for Apache Cordova
-ql.importThymHybridProject.label = Import a Cordova project
-ql.importThymHybridProject.description = Import an existing Apache Cordova project
 ql.checkoutGitProject.description = Checkout Eclipse projects hosted in a Git repository
 ql.checkoutGitProject.label = Checkout projects from Git
 ql.importExistingProjects.description = Import existing Eclipse projects from the filesystem or archive
diff --git a/packages/org.eclipse.epp.package.javascript/plugin.xml b/packages/org.eclipse.epp.package.javascript/plugin.xml
index dd0096bb..79942253 100644
--- a/packages/org.eclipse.epp.package.javascript/plugin.xml
+++ b/packages/org.eclipse.epp.package.javascript/plugin.xml
@@ -83,21 +83,6 @@
             importance="medium"
             resolution="launchbar">
       </command>
-      <command
-            id="org.eclipse.ui.newWizard(newWizardId=org.eclipse.thym.ui.NewHybridProjectWizard)"
-            label="%ql.newThymHybridProject.label"
-            description="%ql.newThymHybridProject.description"
-            importance="medium"
-            resolution="launchbar">
-      </command>
-      <command
-            id="org.eclipse.ui.file.import(importWizardId=org.eclipse.thym.ui.HybridMobileProjectImportWizard)"
-            label="%ql.importThymHybridProject.label"
-            description="%ql.importThymHybridProject.description"
-            icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/import-existing-project.png"
-            importance="medium"
-            resolution="launchbar">
-      </command>
       <command
             id="org.eclipse.ui.file.import(importWizardId=org.eclipse.egit.ui.internal.clone.GitCloneWizard)"
             description="%ql.checkoutGitProject.description"
-- 
cgit v1.2.3