From 886155367ea1cb94c9dd9ef1fd4f14721853a4d6 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 28 Sep 2006 11:53:03 +0000
Subject: [PATCH] Package commons_net feature separately again: binary included
 by ftp-feature, sources included by sdk-feature

---
 .../org.eclipse.rse.ftp-feature/feature.xml        | 14 --------------
 .../org.eclipse.rse.sdk-feature/build.properties   |  2 +-
 .../org.eclipse.rse.sdk-feature/feature.xml        |  2 --
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index e79bfb55d49..330c20e9c70 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -29,23 +29,9 @@
       <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 d1d038bce7f..96cf4b69025 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 4b8e2e87936..c81a1949f2d 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -50,11 +50,9 @@
          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"