Bug 330337 - [releng][discovery] Remove/archive the discovery component

releng/org.eclipse.rse.build/customTargets.xml

@@ -43,10 +43,6 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.tests" />
 		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.discovery" />
-		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.tm.terminal.sdk" />
@@ -109,12 +105,6 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.tm.discovery">
-		<property name="archiveName" value="TM-discovery-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
 	<target name="assemble.org.eclipse.tm.terminal.sdk">
 		<property name="archiveName" value="TM-terminal-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>

releng/org.eclipse.rse.build/maps/discovery.map

@@ -1,10 +0,0 @@
-feature@org.eclipse.tm.discovery=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature
-plugin@org.eclipse.rse.discovery=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery
-plugin@org.eclipse.tm.discovery.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv
-plugin@org.eclipse.tm.discovery.engine=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine
-plugin@org.eclipse.tm.discovery.model=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model
-plugin@org.eclipse.tm.discovery.model.edit=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit
-plugin@org.eclipse.tm.discovery.protocol.dnssd=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd
-plugin@org.eclipse.tm.discovery.transport.udp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp
-plugin@org.eclipse.tm.discovery.view=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view
-plugin@org.eclipse.tm.discovery.wizard=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard

releng/org.eclipse.rse.build/setup.sh

@@ -102,20 +102,6 @@ else
   DROPUP=../..
 fi
 
-# EMF 2.5.0
-EMFBRANCH=2.5.0
-EMFREL=R
-EMFDATE=200906151043
-EMFVER=2.5.0
-if [ ! -f ${DROPIN}/eclipse/plugins/org.eclipse.emf.doc_${EMFBRANCH}.v${EMFDATE}.jar ]; then
-  # Need EMF 2.4 SDK for Service Discovery ISV Docs Backlinks
-  echo "Getting EMF SDK..."
-  cd ${DROPIN}
-  wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/${EMFBRANCH}/${EMFREL}${EMFDATE}/emf-xsd-SDK-${EMFVER}.zip"
-  unzip -o emf-xsd-SDK-${EMFVER}.zip
-  rm emf-xsd-SDK-${EMFVER}.zip
-  cd ${DROPUP}
-fi
 if [ ! -f eclipse/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar ]; then
   # Eclipse Test Framework
   echo "Getting Eclipse Test Framework..."

releng/org.eclipse.rse.build/template/buildNotes.php

@@ -27,7 +27,7 @@
   <b>Import/Export, Telnet and FTP require Java 1.5</b>, the rest of
   RSE runs on Java 1.4.
   Platform Runtime is the minimum requirement for core RSE and Terminal.
-  Discovery needs EMF.</li>
+  Local Terminal needs CDT Core.</li>
 
 <li>Highlights of Fixes and Features since <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.3M3-201011090901/index.php">TM 3.3M3</a>:
 <ul>

releng/org.eclipse.rse.build/template/index.php

@@ -148,17 +148,6 @@
         	Includes Source.
         </td>
     </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/TM-discovery-@buildId@.zip">TM-discovery-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-	    	An API and DNS-SD / Zeroconf based 
-			implementation for remote network service discovery. 
-			Runs stand-alone or integrated with RSE.
-			Requires EMF 2.2.0 or later. Includes Source.<br/>
-			<i>Note: This component is no longer actively developed and may be discontinued.</i>
-        </td>
-    </tr>
 </table>
 <b>Note:</b> As of TM 3.1 (Eclipse Galileo / June 2009), the <b>RSE-remotecdt</b> integration for remote launch and debug through gdbserver has moved into CDT 6.0.
 

releng/org.eclipse.rse.build/template/package.count

@@ -1 +1 @@
-14
+13

releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh

@@ -492,7 +492,7 @@ if [ x${DO_STATS} = x1 ]; then
   # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=310132
   #  -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
   #CMD="java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-  #  -p2.statsTrackedBundles org.eclipse.rse.sdk,org.eclipse.dstore.core,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples.tutorial,org.eclipse.rse.tests,org.eclipse.tm.rapi,org.eclipse.tm.discovery,org.eclipse.tm.terminal,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \
