Terminal: Switch to TM Terminal 4.0

10 files changed, 112 insertions, 211 deletions

diff --git a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
index c09c0d539..5ad9008e2 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.tcf.te"
       license-feature="org.eclipse.license"
@@ -27,41 +27,35 @@
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.stepper" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.persistence" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.core" version="5.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.debug.core" version="7.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.core.cdt" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.statushandler" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.ui" version="3.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.forms" version="3.5.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.navigator" version="3.5.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.300" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.launch.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.forms" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.views" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="com.google.gson" version="2.2.4" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
       <import plugin="org.eclipse.help" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal" version="3.2.300" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.terminals.process" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.serial" version="2.1.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/>
       <import feature="org.eclipse.cdt.platform" version="8.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tm.terminal.feature" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.stepper" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.persistence" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.core.cdt" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.statushandler" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.launch.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.forms" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.views" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.core" version="1.3.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -184,55 +178,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.tcf.te.core.terminals"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.local"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.process"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.serial"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.ssh"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.telnet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.tcf.te.ui.views"
          download-size="0"
          install-size="0"
diff --git a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
index 20e1df8f4..a80e4d7fa 100644
--- a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.sdk.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -25,7 +25,8 @@
 
    <requires>
       <import plugin="com.google.gson.source" version="2.2.4" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tm.terminal.sdk.feature" version="4.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -148,55 +149,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.tcf.te.core.terminals.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.local.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.process.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.serial.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.ssh.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tcf.te.ui.terminals.telnet.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.tcf.te.ui.views.source"
          download-size="0"
          install-size="0"
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
index fbbf8e215..2d34dc6e5 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.tcf.core.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.tcf.te"
       license-feature="org.eclipse.license"
@@ -29,43 +29,44 @@
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.persistence" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.stepper" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.statushandler" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.core.model" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.compare" version="3.5.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.text" version="3.5.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.navigator" version="3.5.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.filesystem.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.ui" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.forms" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.views" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.terminals.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.forms" version="3.5.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.core.scripting" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.log.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.console" version="3.5.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.ui.console" version="1.3.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.tcf.core.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal" version="3.2.300" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.persistence" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.stepper" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.statushandler" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.core.model" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.filesystem.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.ui" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.forms" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.views" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.view.core" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.terminals.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.view.ui" version="4.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.core.scripting" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.log.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.ui.console" version="1.3.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
index 6121a39b7..90d85aa78 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.tcf.core.sdk.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -25,8 +25,8 @@
 
    <requires>
       <import feature="org.eclipse.tcf.core.sdk.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.sdk.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.sdk.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.3.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
index c17982462..7a95ddced 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.tcf.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.tcf.te"
       license-feature="org.eclipse.license"
@@ -29,38 +29,40 @@
       <import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.debug" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.core.cdt" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.persistence" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.stepper" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.launch.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.filesystem.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.ui" version="3.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.debug.ui" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.launch.ui" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.filesystem.ui" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.launch.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.ui" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.forms" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.views" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.debug.ui" version="1.3.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.forms" version="3.5.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.navigator" version="3.5.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.300" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui" version="1.3.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.tcf.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.statushandler" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.core.cdt" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.persistence" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.stepper" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.launch.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.filesystem.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.debug.core" version="7.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.launch.ui" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.statushandler" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.filesystem.ui" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.launch.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.ui" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.forms" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.views" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.view.core" version="4.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
index 5366c92a5..714902400 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.tcf.launch.cdt.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.tcf.te.tcf.launch.cdt"
       license-feature="org.eclipse.license"
@@ -40,20 +40,21 @@
       <import plugin="org.eclipse.debug.ui" version="3.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.filesystem.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.filesystem.ui" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.3.1" match="greaterOrEqual"/>
       <import feature="org.eclipse.cdt" version="8.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.filesystem.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.filesystem.ui" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.view.core" version="4.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
index f6b14b093..67517ee5a 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -24,8 +24,8 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.tcf.te.tcf.launch.cdt.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.launch.cdt.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.3.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.remote.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.remote.feature/feature.xml
index 08ad9a019..b2bc84997 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.remote.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.remote.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.tcf.remote.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -26,20 +26,20 @@
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.remote.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.remote.ui" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.te.tcf.remote.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/>
       <import feature="org.eclipse.remote" version="1.1.0" match="compatible"/>
-      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.te.tcf.remote.core" version="1.3.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.remote.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.remote.sdk.feature/feature.xml
index 2530b3883..2a868b444 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.remote.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.remote.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.tcf.remote.sdk.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -25,8 +25,8 @@
 
    <requires>
       <import feature="org.eclipse.remote.source" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.tcf.remote.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.remote.feature" version="1.3.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
index 59bd2f476..fc1783e70 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tcf.te.tcf.sdk.feature"
       label="%featureName"
-      version="1.3.0.qualifier"
+      version="1.3.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -25,8 +25,8 @@
 
    <requires>
       <import feature="org.eclipse.tcf.sdk.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.3.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.te.tcf.feature" version="1.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.3.1" match="greaterOrEqual"/>
+      <import feature="org.eclipse.tcf.te.tcf.feature" version="1.3.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin