Make separate features for remotecdt, efs and discovery

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

@@ -33,6 +33,18 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.examples" />
 		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.efs" />
+		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.remotecdt" />
+		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.tm.discovery" />
+		</ant>
 	</target>
 
 	<!-- ===================================================================== -->
@@ -84,6 +96,24 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
+	<target name="assemble.org.eclipse.rse.efs">
+		<property name="archiveName" value="RSE-efs-${buildId}.zip"/>
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+		<antcall target="unpackUpdateJarsForPackaging" />
+	</target>
+
+	<target name="assemble.org.eclipse.rse.remotecdt">
+		<property name="archiveName" value="RSE-runtime-remotecdt-${buildId}.zip"/>
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+		<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="unpackUpdateJarsForPackaging" depends="myInit">
 		<property name="tmpsite" value="${buildDirectory}/tmpsite" />
 		<mkdir dir="${tmpsite}/new/eclipse/features" />

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

@@ -1,11 +1,14 @@
 feature@org.apache.commons_net=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.commons_net-feature
 feature@org.eclipse.rse.core=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
 feature@org.eclipse.rse.dstore=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
+feature@org.eclipse.rse.efs=@TAG@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.efs-feature
 feature@org.eclipse.rse.examples=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
 feature@org.eclipse.rse.ftp=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
 feature@org.eclipse.rse.local=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
+feature@org.eclipse.rse.remotecdt=@TAG@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt-feature
 feature@org.eclipse.rse.sdk=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
 feature@org.eclipse.rse.ssh=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
+feature@org.eclipse.tm.discovery=@TAG@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature
 plugin@org.apache.commons_net=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.commons_net
 plugin@org.apache.oro=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.oro
 plugin@org.eclipse.dstore.core=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
@@ -18,6 +21,7 @@ plugin@org.eclipse.rse.core=v20060921,:pserver:anonymous:none@dev.eclipse.org:/c
 plugin@org.eclipse.rse.doc.isv=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv
 plugin@org.eclipse.rse.doc.user=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user
 plugin@org.eclipse.rse.dstore.security=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
+plugin@org.eclipse.rse.eclipse.filesystem=@TAG@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.eclipse.filesystem
 plugin@org.eclipse.rse.examples.daytime=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime
 plugin@org.eclipse.rse.examples.tutorial=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial
 plugin@org.eclipse.rse.files.ui=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
@@ -44,3 +48,11 @@ plugin@org.eclipse.rse.subsystems.shells.dstore=v20060921,:pserver:anonymous:non
 plugin@org.eclipse.rse.subsystems.shells.local=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
 plugin@org.eclipse.rse.subsystems.shells.ssh=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
 plugin@org.eclipse.rse.ui=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
+plugin@org.eclipse.rse.discovery=@TAG@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery
+plugin@org.eclipse.tm.discovery.engine=@TAG@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine
+plugin@org.eclipse.tm.discovery.model=@TAG@,: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=@TAG@,: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=@TAG@,: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=@TAG@,: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=@TAG@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view
+plugin@org.eclipse.tm.discovery.wizard=@TAG@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard

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

@@ -31,6 +31,11 @@
   <a href="http://download.eclipse.org/dsdp/tm/updates/">http://download.eclipse.org/dsdp/tm/updates/</a>.
   We encourage users to update frequently, since we expect
   RSE quality to improve more and more as we are approaching our 1.0 release.</li>
