Update legacy lttng for TCF 1.0.0.

diff --git a/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
index dd546bd59714ed5ea67bd5b4d4c5c96e25c4b9d1..333edce7bd8a17d658bd4cf61c9596ecdc407d2b 100644 (file)
--- a/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
  org.eclipse.linuxtools.lttng.jni;bundle-version="0.4.0",
  org.eclipse.rse.core;bundle-version="3.2.0",
- org.eclipse.tm.tcf.core;bundle-version="0.4.0",
+ org.eclipse.tcf.core;bundle-version="1.0.0",
  org.eclipse.core.resources;bundle-version="3.7.100"
 Export-Package: org.eclipse.linuxtools.internal.lttng.core;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
  org.eclipse.linuxtools.internal.lttng.core.control;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/model/TraceResource.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/model/TraceResource.java
index d2f407f2f1b436765d459591af7812bc58eaa623..180198d5009dfa5b927856e730d20c3ad01b09e4 100644 (file)
--- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/model/TraceResource.java
+++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/model/TraceResource.java
@@ -22,8 +22,8 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.Trac
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
 import org.eclipse.rse.core.subsystems.AbstractResource;
 import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 
 /**
  * <b><u>ProviderResource</u></b>

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/ILttControllerService.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/ILttControllerService.java
index dd458892163823cd98e83ee3f9301e9aa72335b9..7484887657a818b65f825e62165d4868dce4e731 100644 (file)
--- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/ILttControllerService.java
+++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/ILttControllerService.java
@@ -14,8 +14,8 @@
 package org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service;
 
 import org.eclipse.linuxtools.internal.lttng.core.LttngConstants;
-import org.eclipse.tm.tcf.protocol.IService;
-import org.eclipse.tm.tcf.protocol.IToken;
+import org.eclipse.tcf.protocol.IService;
+import org.eclipse.tcf.protocol.IToken;
 
 public interface ILttControllerService extends IService {
 

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/LttControllerServiceProxy.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/LttControllerServiceProxy.java
index c73ab4c7cb6125fc2f21294a0ad5e32dbf6b083d..fe4e1d158252822fe1666484623d93bd60d1a699 100644 (file)
--- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/LttControllerServiceProxy.java
+++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/LttControllerServiceProxy.java
@@ -14,10 +14,10 @@
 package org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service;
 
 import org.eclipse.linuxtools.internal.lttng.core.LttngConstants;
-import org.eclipse.tm.tcf.core.Command;
-import org.eclipse.tm.tcf.core.ErrorReport;
-import org.eclipse.tm.tcf.protocol.IChannel;
-import org.eclipse.tm.tcf.protocol.IToken;
+import org.eclipse.tcf.core.Command;
+import org.eclipse.tcf.core.ErrorReport;
+import org.eclipse.tcf.protocol.IChannel;
+import org.eclipse.tcf.protocol.IToken;
 
 /**
  * <b><u>LttControllerServiceProxy</u></b>

diff --git a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
index b5b5c92c3a2e69d925bb9a75a79afeab28eb902e..d8c95ff51eb196e66491fc68da8adeca1541e24d 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="0.4.0",
- org.eclipse.tm.tcf.core;bundle-version="0.4.0",
+ org.eclipse.tcf.core;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime;bundle-version="1.0.0",
  org.eclipse.rse.core;bundle-version="3.2.0",
  org.eclipse.rse.services;bundle-version="3.2.100",
  org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100",

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
index d6d922b3c209fc6e4a913523706a0ff5e459f539..996a68c65207bf7ced07a6d7d817c53805c7623d 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
@@ -33,8 +33,8 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java
index 06bc44f6084a28323a906c7cf42ea01bef21511f..42c648eb14ed1472fff14f7041f3eb65283d9f52 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java
@@ -38,8 +38,8 @@ import org.eclipse.rse.core.model.SystemStartHere;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java
index 99c1af26873664e0e428ea82244cc0523bb117d8..016725a2f144b111a683ccbd485eda183b2e4d6d 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java
@@ -38,8 +38,8 @@ import org.eclipse.rse.core.model.SystemStartHere;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java
index 0f3c02cef346ebb870602888ddbbeceefe640aa3..c73ae287affcacdc060f82a5749d7525710dc229 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java
@@ -34,8 +34,8 @@ import org.eclipse.rse.core.model.SystemStartHere;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java
index 99c8ab3e69447b00dafc6e43745dd92a84e7b25e..6d5a063601dd28e6844e398ce4712fc274eb2c7b 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java
@@ -39,8 +39,8 @@ import org.eclipse.rse.core.model.SystemStartHere;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java
index b51165b9556c6e382b4af3095d2eea2d3594860c..e74247389a292522c54f3fda0088db35db991f60 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java
@@ -36,8 +36,8 @@ import org.eclipse.rse.core.model.SystemStartHere;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
index c4608e79a3ea09bc2817a8d66bf803275f1345de..3adc174223011a8d62997bd5eb682f25ec0ae8f1 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
@@ -32,13 +32,12 @@ import org.eclipse.rse.core.subsystems.CommunicationsEvent;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.rse.ui.subsystems.StandardConnectorService;
-import org.eclipse.tm.tcf.core.AbstractPeer;
-import org.eclipse.tm.tcf.protocol.IChannel;
-import org.eclipse.tm.tcf.protocol.IChannel.IEventListener;
-import org.eclipse.tm.tcf.protocol.IPeer;
-import org.eclipse.tm.tcf.protocol.IService;
-import org.eclipse.tm.tcf.protocol.Protocol;
-import org.eclipse.tm.tcf.services.ILocator;
+import org.eclipse.tcf.core.AbstractPeer;
+import org.eclipse.tcf.protocol.IChannel;
+import org.eclipse.tcf.protocol.IPeer;
+import org.eclipse.tcf.protocol.IService;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.services.ILocator;
 
 /**
  * <b><u>TraceConnectorService</u></b>
@@ -276,7 +275,7 @@ public class TraceConnectorService extends StandardConnectorService {
                         }
                     }
 
-                    final IEventListener listener = new IEventListener() {
+                    final IChannel.IEventListener listener = new IChannel.IEventListener() {
 
                         @Override
                         public void event(String name, byte[] data) {

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
index 035a8f6248c6b9e12a6b5473450c38a8a20e2b8b..8612dadcfd1334e93d02db9d0552430423b9c099 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
@@ -41,8 +41,8 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 
 /**
  * <b><u>ConfigureMarkersDialog</u></b>

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
index 854d7b840d98e6e98abf354ac6e6f12bcf077a9f..01f7d3277406d3405f47fadb6b3291641f964edd 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
@@ -53,8 +53,8 @@ import org.eclipse.rse.services.clientserver.NamePatternMatcher;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
 
 /**
  * <b><u>TraceSubSystem</u></b>

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java
index c31483364dfe9b5794e65c80e9d414e5ba4c4949..0d29fb8b83dd22feb9d55a0f6abd5f26ccd5d571 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java
@@ -21,7 +21,7 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResour
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.tm.tcf.protocol.JSON;
+import org.eclipse.tcf.protocol.JSON;
 
 /**
  * <b><u>DownloadProxy</u></b>

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
index 270f84f04fa85311098315c8db4ad665ecdaa357..6c772457fc6068b317618626219bb850be6baab8 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
@@ -27,8 +27,8 @@ import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstan
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;\r
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;\r
 import org.eclipse.rse.ui.SystemBasePlugin;\r
-import org.eclipse.tm.tcf.protocol.IToken;\r
-import org.eclipse.tm.tcf.util.TCFTask;\r
+import org.eclipse.tcf.protocol.IToken;\r
+import org.eclipse.tcf.util.TCFTask;\r
 import org.eclipse.ui.INewWizard;\r
 import org.eclipse.ui.IWorkbench;\r
 \r