Remove the deprecated "Modeling Discovery" from the package

This feature from the package is now source of a few problems:
* it requires frequent interactions with the teams publishing the
solutions into the release train and such involvement has been pretty
low in the last few years, leading to a number of un-installable
solutions.
* it introduce a dependency to the Amalgam project, from a plugin point
of view, and from a HTTP request point of view as the catalog is
retrieved from the Amalgam download area.

Considering these issues and the fact that it can be replaced by the use
of the Marketplace client (already enabled in the package) and that the
later has way more features it seems like a good idea to revise this
packaging to remove it.

Change-Id: If026f74262fb56e3275544119fdd6f3ec386d4ae
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>

5 files changed, 4 insertions, 22 deletions

diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
index 7497f88f..b040d56f 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
@@ -9,7 +9,7 @@
    -->
   <packageMetaData
    packageName="Eclipse Modeling Tools"
-   maintainer="Modeling Amalgamation Project"
+   maintainer="Remi Schnekenburger"
    iconurl="http://www.eclipse.org/modeling/images/modeling_about.png"
    bugzillaComponentId="modeling-package"
    testPlan="http://www.eclipse.org/epp/testplan.php" >
@@ -22,10 +22,7 @@
       <tester>Cédric Brun</tester>
     </packageTesters>
   </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="https://projects.eclipse.org/projects/modeling.amalgam/releases/1.8.0"
-    project="Modeling Package" />
+  <MoreInfo>  
   <NewAndNoteworthy
     url="https://wiki.eclipse.org/Ecore_Tools/New_and_Noteworthy"
     project="Eclipse EcoreTools" />
diff --git a/packages/org.eclipse.epp.package.modeling.feature/p2.inf b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
index 3a4c6a50..cd3a5027 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
@@ -20,10 +20,4 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/photon/,name:Modeling Package Updates for Eclipse Photon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/photon/,name:Modeling Package Updates for Eclipse Photon);
 
-instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/photon/);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/photon/);
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index 68fb07ec..1a7e6e30 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -194,8 +194,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.epp.package.modeling.feature" version="4.8.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.8.0.qualifier"/>
       <feature id="org.eclipse.platform" version="4.8.0.qualifier"/>
-
-      <feature id="org.eclipse.amalgam.discovery" installMode="root"/>
+      
       <feature id="org.eclipse.e4.core.tools.feature" installMode="root"/>
       <!-- not available in Neon on 2016-02-21
       <feature id="org.eclipse.egit.import" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.modeling/plugin.properties b/packages/org.eclipse.epp.package.modeling/plugin.properties
index 5d2ed171..19a57941 100644
--- a/packages/org.eclipse.epp.package.modeling/plugin.properties
+++ b/packages/org.eclipse.epp.package.modeling/plugin.properties
@@ -4,7 +4,5 @@ ql.newEcoreProject.label = Create a new Ecore project
 ql.ecoreHelp.description =  A guided walkthrough to the ecore diagram editor.
 ql.ecoreHelp.label = Learn how to use the diagram editor
 ql.setupQuestionnaire.label = Review IDE configuration settings
-ql.discovery.description = Install other Modeling Tools from Eclipse to build code generators, model transformations or editors.
-ql.discovery.label = Install more Modeling Tools
 ql.mpc.description = Enhance your IDE with additional plugins and install your Marketplace favorites
 ql.mpc.label = Launch the Eclipse Marketplace
diff --git a/packages/org.eclipse.epp.package.modeling/plugin.xml b/packages/org.eclipse.epp.package.modeling/plugin.xml
index 9b732262..9eba626b 100644
--- a/packages/org.eclipse.epp.package.modeling/plugin.xml
+++ b/packages/org.eclipse.epp.package.modeling/plugin.xml
@@ -111,13 +111,7 @@
             command="org.eclipse.ui.newWizard*"
             icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/new-project.png"
             theme="org.eclipse.ui.intro.universal.solstice">
-      </override>
-      <command
-            id="org.eclipse.amalgam.discovery.modeling.commands.discoveryCommand"
-            label="%ql.discovery.label"
-            description="%ql.discovery.description"
-            icon="platform:/plugin/org.eclipse.epp.mpc.ui/intro/css/marketplace.png">
-      </command>
+      </override>      
       <command
             id="org.eclipse.epp.mpc.ui.command.showMarketplaceWizard(trigger=welcome)"
             label="%ql.mpc.label"