diff options
author | Uwe Stieber | 2015-04-29 09:22:10 +0000 |
---|---|---|
committer | Uwe Stieber | 2015-04-29 09:22:35 +0000 |
commit | f5cdbec7bf620e7babf104500006be721347c5c3 (patch) | |
tree | 34dc1464f1fe4e2867d4bb1d551ee41eda9fd374 | |
parent | 8af8df18e6fd0a15962fc93407e3c804e3f82bab (diff) | |
download | org.eclipse.tcf-f5cdbec7bf620e7babf104500006be721347c5c3.tar.gz org.eclipse.tcf-f5cdbec7bf620e7babf104500006be721347c5c3.tar.xz org.eclipse.tcf-f5cdbec7bf620e7babf104500006be721347c5c3.zip |
Terminal: Switch to TM Terminal 4.0
78 files changed, 505 insertions, 606 deletions
diff --git a/admin/pom-config.xml b/admin/pom-config.xml index 786ee785f..6b36ed139 100644 --- a/admin/pom-config.xml +++ b/admin/pom-config.xml @@ -57,10 +57,11 @@ <platform-site>http://download.eclipse.org/eclipse/updates/3.8</platform-site> <license-site>http://download.eclipse.org/cbi/updates/license</license-site> <cdt-site>http://download.eclipse.org/tools/cdt/releases/kepler</cdt-site> - <tm-site>http://download.eclipse.org/tm/builds/luna/nightly</tm-site> + <tm-site>http://download.eclipse.org/tm/updates/4.0milestones</tm-site> + <terminal-site>http://download.eclipse.org/tm/terminal/updates/4.0milestones</tm-site> <ptp-remote-site>http://download.eclipse.org/tools/ptp/builds/remote/1.1.1</ptp-remote-site> <rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site> - <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site> + <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository/</orbit-site> <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site> </properties> @@ -86,6 +87,11 @@ <layout>p2</layout> </repository> <repository> + <id>terminal</id> + <url>${terminal-site}</url> + <layout>p2</layout> + </repository> + <repository> <id>tm</id> <url>${tm-site}</url> <layout>p2</layout> diff --git a/features/org.eclipse.tcf.cdt.feature/feature.xml b/features/org.eclipse.tcf.cdt.feature/feature.xml index a37ba0e20..84974165a 100644 --- a/features/org.eclipse.tcf.cdt.feature/feature.xml +++ b/features/org.eclipse.tcf.cdt.feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.tcf.cdt.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"> @@ -40,19 +40,21 @@ <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/> <import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/> <import plugin="org.eclipse.debug.ui" version="3.8.1" match="greaterOrEqual"/> - <import plugin="org.eclipse.jface.text" version="3.8.1" match="greaterOrEqual"/> - <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/> - <import feature="org.eclipse.cdt" version="8.1.1" match="greaterOrEqual"/> <import plugin="org.eclipse.cdt.core" version="5.4.1" match="greaterOrEqual"/> <import plugin="org.eclipse.cdt.ui" version="5.5.0" match="greaterOrEqual"/> <import plugin="org.eclipse.cdt.debug.core" version="7.2.0" match="greaterOrEqual"/> <import plugin="org.eclipse.cdt.debug.ui" version="7.2.0" 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.debug.ui" version="1.3.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jface.text" version="3.8.1" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/> <import plugin="org.eclipse.cdt.launch" version="7.1.0" match="greaterOrEqual"/> <import plugin="org.eclipse.cdt.dsf.ui" version="2.3.0" match="greaterOrEqual"/> + <import feature="org.eclipse.cdt" version="8.1.1" match="greaterOrEqual"/> <import feature="org.eclipse.tcf.feature" version="1.3.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.tcf.debug.ui" version="1.3.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui.editors"/> + <import plugin="org.eclipse.ui.workbench"/> </requires> <plugin diff --git a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml index 39ac6dc58..22fbacc69 100644 --- a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml +++ b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.tcf.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"> @@ -34,8 +34,8 @@ </url> <requires> - <import feature="org.eclipse.tcf.sdk.feature" version="1.3.0" match="greaterOrEqual"/> - <import feature="org.eclipse.tcf.cdt.feature" version="1.3.0" match="greaterOrEqual"/> + <import feature="org.eclipse.tcf.sdk.feature" version="1.3.1" match="greaterOrEqual"/> + <import feature="org.eclipse.tcf.cdt.feature" version="1.3.1" match="greaterOrEqual"/> </requires> <plugin diff --git a/features/org.eclipse.tcf.feature/feature.xml b/features/org.eclipse.tcf.feature/feature.xml index ec6109c5a..282080914 100644 --- a/features/org.eclipse.tcf.feature/feature.xml +++ b/features/org.eclipse.tcf.feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.tcf.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"> @@ -51,7 +51,7 @@ <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/> <import plugin="org.eclipse.ui.views" version="3.6.100" match="greaterOrEqual"/> <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.tm.terminal" version="3.2.2" match="greaterOrEqual"/> + <import plugin="org.eclipse.tm.terminal.control" version="4.0.0" 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" version="1.3.0" match="greaterOrEqual"/> diff --git a/features/org.eclipse.tcf.repo/category.xml b/features/org.eclipse.tcf.repo/category.xml index 01ed91887..9af8d1a1f 100644 --- a/features/org.eclipse.tcf.repo/category.xml +++ b/features/org.eclipse.tcf.repo/category.xml @@ -54,18 +54,6 @@ <feature url="features/org.eclipse.tcf.te.tcf.remote.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.remote.sdk.feature" version="0.0.0"> <category name="org.eclipse.tcf.te"/> </feature> - <feature url="features/org.eclipse.tcf.te.terminals.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.feature" version="0.0.0"> - <category name="org.eclipse.tcf.te.terminals"/> - </feature> - <feature url="features/org.eclipse.tcf.te.terminals.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.sdk.feature" version="0.0.0"> - <category name="org.eclipse.tcf.te.terminals"/> - </feature> - <feature url="features/org.eclipse.tcf.te.terminals.rse.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.rse.feature" version="0.0.0"> - <category name="org.eclipse.tcf.te.terminals"/> - </feature> - <feature url="features/org.eclipse.tcf.te.terminals.rse.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.rse.sdk.feature" version="0.0.0"> - <category name="org.eclipse.tcf.te.terminals"/> - </feature> <bundle id="com.google.gson" version="2.2.4.v201311231704"> <category name="org.eclipse.tcf.te"/> </bundle> @@ -82,9 +70,4 @@ Target Explorer </description> </category-def> - <category-def name="org.eclipse.tcf.te.terminals" label="TCF Terminals"> - <description> - Terminals - </description> - </category-def> </site> diff --git a/features/org.eclipse.tcf.repo/pom.xml b/features/org.eclipse.tcf.repo/pom.xml index 42c68c287..2c8a22df4 100644 --- a/features/org.eclipse.tcf.repo/pom.xml +++ b/features/org.eclipse.tcf.repo/pom.xml @@ -11,7 +11,7 @@ <relativePath>../../admin/pom-build.xml</relativePath> </parent> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <artifactId>org.eclipse.tcf.repo</artifactId> <packaging>eclipse-repository</packaging> diff --git a/features/org.eclipse.tcf.sdk.feature/feature.xml b/features/org.eclipse.tcf.sdk.feature/feature.xml index de97c40e8..79ce33d34 100644 --- a/features/org.eclipse.tcf.sdk.feature/feature.xml +++ b/features/org.eclipse.tcf.sdk.feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.tcf.sdk.feature" label="%featureName" - version="1.3.0.qualifier" + version="1.3.1.qualifier" provider-name="%featureProvider" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier"> @@ -34,7 +34,7 @@ </url> <requires> - <import feature="org.eclipse.tcf.feature" version="1.3.0" match="greaterOrEqual"/> + <import feature="org.eclipse.tcf.feature" version="1.3.1" match="greaterOrEqual"/> <import feature="org.eclipse.tcf.core.sdk.feature" version="1.3.0" match="greaterOrEqual"/> </requires> diff --git a/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF index 88452cc56..c02a50e26 100644 --- a/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.debug.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.internal.debug.ui.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -23,7 +23,7 @@ Require-Bundle: com.jcraft.jsch;bundle-version="0.1.46", org.eclipse.ui.views;bundle-version="3.6.100", org.eclipse.ui.workbench.texteditor;bundle-version="3.8.0", org.eclipse.tcf.debug;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.2.2" + org.eclipse.tm.terminal.control;bundle-version="4.0.0" Import-Package: org.eclipse.tcf.core;version="1.3.0", org.eclipse.tcf.protocol;version="1.3.0", org.eclipse.tcf.services;version="1.3.0", diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/adapters/TCFNodePropertySource.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/adapters/TCFNodePropertySource.java index 72160c1a0..818ae50c4 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/adapters/TCFNodePropertySource.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/adapters/TCFNodePropertySource.java @@ -27,11 +27,11 @@ import org.eclipse.tcf.internal.debug.ui.Activator; import org.eclipse.tcf.internal.debug.ui.model.TCFModel; import org.eclipse.tcf.internal.debug.ui.model.TCFNode; import org.eclipse.tcf.internal.debug.ui.model.TCFNodeExecContext; +import org.eclipse.tcf.internal.debug.ui.model.TCFNodeExecContext.MemoryRegion; import org.eclipse.tcf.internal.debug.ui.model.TCFNodeExpression; import org.eclipse.tcf.internal.debug.ui.model.TCFNodeLaunch; import org.eclipse.tcf.internal.debug.ui.model.TCFNodeModule; import org.eclipse.tcf.internal.debug.ui.model.TCFNodeRegister; -import org.eclipse.tcf.internal.debug.ui.model.TCFNodeExecContext.MemoryRegion; import org.eclipse.tcf.internal.debug.ui.model.TCFNodeStackFrame; import org.eclipse.tcf.protocol.IChannel; import org.eclipse.tcf.protocol.JSON; diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextSelectionDialog.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextSelectionDialog.java index 5c284d425..7f06c49f6 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextSelectionDialog.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextSelectionDialog.java @@ -21,8 +21,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.tcf.internal.debug.ui.launch.PeerListControl.PeerInfo; import org.eclipse.tcf.internal.debug.ui.launch.ContextListControl.ContextInfo; +import org.eclipse.tcf.internal.debug.ui.launch.PeerListControl.PeerInfo; /** * Dialog to select a peer and context. diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/TelnetInputStream.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/TelnetInputStream.java index a24de2b66..133e3e2a3 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/TelnetInputStream.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/TelnetInputStream.java @@ -10,8 +10,13 @@ *******************************************************************************/ package org.eclipse.tcf.internal.debug.ui.launch.setup; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.FilterInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; +import java.io.OutputStream; +import java.net.SocketException; import java.util.ArrayList; class TelnetInputStream extends FilterInputStream { diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/TimeOutInputStream.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/TimeOutInputStream.java index 40327e944..9f491578b 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/TimeOutInputStream.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/TimeOutInputStream.java @@ -10,7 +10,10 @@ *******************************************************************************/ package org.eclipse.tcf.internal.debug.ui.launch.setup; -import java.io.*; +import java.io.FilterInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; class TimeOutInputStream extends FilterInputStream { diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/WizardLogPage.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/WizardLogPage.java index 4d5c7e45f..c18e5e553 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/WizardLogPage.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/setup/WizardLogPage.java @@ -40,8 +40,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.tcf.internal.debug.ui.Activator; import org.eclipse.tcf.core.Base64; +import org.eclipse.tcf.internal.debug.ui.Activator; import org.eclipse.tcf.ssl.TCFSecurityManager; import org.osgi.framework.Bundle; diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java index fa12f903a..7b612923b 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java @@ -220,10 +220,9 @@ class TCFConsole extends AbstractConsole { } @Override - public ISettingsPage makeSettingsPage() { - return null; + public void setDefaultSettings() { } - + @Override public void load(ISettingsStore store) { } diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExpression.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExpression.java index 2aebac02a..7fea76f7c 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExpression.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExpression.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.tcf.internal.debug.ui.model; -import java.math.BigInteger; import java.math.BigDecimal; +import java.math.BigInteger; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; 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 diff --git a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/META-INF/MANIFEST.MF index cc61c76c9..1013b1ac5 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.core.cdt;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.core.cdt.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0";visibility:=reexport, org.eclipse.cdt.debug.core;bundle-version="7.4.0", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.debug.core;bundle-version="3.7.100", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.core/META-INF/MANIFEST.MF index 6cd50de0d..943c19e56 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.core/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF index 7311c7b36..9e3a8d024 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF @@ -2,20 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.launch.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.launch.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.debug.core;bundle-version="3.7.100", - org.eclipse.tcf.te.core.cdt;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0" + org.eclipse.tcf.te.core.cdt;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/META-INF/MANIFEST.MF index 77b46af9f..066c1c160 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.launch.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.launch.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", @@ -14,20 +14,20 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.ui.ide;bundle-version="3.8.1", org.eclipse.ui.navigator;bundle-version="3.5.200", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.core.cdt;bundle-version="1.3.0", - org.eclipse.tcf.te.launch.core;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.forms;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.views;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.core.cdt;bundle-version="1.3.1", + org.eclipse.tcf.te.launch.core;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.controls;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.forms;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.views;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.core;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/META-INF/MANIFEST.MF index 193eba873..0fbea0a66 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.runtime.concurrent;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.runtime.concurrent.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/META-INF/MANIFEST.MF index 191c65d57..53a7deb64 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.runtime.model;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.runtime.model.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/META-INF/MANIFEST.MF index f80a94507..a03360885 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.runtime.persistence;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.runtime.persistence.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: com.google.gson;bundle-version="2.2.4", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", org.eclipse.core.variables;bundle-version="3.2.600" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/META-INF/MANIFEST.MF index 544f0a3bd..54f009ddc 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.runtime.services;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.runtime.services.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/META-INF/MANIFEST.MF index 8f895a36f..e425c5e8e 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.runtime.statushandler;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.runtime.statushandler.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF index 8e314c15c..315c9f8ed 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.runtime.stepper;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.runtime/META-INF/MANIFEST.MF index efdbf28f2..d3f291714 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.runtime;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.runtime.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/META-INF/MANIFEST.MF index 44295535e..acad69ebc 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.core.model;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.core.model.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/META-INF/MANIFEST.MF index debe08e1d..04df9abfa 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.core.scripting;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.core.scripting.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/META-INF/MANIFEST.MF index 4e5bb3b42..838333b11 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/META-INF/MANIFEST.MF @@ -2,19 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.tcf;bundle-version="1.3.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/META-INF/MANIFEST.MF index ea1a529e2..32c94a1b8 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/META-INF/MANIFEST.MF @@ -2,21 +2,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.filesystem.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.filesystem.core.activator.CorePlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.filesystem;bundle-version="1.3.200", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.0" + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %providerName diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/META-INF/MANIFEST.MF index 45931577b..e36169fe8 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.filesystem.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.filesystem.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.compare;bundle-version="3.5.300", @@ -15,19 +15,19 @@ Require-Bundle: org.eclipse.compare;bundle-version="3.5.300", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300", org.eclipse.ui.workbench.texteditor;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.forms;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.views;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.0" + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.forms;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.views;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.controls;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF index 5b7030a72..e20f38072 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.tcf.te.tcf.launch.cdt;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.launch.cdt.activator.Activator Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0", org.eclipse.cdt.debug.mi.core;bundle-version="7.3.0", @@ -19,19 +19,19 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0", org.eclipse.debug.ui;bundle-version="3.8.1", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.filesystem.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0" + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.filesystem.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.controls;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Vendor-Name diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/utils/TEHelper.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/utils/TEHelper.java index afc539617..ea3152f0c 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/utils/TEHelper.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/utils/TEHelper.java @@ -34,8 +34,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.tcf.protocol.IPeer; import org.eclipse.tcf.protocol.Protocol; import org.eclipse.tcf.services.IFileSystem; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tcf.te.core.utils.text.StringUtil; import org.eclipse.tcf.te.runtime.callback.Callback; import org.eclipse.tcf.te.runtime.concurrent.util.ExecutorsUtil; @@ -59,6 +57,8 @@ import org.eclipse.tcf.te.tcf.locator.interfaces.services.IPeerModelLookupServic import org.eclipse.tcf.te.tcf.locator.model.ModelManager; import org.eclipse.tcf.te.tcf.processes.core.interfaces.launcher.IProcessLauncher; import org.eclipse.tcf.te.tcf.processes.core.launcher.ProcessLauncher; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; public class TEHelper { @@ -70,7 +70,7 @@ public class TEHelper { File tempFile = null; // Create the file transfer item - FileTransferItem item = new FileTransferItem(new Path(localFilePath), new Path(remoteFilePath)); + FileTransferItem item = new FileTransferItem(new Path(localFilePath), remoteFilePath); item.setProperty(IFileTransferItem.PROPERTY_DIRECTION, "" + IFileTransferItem.HOST_TO_TARGET); //$NON-NLS-1$ // Get the remote path file attributes @@ -128,7 +128,7 @@ public class TEHelper { } // Recreate the file transfer item to take the temporary file as input - item = new FileTransferItem(new Path(tempFile.getAbsolutePath()), new Path(remoteFilePath)); + item = new FileTransferItem(new Path(tempFile.getAbsolutePath()), remoteFilePath); item.setProperty(IFileTransferItem.PROPERTY_DIRECTION, "" + IFileTransferItem.HOST_TO_TARGET); //$NON-NLS-1$ } else { monitor.beginTask(Messages.RemoteRunLaunchDelegate_2 + " " + localFilePath + " to " + remoteFilePath, 100); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF index a308191ad..20f877046 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF @@ -2,26 +2,26 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.launch.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.launch.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.debug.core;bundle-version="3.7.100", org.eclipse.tcf.core;bundle-version="1.3.0", org.eclipse.tcf.debug;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core.cdt;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.launch.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.0", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.core.cdt;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.launch.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.1", org.eclipse.cdt.debug.core;bundle-version="7.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/META-INF/MANIFEST.MF index 561f0f0aa..d6970cead 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.launch.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.launch.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", @@ -10,30 +10,30 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.debug.ui;bundle-version="3.8.1", org.eclipse.tcf.core;bundle-version="1.3.0", org.eclipse.tcf.debug;bundle-version="1.3.0", - org.eclipse.tcf.debug.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core.cdt;bundle-version="1.3.0", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.launch.core;bundle-version="1.3.0", - org.eclipse.tcf.te.launch.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.filesystem.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.launch.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.forms;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.views;bundle-version="1.3.0", + org.eclipse.tcf.debug.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.core.cdt;bundle-version="1.3.1", + org.eclipse.tcf.te.launch.core;bundle-version="1.3.1", + org.eclipse.tcf.te.launch.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.filesystem.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.launch.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.controls;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.forms;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.views;bundle-version="1.3.1", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200", org.eclipse.ui.navigator;bundle-version="3.5.200", diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationAdvancedTabSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationAdvancedTabSection.java index 00ab6a104..6704d447d 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationAdvancedTabSection.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationAdvancedTabSection.java @@ -21,13 +21,13 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tcf.te.launch.core.persistence.DefaultPersistenceDelegate; import org.eclipse.tcf.te.launch.ui.interfaces.ILaunchConfigurationTabFormPart; import org.eclipse.tcf.te.tcf.launch.ui.nls.Messages; import org.eclipse.tcf.te.ui.forms.parts.AbstractSection; import org.eclipse.tcf.te.ui.swt.SWTControlUtil; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.FormToolkit; diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/META-INF/MANIFEST.MF index b6ba26d82..f7c292f0d 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/META-INF/MANIFEST.MF @@ -2,22 +2,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.locator; singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.locator.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.0" + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.1", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml index 6f3600aeb..edd5d1a43 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/plugin.xml @@ -166,7 +166,7 @@ </extension> <!-- Terminal context properties provider contributions --> - <extension point="org.eclipse.tcf.te.core.terminals.contextPropertiesProviders"> + <extension point="org.eclipse.tm.terminal.view.core.contextPropertiesProviders"> <contextPropertiesProvider class="org.eclipse.tcf.te.tcf.locator.services.TerminalContextPropertiesProvider"> <enablement> diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/TerminalContextPropertiesProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/TerminalContextPropertiesProvider.java index 14b4adf68..3193538b6 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/TerminalContextPropertiesProvider.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/TerminalContextPropertiesProvider.java @@ -11,9 +11,9 @@ package org.eclipse.tcf.te.tcf.locator.services; import java.util.Map; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalContextPropertiesProvider; import org.eclipse.tcf.te.runtime.services.ServiceManager; import org.eclipse.tcf.te.runtime.services.interfaces.IPropertiesAccessService; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; /** * Terminal context properties provider implementation. diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/META-INF/MANIFEST.MF index 01b17fc04..bae3a0c7a 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.log.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.log.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/META-INF/MANIFEST.MF index 9b53aa4d8..f83e4e9e5 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/META-INF/MANIFEST.MF @@ -2,24 +2,24 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.processes.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.processes.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0" + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessLauncher.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessLauncher.java index cbe6d4a0f..7ffd71e5c 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessLauncher.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessLauncher.java @@ -47,10 +47,6 @@ import org.eclipse.tcf.services.IProcesses; import org.eclipse.tcf.services.IProcesses.ProcessContext; import org.eclipse.tcf.services.IProcessesV1; import org.eclipse.tcf.services.IStreams; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalTabListener; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tcf.te.runtime.callback.AsyncCallbackCollector; import org.eclipse.tcf.te.runtime.callback.Callback; import org.eclipse.tcf.te.runtime.events.EventManager; @@ -69,6 +65,10 @@ import org.eclipse.tcf.te.tcf.processes.core.interfaces.launcher.IProcessLaunche import org.eclipse.tcf.te.tcf.processes.core.interfaces.launcher.IProcessStreamsProxy; import org.eclipse.tcf.te.tcf.processes.core.interfaces.tracing.ITraceIds; import org.eclipse.tcf.te.tcf.processes.core.nls.Messages; +import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; /** * Remote process launcher. @@ -594,8 +594,8 @@ public class ProcessLauncher extends PlatformObject implements IProcessLauncher terminal.addTerminalTabListener(terminalTabListener); // Create the terminal streams settings Map<String, Object> props = new HashMap<String, Object>(); - props.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID, "org.eclipse.tcf.te.ui.terminals.telnet.launcher.streams"); //$NON-NLS-1$ - props.put(ITerminalsConnectorConstants.PROP_ID, "org.eclipse.tcf.te.ui.terminals.TerminalsView"); //$NON-NLS-1$ + props.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID, "org.eclipse.tm.terminal.connector.streams.launcher.streams"); //$NON-NLS-1$ + props.put(ITerminalsConnectorConstants.PROP_ID, "org.eclipse.tm.terminal.view.ui.TerminalsView"); //$NON-NLS-1$ // Set the terminal tab title String terminalTitle = getTerminalTitle(); if (terminalTitle != null) { diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessLauncherTerminalTabListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessLauncherTerminalTabListener.java index 261160082..e136cf50e 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessLauncherTerminalTabListener.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessLauncherTerminalTabListener.java @@ -11,7 +11,7 @@ package org.eclipse.tcf.te.tcf.processes.core.launcher; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalTabListener; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener; /** * Remote process launcher terminal tab listener implementation. diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/steps/LaunchProcessStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/steps/LaunchProcessStep.java index 91f37f747..cee1cd227 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/steps/LaunchProcessStep.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/steps/LaunchProcessStep.java @@ -23,8 +23,6 @@ import org.eclipse.tcf.protocol.IPeer; import org.eclipse.tcf.protocol.Protocol; import org.eclipse.tcf.services.IProcesses; import org.eclipse.tcf.services.IProcessesV1; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tcf.te.core.utils.text.StringUtil; import org.eclipse.tcf.te.runtime.callback.Callback; import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback; @@ -42,6 +40,8 @@ import org.eclipse.tcf.te.tcf.processes.core.activator.CoreBundleActivator; import org.eclipse.tcf.te.tcf.processes.core.interfaces.launcher.IProcessLauncher; import org.eclipse.tcf.te.tcf.processes.core.interfaces.steps.IProcessesStepAttributes; import org.eclipse.tcf.te.tcf.processes.core.launcher.ProcessLauncher; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; /** * Launch process step implementation. diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF index 77a2044c3..38b273e23 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.processes.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.processes.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", @@ -10,24 +10,24 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.ui.navigator;bundle-version="3.5.200", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.forms;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.views;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.forms;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.views;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.controls;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.remote.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.remote.core/META-INF/MANIFEST.MF index 06d6f296e..897586115 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.remote.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.remote.core/META-INF/MANIFEST.MF @@ -2,19 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.remote.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.remote.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.remote.core;bundle-version="1.0.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", org.eclipse.core.filesystem;bundle-version="1.3.200", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.0" + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.remote.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.remote.ui/META-INF/MANIFEST.MF index a261be3fb..aa3524ce5 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.remote.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.remote.ui/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.remote.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.remote.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.remote.ui;bundle-version="1.1.0", org.eclipse.remote.core;bundle-version="1.0.0", - org.eclipse.tcf.te.tcf.remote.core;bundle-version="1.3.0", + org.eclipse.tcf.te.tcf.remote.core;bundle-version="1.3.1", org.eclipse.core.filesystem;bundle-version="1.3.200", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.ide;bundle-version="3.8.1", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0" + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/META-INF/MANIFEST.MF index 4a102a452..3fa3400ef 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.services.contexts;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.services.contexts.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", org.eclipse.tcf;bundle-version="1.3.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0" + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/META-INF/MANIFEST.MF index 0193670f0..88eae4be6 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.terminals.core;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.terminals.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0" + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/launcher/TerminalsLauncher.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/launcher/TerminalsLauncher.java index f5247d02d..7f07542f3 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/launcher/TerminalsLauncher.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/launcher/TerminalsLauncher.java @@ -41,10 +41,6 @@ import org.eclipse.tcf.protocol.Protocol; import org.eclipse.tcf.services.IStreams; import org.eclipse.tcf.services.ITerminals; import org.eclipse.tcf.services.ITerminals.TerminalContext; -import org.eclipse.tcf.te.core.terminals.TerminalServiceFactory; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalTabListener; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tcf.te.runtime.callback.AsyncCallbackCollector; import org.eclipse.tcf.te.runtime.callback.Callback; import org.eclipse.tcf.te.runtime.events.EventManager; @@ -60,6 +56,10 @@ import org.eclipse.tcf.te.tcf.terminals.core.interfaces.launcher.ITerminalsConte import org.eclipse.tcf.te.tcf.terminals.core.interfaces.launcher.ITerminalsLauncher; import org.eclipse.tcf.te.tcf.terminals.core.interfaces.tracing.ITraceIds; import org.eclipse.tcf.te.tcf.terminals.core.nls.Messages; +import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; /** * Remote terminals launcher. diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/launcher/TerminalsLauncherTerminalTabListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/launcher/TerminalsLauncherTerminalTabListener.java index 8955c7c1c..d326645ef 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/launcher/TerminalsLauncherTerminalTabListener.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/launcher/TerminalsLauncherTerminalTabListener.java @@ -11,7 +11,7 @@ package org.eclipse.tcf.te.tcf.terminals.core.launcher; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalTabListener; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener; /** * Remote terminals launcher terminal tab listener implementation. diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF index 6cce07b69..4dc9e5121 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF @@ -2,20 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.terminals.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.terminals.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core.terminals;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.terminals.core;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0", - org.eclipse.tm.terminal;bundle-version="3.2.300", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.terminals.core;bundle-version="1.3.1", + org.eclipse.tm.terminal.control;bundle-version="4.0.0", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", + org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/plugin.xml index d93cba65b..db17b20b8 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/plugin.xml +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/plugin.xml @@ -3,16 +3,16 @@ <plugin> <!-- Terminal connector contributions --> - <extension point="org.eclipse.tm.terminal.terminalConnectors"> + <extension point="org.eclipse.tm.terminal.control.connectors"> <connector - name="%TerminalConnector.terminals" - id="org.eclipse.tcf.te.tcf.terminals.ui.TerminalsConnector" - hidden="true" - class="org.eclipse.tcf.te.tcf.terminals.ui.connector.TerminalsConnector"/> + name="%TerminalConnector.terminals" + id="org.eclipse.tcf.te.tcf.terminals.ui.TerminalsConnector" + hidden="true" + class="org.eclipse.tcf.te.tcf.terminals.ui.connector.TerminalsConnector"/> </extension> <!-- Terminals launcher delegate contributions --> - <extension point="org.eclipse.tcf.te.ui.terminals.launcherDelegates"> + <extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates"> <delegate class="org.eclipse.tcf.te.tcf.terminals.ui.launcher.TerminalsLauncherDelegate" id="org.eclipse.tcf.te.ui.terminals.launcher.tcf" diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsConnector.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsConnector.java index 1c3708a84..bc8d7703c 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsConnector.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/connector/TerminalsConnector.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved. + * Copyright (c) 2011, 2015 Wind River Systems, Inc. and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -15,10 +15,10 @@ import org.eclipse.tcf.protocol.Protocol; import org.eclipse.tcf.services.ITerminals; import org.eclipse.tcf.te.runtime.interfaces.IDisposable; import org.eclipse.tcf.te.tcf.terminals.core.launcher.TerminalsLauncher; -import org.eclipse.tcf.te.ui.terminals.streams.AbstractStreamsConnector; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.view.ui.streams.AbstractStreamsConnector; /** * Terminals connector implementation. diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/controls/TerminalsConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/controls/TerminalsConfigurationPanel.java index f5e7b727b..77834b19e 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/controls/TerminalsConfigurationPanel.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/controls/TerminalsConfigurationPanel.java @@ -17,9 +17,9 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.panels.AbstractExtendedConfigurationPanel; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; /** * Terminals (TCF) terminal launcher configuration panel implementation. diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsLauncherDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsLauncherDelegate.java index e72016cac..f1cece8cb 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsLauncherDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsLauncherDelegate.java @@ -20,8 +20,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.tcf.protocol.IPeer; import org.eclipse.tcf.protocol.Protocol; -import org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tcf.te.runtime.callback.Callback; import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer; import org.eclipse.tcf.te.runtime.properties.PropertiesContainer; @@ -30,14 +28,16 @@ import org.eclipse.tcf.te.tcf.terminals.core.interfaces.launcher.ITerminalsLaunc import org.eclipse.tcf.te.tcf.terminals.core.launcher.TerminalsLauncher; import org.eclipse.tcf.te.tcf.terminals.ui.connector.TerminalsSettings; import org.eclipse.tcf.te.tcf.terminals.ui.controls.TerminalsConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel; -import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanelContainer; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; -import org.eclipse.tcf.te.ui.terminals.internal.SettingsStore; -import org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; +import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; +import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * Terminals (TCF) launcher delegate implementation. @@ -67,7 +67,7 @@ public class TerminalsLauncherDelegate extends AbstractLauncherDelegate { * @see org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tcf.te.core.terminals.interfaces.ITerminalService.Done) */ @Override - public void execute(final Map<String, Object> properties, final Done done) { + public void execute(final Map<String, Object> properties, final ITerminalService.Done done) { Assert.isNotNull(properties); // Get the selection from the properties @@ -153,7 +153,7 @@ public class TerminalsLauncherDelegate extends AbstractLauncherDelegate { ITerminalConnector connector = TerminalConnectorExtension.makeTerminalConnector(connectorId); if (connector != null) { // Apply default settings - connector.makeSettingsPage(); + connector.setDefaultSettings(); // And load the real settings connector.load(store); } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsMementoHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsMementoHandler.java index 4a1a61a44..4aa6bb2d5 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsMementoHandler.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/launcher/TerminalsMementoHandler.java @@ -17,12 +17,12 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.tcf.protocol.Protocol; -import org.eclipse.tcf.te.core.terminals.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel; import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode; import org.eclipse.tcf.te.tcf.locator.interfaces.services.IPeerModelLookupService; import org.eclipse.tcf.te.tcf.locator.model.ModelManager; -import org.eclipse.tcf.te.ui.terminals.interfaces.IMementoHandler; +import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.ui.IMemento; /** diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/META-INF/MANIFEST.MF index 55b7c90dd..04679345d 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.ui.console;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.ui.console.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.console;bundle-version="3.5.100", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/META-INF/MANIFEST.MF index 775045860..cc20c9722 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/META-INF/MANIFEST.MF @@ -2,25 +2,25 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.ui.views;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.ui.views.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.console;bundle-version="3.5.100", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.scripting;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.log.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.ui.console;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.views;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.scripting;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.log.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.ui.console;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.views;bundle-version="1.3.1", + org.eclipse.tcf.te.core;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/META-INF/MANIFEST.MF index 11e930381..bccc1268c 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tcf.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tcf.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", @@ -12,24 +12,24 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.ui.navigator;bundle-version="3.5.200", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.forms;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.views;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.scripting;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.log.core;bundle-version="1.3.0" + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.controls;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.forms;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.views;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.scripting;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.log.core;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF index a04b655c1..8e4a0e7fc 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF @@ -2,33 +2,33 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.tests;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.tests.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.debug.core;bundle-version="3.7.100", org.eclipse.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.core.cdt;bundle-version="1.3.0", - org.eclipse.tcf.te.launch.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.filesystem.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.launch.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.0", - org.eclipse.tcf.te.tcf.processes.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.notifications;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.views;bundle-version="1.3.0", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.core.cdt;bundle-version="1.3.1", + org.eclipse.tcf.te.launch.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.core.model;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.filesystem.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.launch.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.locator;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.1", + org.eclipse.tcf.te.tcf.processes.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.notifications;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.views;bundle-version="1.3.1", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200", org.junit;bundle-version="4.10.0" diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF index 937fb9c2d..f0d2f7948 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.ui.controls;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.controls.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/META-INF/MANIFEST.MF index 11de18ba1..4e8997951 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.ui.forms;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.forms.activator.UIPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/META-INF/MANIFEST.MF index a5e6204fb..20f3f61ea 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.ui.notifications;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.notifications.activator.UIPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.swt/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.swt/META-INF/MANIFEST.MF index 3652e3355..62f0e1712 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.swt/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.swt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.ui.swt;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.swt.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF index 28b53f833..1e9b9499f 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF @@ -2,22 +2,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.ui.views;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.views.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: com.google.gson;bundle-version="2.2.4", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.help;bundle-version="3.6.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.ui;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.forms;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.persistence;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.ui;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.controls;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.forms;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200", org.eclipse.ui.navigator;bundle-version="3.5.200", diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui/META-INF/MANIFEST.MF index 4ba0b17f0..5785a3bd2 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", @@ -11,15 +11,15 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.ui;bundle-version="3.8.0", org.eclipse.ui.forms;bundle-version="3.5.200", org.eclipse.ui.navigator;bundle-version="3.5.200", - org.eclipse.tcf.te.runtime;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.model;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.0", - org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0", - org.eclipse.tcf.te.core;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.forms;bundle-version="1.3.0", - org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0" + org.eclipse.tcf.te.runtime;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.model;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.services;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.stepper;bundle-version="1.3.1", + org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.1", + org.eclipse.tcf.te.core;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.forms;bundle-version="1.3.1", + org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te/META-INF/MANIFEST.MF index 0a76182db..5c97abccc 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tcf.te;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Activator: org.eclipse.tcf.te.activator.CoreBundleActivator Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0" Bundle-ActivationPolicy: lazy |