+<li>Persistent storage of connection and filter data has been streamlined to
+  use <b>fewer files and directories</b>, resulting in simplification of team support
+  and improved perfomance.</li>
+<li>Windows dstore daemon can now be started by simply double clicking on daemon.bat
+  (<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=142952">Bug 142952</a>)</li>
 <li>Numerous bugs have been fixed, and we consider RSE safe now for 
   all kinds of data transfer, even if it's done in multiple background sessions
   (except <b>FTP</b>, which will be enhanced as soon as the Jakarta Commons Net library

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

@@ -150,6 +150,9 @@
         <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-local-@buildId@.zip">RSE-runtime-local-@buildId@.zip</a></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@/RSE-runtime-remotecdt-@buildId@.zip">RSE-runtime-remotecdt-@buildId@.zip</a></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@/RSE-runtime-ssh-@buildId@.zip">RSE-runtime-ssh-@buildId@.zip</a></td></tr>
 </table>
 
@@ -168,15 +171,55 @@
 <table border="0" cellspacing="2" cellpadding="0" width="100%">
 	<tr>
 		<td align="RIGHT" valign="TOP" width="7%">
-		<div align="left">
+		   <div align="left"><b>Status</b></div>
-			<b>Status</b></div>
 		</td>
 		<td width="34%"><b>Platform</b></td>
 		<td width="59%"><b>Download</b></td>
 		<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@/RSE-examples-@buildId@.zip">RSE-examples-@buildId@.zip</a></td>
+            <td>All</td>
+            <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-examples-@buildId@.zip">RSE-examples-@buildId@.zip</a></td>
         </tr>
+	</tr>
+</table>
 
+<table border="0" cellspacing="5" cellpadding="2" width="100%">
+	<tr>
+		<td colspan="2">&nbsp;</td>
+	</tr>
+</table>
+<table border="0" cellspacing="5" cellpadding="2" width="100%">
+	<tr>
+		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
+		<font face="Arial,Helvetica" color="#FFFFFF">Experimental add-ons (includes source)</font></b>
+		</td>
+	</tr>
+	<tr>
+	    <td>Experimental add-ons are not yet fully supported.
+	    <ul><li>RSE-efs is an experimental Eclipse Filesystem (EFS) provider, which
+	       uses RSE contributed file services.</li>
+	    <li>TM-discovery is an experimental API and DNS-SD / Zeroconf based 
+	       implementation of remote network service discovery. TM-discovery
+	       requires EMF 2.2.0 or later to run. It can run stand-alone or
+	       integrated with RSE.</li>
+	    </ul>
+       </td>
+	</tr>
+</table>
+<table border="0" cellspacing="2" cellpadding="0" width="100%">
+	<tr>
+		<td align="RIGHT" valign="TOP" width="7%">
+		   <div align="left"><b>Status</b></div>
+		</td>
+		<td width="34%"><b>Platform</b></td>
+		<td width="59%"><b>Download</b></td>
+		<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@/RSE-efs-@buildId@.zip">RSE-efs-@buildId@.zip</a></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>
+        </tr>
 	</tr>
 </table>
 

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

@@ -1 +1 @@
-12
+15

rse/examples/org.eclipse.rse.examples-feature/feature.xml

@@ -43,13 +43,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.rse.remotecdt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.rse.examples.source"
          version="0.0.0"/>

rse/features/org.eclipse.rse.sdk-feature/build.properties

@@ -15,6 +15,7 @@ bin.includes = feature.xml,\
 generate.feature@org.apache.commons_net.source=org.apache.commons_net
 generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
 generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
+generate.feature@org.eclipse.rse.remotecdt.source=org.eclipse.rse.remotecdt
 generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
 generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
 generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core

rse/features/org.eclipse.rse.sdk-feature/feature.xml

@@ -18,6 +18,10 @@
       <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
    </url>
 
+   <includes
+         id="org.apache.commons_net"
+         version="0.0.0"/>
+
    <includes
          id="org.eclipse.rse.core"
          version="0.0.0"/>
@@ -34,10 +38,20 @@
          id="org.eclipse.rse.local"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.rse.remotecdt"
+         version="0.0.0"
+         name="CDT Remote Launch"
+         optional="true"/>
+
    <includes
          id="org.eclipse.rse.ssh"
          version="0.0.0"/>
 
+   <includes
+         id="org.apache.commons_net.source"
+         version="0.0.0"/>
+
    <includes
          id="org.eclipse.rse.core.source"
          version="0.0.0"/>
@@ -51,12 +65,14 @@
          version="0.0.0"/>
 
    <includes
-         id="org.apache.commons_net.source"
+         id="org.eclipse.rse.local.source"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.rse.local.source"
+         id="org.eclipse.rse.remotecdt.source"
-         version="0.0.0"/>
+         version="0.0.0"
+         name="CDT Remote Launch Source"
+         optional="true"/>
 
    <includes
          id="org.eclipse.rse.ssh.source"