From 1342a83690b4e47ce0133195fdc95c34812f8281 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 27 May 2010 10:59:29 +0000
Subject: [PATCH] Bug 314193 -  [terminal][local] Local Terminal is unusable on
 Windows

---
 .../org.eclipse.rse.build/maps/terminal.map   |  4 +-
 releng/org.eclipse.rse.updatesite/site.xml    |  2 +-
 .../feature.xml                               | 76 +++++++++----------
 .../META-INF/MANIFEST.MF                      |  1 +
 4 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map
index ec866399aa7..6c2b29ad9cb 100644
--- a/releng/org.eclipse.rse.build/maps/terminal.map
+++ b/releng/org.eclipse.rse.build/maps/terminal.map
@@ -1,5 +1,5 @@
 feature@org.eclipse.tm.terminal=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
-feature@org.eclipse.tm.terminal.local=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
+feature@org.eclipse.tm.terminal.local=v201005271100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
 feature@org.eclipse.tm.terminal.sdk=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
 feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
 feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
@@ -7,7 +7,7 @@ feature@org.eclipse.tm.terminal.telnet=v201005032000,:pserver:anonymous:none@dev
 feature@org.eclipse.tm.terminal.test=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature
 feature@org.eclipse.tm.terminal.view=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature
 plugin@org.eclipse.tm.terminal=v201005261000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal
-plugin@org.eclipse.tm.terminal.local=v201005271015,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local
+plugin@org.eclipse.tm.terminal.local=v201005271100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local
 plugin@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial
 plugin@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh
 plugin@org.eclipse.tm.terminal.telnet=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index 59d5885c322..42f800ec831 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -675,7 +675,7 @@
    <feature url="features/org.eclipse.tm.terminal.sdk_3.0.100.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.100.qualifier">
       <category name="TM and RSE 3.2"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.local_0.1.0.qualifier.jar" id="org.eclipse.tm.terminal.local" version="0.1.0.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.local_0.1.0.qualifier.jar" id="org.eclipse.tm.terminal.local" version="0.1.0.qualifier" os="aix,hpux,linux,macosx,solaris">
       <category name="TM and RSE 3.2"/>
    </feature>
    <category-def name="TM and RSE 3.2" label="TM and RSE 3.2">
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/feature.xml b/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
index 4c37f250190..2d8b7f13a99 100644
--- a/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -10,23 +10,25 @@
      Mirko Raner - initial implementation for Eclipse Bug 196337
      Martin Oberhuber (Wind River) - Import to Eclipse DSDP
  -->
-<feature id="org.eclipse.tm.terminal.local"
- label="%featureName"
- version="0.1.0.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
+<feature
+      id="org.eclipse.tm.terminal.local"
+      label="%featureName"
+      version="0.1.0.qualifier"
+      provider-name="%providerName"
+      os="aix,hpux,linux,macosx,solaris"
+      image="eclipse_update_120.jpg">
 
- <description>
-  %description
- </description>
+   <description>
+      %description
+   </description>
 
- <copyright>
-  %copyright
- </copyright>
+   <copyright>
+      %copyright
+   </copyright>
 
- <license url="%licenseURL">
-  %license
- </license>
+   <license url="%licenseURL">
+      %license
+   </license>
 
    <url>
       <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
@@ -37,31 +39,29 @@
          id="org.eclipse.tm.terminal"
          version="0.0.0"/>
 
- <requires>
- <!--
-  <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
- -->
-  <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
-  <import plugin="org.eclipse.core.runtime"/>
-  <import plugin="org.eclipse.debug.core"/>
-  <import plugin="org.eclipse.debug.ui"/>
-  <import plugin="org.eclipse.jface"/>
-  <import plugin="org.eclipse.ui"/>
-  <import plugin="org.eclipse.ui.externaltools"/>
- </requires>
+   <requires>
+      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.externaltools"/>
+   </requires>
 
- <plugin id="org.eclipse.tm.terminal.local"
-  download-size="18"
-  install-size="47"
-  version="0.0.0"
-  unpack="false"
- />
+   <plugin
+         id="org.eclipse.tm.terminal.local"
+         os="aix,hpux,linux,macosx,solaris"
+         download-size="18"
+         install-size="47"
+         version="0.0.0"
+         unpack="false"/>
 
- <plugin
-  id="org.eclipse.tm.terminal.local.source"
-  download-size="25"
-  install-size="43"
-  version="0.0.0"
-  unpack="false"/>
+   <plugin
+         id="org.eclipse.tm.terminal.local.source"
+         download-size="25"
+         install-size="43"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
index 196a662d926..058ba465e64 100644
--- a/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
@@ -17,4 +17,5 @@ Require-Bundle: org.eclipse.tm.terminal;bundle-version="2.0.0",
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
+Eclipse-PlatformFilter: (!(osgi.os=win32))
 Import-Package: org.eclipse.core.variables