From 1c05af4e1fe0040e08d365b8e77772e08dcaaa54 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 22 Sep 2006 00:43:23 +0000
Subject: [PATCH] Package commons net with ftp (no separate feature)

---
 releng/org.eclipse.rse.build/customTargets.xml     |  2 ++
 .../org.eclipse.rse.ftp-feature/feature.xml        | 14 ++++++++++++++
 .../org.eclipse.rse.sdk-feature/build.properties   |  2 +-
 .../org.eclipse.rse.sdk-feature/feature.xml        |  4 ++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index d184bded949..e6adc707749 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -9,10 +9,12 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.sdk" />
 		</ant>
+		<!--
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.apache.commons_net" />
 		</ant>
+		-->
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.core" />
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 330c20e9c70..e79bfb55d49 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -29,9 +29,23 @@
       <import plugin="org.eclipse.rse.ui"/>
    </requires>
 
+   <!--
    <includes
          id="org.apache.commons_net"
          version="0.0.0"/>
+   -->
+
+   <plugin
+         id="org.apache.commons_net"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.apache.oro"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.rse.services.files.ftp"
diff --git a/rse/features/org.eclipse.rse.sdk-feature/build.properties b/rse/features/org.eclipse.rse.sdk-feature/build.properties
index 96cf4b69025..d1d038bce7f 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/build.properties
+++ b/rse/features/org.eclipse.rse.sdk-feature/build.properties
@@ -12,7 +12,7 @@ bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
                epl-v10.html
-generate.feature@org.apache.commons_net.source=org.apache.commons_net
+#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
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index 902cac77f5b..4b8e2e87936 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -18,9 +18,11 @@
       <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"
@@ -48,9 +50,11 @@
          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"