+  #  -p2.statsTrackedBundles org.eclipse.rse.sdk,org.eclipse.dstore.core,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples.tutorial,org.eclipse.rse.tests,org.eclipse.tm.rapi,org.eclipse.tm.terminal,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \
   CMD="java -jar ${tgtlauncher} \
     -application org.sonatype.tycho.p2.updatesite.UpdateSitePublisherWithJRE \
     -source ${SITE} \
@@ -500,7 +500,7 @@ if [ x${DO_STATS} = x1 ]; then
     -artifactRepository file:${SITE} \
     -compress \
     -p2.statsURI http://download.eclipse.org/stats/dsdp/tm \
-    -p2.statsTrackedFeatures org.eclipse.rse.sdk,org.eclipse.rse.dstore,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples,org.eclipse.rse.tests,org.eclipse.rse.wince,org.eclipse.tm.discovery,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \
+    -p2.statsTrackedFeatures org.eclipse.rse.sdk,org.eclipse.rse.dstore,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples,org.eclipse.rse.tests,org.eclipse.rse.wince,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \
     -p2.statsTrackedBundles org.eclipse.rse.core,org.eclipse.rse.core.source,org.eclipse.tm.terminal \
     -p2.statsSuffix _tm330
     -vmargs -Xmx256M"

releng/org.eclipse.rse.updatesite/category.xml

@@ -9,9 +9,6 @@
    <feature url="features/org.eclipse.rse.useractions_1.1.200.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.200.qualifier">
       <category name="TM and RSE Main Features"/>
    </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.200.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.200.qualifier">
-      <category name="TM and RSE Optional Add-Ons"/>
-   </feature>
    <feature url="features/org.eclipse.rse.scp_0.1.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.1.0.qualifier">
       <category name="TM and RSE Optional Add-Ons"/>
    </feature>

releng/org.eclipse.rse.updatesite/site.xml

@@ -730,9 +730,6 @@
    <feature url="features/org.eclipse.rse.wince_0.2.100.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.100.qualifier" os="win32" arch="x86">
       <category name="TM and RSE Uncategorized 3.3"/>
    </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.200.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.200.qualifier">
-      <category name="TM and RSE Uncategorized 3.3"/>
-   </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_3.1.100.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.100.qualifier">
       <category name="TM and RSE Uncategorized 3.3"/>
    </feature>

releng/org.eclipse.tm.releng.master-feature/feature.xml

@@ -45,10 +45,6 @@
          id="org.eclipse.tm.terminal.local.sdk"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.tm.discovery"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.rse.examples"
          version="0.0.0"/>

releng/org.eclipse.tm.releng/build.properties

@@ -56,7 +56,6 @@ PACK200_JAVA_HOME=${JAVA_HOME}
 
 dependencyURLs=\
 http://download.eclipse.org/eclipse/downloads/drops/S-3.7M3-201010281441/eclipse-SDK-3.7M3-linux-gtk-x86_64.tar.gz,\
-http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-runtime-2.5.0.zip,\
 http://download.eclipse.org/tools/cdt/builds/7.0.0/I.I201006141710/cdt-master-7.0.0-I201006141710.zip,\
 http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip
 

releng/org.eclipse.tm.releng/buildExtra.xml

@@ -20,12 +20,7 @@
 
 	<target name="getDependencies">
 		<!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required -->
-		<echo message="Download, then unpack EMF and CDT" />
+		<echo message="Download, then unpack CDT" />
-		<ant target="getDependency"
-		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
-			<property name="url" value="${modeling.emf.runtime.url}" />
-			<property name="file" value="${modeling.emf.runtime.file}" />
-		</ant>
 		<ant target="getUpdateSiteDependency"
 		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
 			<property name="url" value="${tools.cdt.master.url}" />

releng/org.eclipse.tm.releng/maps/discovery.map

@@ -1,10 +0,0 @@
-feature@org.eclipse.tm.discovery=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature
-plugin@org.eclipse.rse.discovery=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery
-plugin@org.eclipse.tm.discovery.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv
-plugin@org.eclipse.tm.discovery.engine=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine
-plugin@org.eclipse.tm.discovery.model=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model
-plugin@org.eclipse.tm.discovery.model.edit=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit
-plugin@org.eclipse.tm.discovery.protocol.dnssd=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd
-plugin@org.eclipse.tm.discovery.transport.udp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp
-plugin@org.eclipse.tm.discovery.view=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view
-plugin@org.eclipse.tm.discovery.wizard=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard