# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1283984484 18000
# Node ID 3482df86a51d77a6cee2e3c89da4dffd98144465
# Parent  86b9e2a7db20c2c9a63a0ae4aa5dd6ba866d9464
Remove TRK service and replace with TCF TRK service.  Remove wildcard service check used as an interim when TCF TRK and TRK were both options.

diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.carbide.trk.support/plugin.xml
--- a/debuggercdi/com.nokia.carbide.trk.support/plugin.xml	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/plugin.xml	Wed Sep 08 17:21:24 2010 -0500
@@ -2,6 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin>
 
+<!-- C3TCF: removing TRK support, which is the service, and any connections that only support TRK, from C3
    <extension
          point="com.nokia.carbide.remoteConnections.service">
       <service
@@ -20,18 +21,22 @@
             class="com.nokia.carbide.trk.support.connection.SerialBTConnectionType">
       </connectionType>
    </extension>
+-->
+
    <extension
          point="com.nokia.carbide.remoteConnections.connectionType">
       <connectionType
             class="com.nokia.carbide.trk.support.connection.USBConnectionType">
       </connectionType>
    </extension>
+   
    <extension
          point="com.nokia.carbide.remoteConnections.service">
       <service
             class="com.nokia.carbide.trk.support.service.TracingService">
       </service>
    </extension>
+   
    <extension
          point="com.nokia.carbide.remoteConnections.connectedServiceFactory">
       <connectedServiceFactory
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Wed Sep 08 17:21:24 2010 -0500
@@ -4,28 +4,9 @@
 ConnectionStatusReconciler_inUseLabel_lower=in use
 ConnectionStatusReconciler_NotReadyLabel=Not Ready
 ConnectionStatusReconciler_ReadyLabel=Ready
-ConnectionStatusReconciler_TracingServicePrefix=, Tracing service 
-ConnectionStatusReconciler_TRKServicePrefix=Debugging services 
+ConnectionStatusReconciler_TracingServicePrefix=, Trace service 
+ConnectionStatusReconciler_TRKServicePrefix=Debug services 
 ConnectionStatusReconciler_unavailableLabel=unavailable
-TRKConnectedService.AppTRKName=Application TRK 
-TRKConnectedService.DownLabel=Not Accessible
-TRKConnectedService.ErrorStatus=Error: 
-TRKConnectedService.InUseLabel=In Use
-TRKConnectedService.IsLatestStatus=Installed TRK is latest available version: version = {0}
-TRKConnectedService.NeedsInstallStatus1=There is a newer version of TRK available. Please use the install tab to install it:\n
-TRKConnectedService.NeedsInstallStatus2=Installed TRK version = {0}, latest TRK version = {1}
-TRKConnectedService.OKStatus=Connection to TRK OK, TRK version = {0}
-TRKConnectedService.PortInUseStatus=Port {0} is in use
-TRKConnectedService.TaskLabel=Testing TRK Service
-TRKConnectedService.TCPIPInUseStatus=Address {0}, port {1} is in use
-TRKConnectedService.NoPingError=TRK did not respond
-TRKConnectedService.BadVersionResponseError=TRK version response was corrupted
-TRKConnectedService.NoPingErrorNoVersionError=Attempt to get TRK version timed out
-TRKConnectedService.RunningLabel=Available
-TRKConnectedService.SysTRKName=System TRK 
-TRKConnectedService.UnknownLabel=Unknown
-TRKService.Label=TRK
-TRKService.ServiceInfo=Ensure TRK is running on the device
 SerialConnectionFactory.BaudLabel=Baud rate:
 SerialConnectionFactory.DataBitsLabel=Data bits:
 SerialConnectionFactory.FlowControlLabel=Flow control:
@@ -52,12 +33,31 @@
 TracingConnectedService.OKStatus=Connection to TraceCore OK
 TracingConnectedService.PortInUseStatus=Port {0} is in use
 TracingConnectedService.RunningLabel=Available
-TracingConnectedService.TaskLabel=Testing Tracing Service
+TracingConnectedService.TaskLabel=Testing Trace Service
 TracingConnectedService.TCPIPInUseStatus=Address {0}, port {1} is in use
 TracingConnectedService.TimedOutError=Attempt to get response from TraceCore timed out
 TracingConnectedService.UnknownLabel=Unknown
 TracingService.AdditionalInfoString=For USB, ensure TraceSwitch is running on the device. 
-TracingService.Label=Tracing
+TracingService.Label=Trace
 USBConnectionType.Desc=USB serial port connection settings
 USBConnectionType.Label=USB
-
+# the below TRK strings should be no longer used
+TRKConnectedService.AppTRKName=Application TRK 
+TRKConnectedService.DownLabel=Not Accessible
+TRKConnectedService.ErrorStatus=Error: 
+TRKConnectedService.InUseLabel=In Use
+TRKConnectedService.IsLatestStatus=Installed TRK is latest available version: version = {0}
+TRKConnectedService.NeedsInstallStatus1=There is a newer version of TRK available. Please use the install tab to install it:\n
+TRKConnectedService.NeedsInstallStatus2=Installed TRK version = {0}, latest TRK version = {1}
+TRKConnectedService.OKStatus=Connection to TRK OK, TRK version = {0}
+TRKConnectedService.PortInUseStatus=Port {0} is in use
+TRKConnectedService.TaskLabel=Testing TRK Service
+TRKConnectedService.TCPIPInUseStatus=Address {0}, port {1} is in use
+TRKConnectedService.NoPingError=TRK did not respond
+TRKConnectedService.BadVersionResponseError=TRK version response was corrupted
+TRKConnectedService.NoPingErrorNoVersionError=Attempt to get TRK version timed out
+TRKConnectedService.RunningLabel=Available
+TRKConnectedService.SysTRKName=System TRK 
+TRKConnectedService.UnknownLabel=Unknown
+TRKService.Label=TRK
+TRKService.ServiceInfo=Ensure TRK is running on the device
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java	Wed Sep 08 17:21:24 2010 -0500
@@ -27,8 +27,6 @@
 import com.nokia.carbide.remoteconnections.interfaces.IConnectedServiceFactory;
 import com.nokia.carbide.remoteconnections.interfaces.IConnection;
 import com.nokia.carbide.remoteconnections.interfaces.IService;
-import com.nokia.carbide.trk.support.connection.SerialBTConnectionType;
-import com.nokia.carbide.trk.support.connection.SerialConnectionType;
 import com.nokia.carbide.trk.support.connection.USBConnectionType;
 import com.nokia.cpp.internal.api.utils.core.HostOS;
 
@@ -47,12 +45,14 @@
 				return new RemoteConnectedService(service);		// TODO: not ported
 			return new TracingConnectedService(service, (AbstractSynchronizedConnection) connection);
 		}
+		/* C3TCF: removing TRK
 		else if (service instanceof TRKService &&
 				isCompatibleConnection(getCompatibleTRKConnectionTypeIds(), connection)) {
 			if (HostOS.IS_UNIX)
 				return new RemoteConnectedService(service);	// TODO: not ported
 			return new TRKConnectedService(service, (AbstractSynchronizedConnection) connection);
 		}
+		*/
 		return null;
 	}
 	
@@ -72,6 +72,7 @@
 		});
 	}
 	
+	/*
 	private Collection<String> getCompatibleTRKConnectionTypeIds() {
 		return Arrays.asList(new String[] {
 				SerialConnectionType.ID,
@@ -79,14 +80,18 @@
 				USBConnectionType.ID,
 				}); 
 	}
+	*/
 	
 	/* (non-Javadoc)
 	 * @see com.nokia.carbide.remoteconnections.interfaces.IConnectedServiceFactory#getCompatibleConnectionTypeIds(com.nokia.carbide.remoteconnections.interfaces.IService)
 	 */
 	public Collection<String> getCompatibleConnectionTypeIds(IService service) {
+		/* C3TCF: removing TRK
 		if (service instanceof TRKService)
 			return getCompatibleTRKConnectionTypeIds();
-		else if (service instanceof TracingService)
+		else
+		*/ 
+		if (service instanceof TracingService)
 			return getCompatibleTracingConnectionTypeIds();
 		return Collections.emptyList();
 	}
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java	Wed Sep 08 17:21:24 2010 -0500
@@ -49,7 +49,7 @@
 import com.nokia.tcf.api.TCFClassFactory;
 
 /**
- *
+ *	@deprecated C3TCF: TRK not visible or supported in C3
  */
 public class TRKConnectedService extends AbstractConnectedService2 {
 	
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKInstallerProvider.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKInstallerProvider.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKInstallerProvider.java	Wed Sep 08 17:21:24 2010 -0500
@@ -22,7 +22,7 @@
 import com.nokia.carbide.remoteconnections.interfaces.*;
 
 /**
- *
+ * @deprecated C3TCF:  TRKService and installer are not provided in C3
  */
 public class TRKInstallerProvider extends AbstractPackageInstallerProvider {
 
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java	Wed Sep 08 17:21:24 2010 -0500
@@ -28,6 +28,8 @@
 
 /**
  * Implementation of IService for TRK
+ * 
+ * @deprecated C3TCF: TRK service not provided in C3
  */
 public class TRKService implements IService {
 
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java	Wed Sep 08 17:21:24 2010 -0500
@@ -38,7 +38,6 @@
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
 import com.nokia.carbide.trk.support.Messages;
 import com.nokia.carbide.trk.support.connection.USBConnectionType;
-import com.nokia.carbide.trk.support.service.TRKConnectedService;
 import com.nokia.cpp.internal.api.utils.ui.RunRunnableWhenWorkbenchVisibleJob;
 import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
 
@@ -112,15 +111,16 @@
 		return connection instanceof IConnection2 && ((IConnection2) connection).isDynamic();
 	}
 
+	/* C3TCF
 	private boolean isSysTRK(TRKConnectedService service) {
 		String value = service.getProperties().get(TRKConnectedService.PROP_SYS_TRK);
 		return Boolean.parseBoolean(value);
 	}
-	
+	*/
 	private void addConnection(IConnection connection) {
 		handledConnections.add(connection);
 		for (IConnectedService service : manager.getConnectedServices(connection)) {
-			if (service instanceof TRKConnectedService || isTCFTRKService(service)) {
+			if (/* C3TCF service instanceof TRKConnectedService ||*/ isTCFTRKService(service)) {
 				service.addStatusChangedListener(serviceStatusListener);
 			}
 		}
@@ -213,10 +213,12 @@
 		EStatus trkStatus = EStatus.UNKNOWN;
 		EStatus tcfTRKStatus = EStatus.UNKNOWN;
 		for (IConnectedService service : manager.getConnectedServices(connection)) {
+			/* C3TCF
 			if (service instanceof TRKConnectedService) {
 				isSysTRK = isSysTRK((TRKConnectedService) service);
 				trkStatus = service.getStatus().getEStatus();
 			}
+			*/
 			if (isTCFTRKService(service)) { //$NON-NLS-1$
 				tcfTRKStatus = service.getStatus().getEStatus();
 			}
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/plugin.xml
--- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Wed Sep 08 17:21:24 2010 -0500
@@ -28,13 +28,13 @@
       </launchConfigurationType>
 
       <launchConfigurationType
-            name="Symbian OS Application TRK"
+            name="Symbian OS Application TCF TRK"
             public="true"
             id="com.nokia.cdt.debug.launch.appTRKLaunch">
       </launchConfigurationType>
  
       <launchConfigurationType
-            name="Symbian OS System TRK"
+            name="Symbian OS System TCF TRK"
             public="true"
             id="com.nokia.cdt.debug.launch.systemTRKLaunch">
       </launchConfigurationType>
@@ -181,11 +181,11 @@
             </contextLabel>
          </contextualLaunch>
          <description
-               description="Debugs on a phone or simulator using System TRK or Application TRK"
+               description="Debugs on a phone or simulator using System or Application TCF TRK"
                mode="debug">
          </description>
          <description
-               description="Runs on a phone or simulator using System TRK or Application TRK"
+               description="Runs on a phone or simulator using System or Application TCF TRK"
                mode="run">
          </description>
       </shortcut>
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Wed Sep 08 17:21:24 2010 -0500
@@ -74,7 +74,9 @@
 
 	public static final String EMULATION_LAUNCH_TYPE = "com.nokia.cdt.debug.launch.emulationLaunch"; //$NON-NLS-1$
 	
+	/** @deprecated */
 	public static final String REMOTE_CONNECTIONS_TRK_SERVICE = "com.nokia.carbide.trk.support.service.TRKService"; //$NON-NLS-1$
+	public static final String REMOTE_CONNECTIONS_TCFTRK_SERVICE = "com.nokia.carbide.cpp.edc.TCFTRKService"; //$NON-NLS-1$
 	public static final String REMOTE_CONNECTIONS_TRACING_SERVICE = "com.nokia.carbide.trk.support.service.TracingService"; //$NON-NLS-1$
 
 	
@@ -384,11 +386,24 @@
 		return CarbideBuilderPlugin.getProjectInContext();
 	}
 	
+	/** @deprecated */
 	public static IService getTRKService() {
 		return RemoteConnectionsActivator.getConnectionTypeProvider().
 					findServiceByID(REMOTE_CONNECTIONS_TRK_SERVICE);
 	}
-	
+	/** Get the TCF TRK service, specifically */
+	public static IService getTCFTRKService() {
+		return RemoteConnectionsActivator.getConnectionTypeProvider().
+				findServiceByID(REMOTE_CONNECTIONS_TCFTRK_SERVICE);
+	}
+	/** Get the run-mode debug service, generically */
+	public static IService getRunModeDebugService() {
+		return getTCFTRKService();
+	}
+	/** Get the run-mode debug service ID, generically */
+	public static String getDebugServiceId() {
+		return REMOTE_CONNECTIONS_TCFTRK_SERVICE;
+	}
 	/**
 	 * Returns the currently active workbench window or <code>null</code>
 	 * if none.
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/PhoneLaunchShortcut.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/PhoneLaunchShortcut.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/PhoneLaunchShortcut.java	Wed Sep 08 17:21:24 2010 -0500
@@ -45,7 +45,7 @@
 		LaunchPlugin.getDefault().launchProject(project, executable, defaultMMP, mode, 
 																new ILaunchCreationWizardFactory() {
 					public ILaunchCreationWizard createLaunchCreationWizard(LaunchOptions launchOptions) throws Exception {
-						IService trkService = LaunchPlugin.getTRKService();
+						IService trkService = LaunchPlugin.getRunModeDebugService();
 						LaunchWizard launchWizard = new LaunchWizard(launchOptions, trkService);
 						return launchWizard;
 					};
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties	Wed Sep 08 17:21:24 2010 -0500
@@ -1,7 +1,7 @@
 AbstractSymbianLaunchShortcut.ChooseConfigLabel=Select the launch configuration:
 AbstractSymbianLaunchShortcut.ChooseConfigTitle=Choose configuration
 LaunchPlugin.0=Carbide_Sys_TRK
-LaunchPlugin.1=System TRK Debugging
+LaunchPlugin.1=System TCF TRK Debugging
 LaunchPlugin.17=No binaries found for project. Unable to launch.
 LaunchPlugin.ErrorTitle=Launch Error
 LaunchPlugin.noTCPIPConnectionType=Unable to locate a TCP/IP connection type.
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/CommandRunLaunchWizard2.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/CommandRunLaunchWizard2.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/CommandRunLaunchWizard2.java	Wed Sep 08 17:21:24 2010 -0500
@@ -17,8 +17,8 @@
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 import com.nokia.carbide.cdt.builder.EpocEngineHelper;
 import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
-import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
 import com.nokia.carbide.remoteconnections.interfaces.IService;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
 
 /**
  * Our sample handler extends AbstractHandler, an IHandler base class.
@@ -56,8 +56,7 @@
 			if (info == null) 
 				throw new ExecutionException("Not a Carbide project");
 			List<IPath> mmpFiles = EpocEngineHelper.getMMPFilesForProject(info);
-			IService trkService = RemoteConnectionsActivator.getConnectionTypeProvider().
-				findServiceByID("com.nokia.carbide.trk.support.service.TRKService"); //$NON-NLS-1$
+			IService debugService = LaunchPlugin.getRunModeDebugService();
 
 			List<IPath> allExePaths = new ArrayList<IPath>();
 			List<IPath> currBuiltExePaths = new ArrayList<IPath>();
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java	Wed Sep 08 17:21:24 2010 -0500
@@ -403,7 +403,7 @@
 			Collection<IConnectedService> connectedServices = 
 				RemoteConnectionsActivator.getConnectionsManager().getConnectedServices(connection);
 			for (IConnectedService connectedService : connectedServices) {
-				if (connectedService.getService().getIdentifier().equals(service.getIdentifier()))
+				if (service != null && connectedService.getService().getIdentifier().equals(service.getIdentifier()))
 					return connectedService;
 			}
 		}
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java	Wed Sep 08 17:21:24 2010 -0500
@@ -59,10 +59,8 @@
 		fProjText.setToolTipText(Messages.getString("RunModeMainTab.8")); //$NON-NLS-1$
 
 		createVerticalSpacer(comp, 1);
-		/* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet; 
-		 * this isn't a problem, though, since all stock connections support TRK anyway */
-		//clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
-		clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
+		clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(
+				LaunchPlugin.getRunModeDebugService());
 		clientSiteUI.createComposite(comp);
 		clientSiteUI.addListener(new IListener() {
 			public void connectionSelected() {
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java	Wed Sep 08 17:21:24 2010 -0500
@@ -80,10 +80,8 @@
 		if (wantsConnectionUI)
 		{
 			createVerticalSpacer(comp, 1);
-			/* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet; 
-			 * this isn't a problem, though, since all stock connections support TRK anyway */
-			//clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
-			clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
+			clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(
+					LaunchPlugin.getRunModeDebugService());
 			clientSiteUI.createComposite(comp);
 			clientSiteUI.addListener(new IListener() {
 				public void connectionSelected() {
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java	Wed Sep 08 17:21:24 2010 -0500
@@ -17,6 +17,7 @@
 package com.nokia.cdt.internal.debug.launch.wizard;
 
 import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
 import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
 import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
 
@@ -57,7 +58,8 @@
     public void addPages() {
     	super.addPages();
         fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
-        fMainPage = new TRKConnectionWizardPage(this);
+        fMainPage = new TRKConnectionWizardPage(this,
+        		LaunchPlugin.getDebugServiceId());
         fSISSelectionPage = new TRKSISSelectionWizardPage(this);
         addPage(fBuildOptionsSelectionPage);
         addPage(fMainPage);
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java	Wed Sep 08 17:21:24 2010 -0500
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
 
 public class AttachTRKLaunchWizard extends AbstractLaunchWizard {
     private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
@@ -54,7 +55,8 @@
     public void addPages() {
     	super.addPages();
         fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
-        fMainPage = new TRKConnectionWizardPage(this);
+        fMainPage = new TRKConnectionWizardPage(this,
+        		LaunchPlugin.getDebugServiceId());
         addPage(fBuildOptionsSelectionPage);
         addPage(fMainPage);
 	    addPage(getSummaryPage());
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java	Wed Sep 08 17:21:24 2010 -0500
@@ -17,6 +17,7 @@
 package com.nokia.cdt.internal.debug.launch.wizard;
 
 import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
 import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
 import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
 
@@ -56,7 +57,8 @@
     public void addPages() {
     	super.addPages();
         fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
-        fMainPage = new TRKConnectionWizardPage(this);
+        fMainPage = new TRKConnectionWizardPage(this,
+        		LaunchPlugin.getDebugServiceId());
         addPage(fBuildOptionsSelectionPage);
         addPage(fMainPage);
         addPage(getSummaryPage());
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKConnectionWizardPage.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKConnectionWizardPage.java	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKConnectionWizardPage.java	Wed Sep 08 17:21:24 2010 -0500
@@ -21,7 +21,6 @@
 import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI2;
 import com.nokia.carbide.remoteconnections.interfaces.IConnection;
 import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI2.IListener;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
 import com.nokia.cpp.internal.api.utils.core.Check;
 
 import org.eclipse.core.runtime.IStatus;
@@ -40,10 +39,13 @@
 	private final ISummaryTextItemContainer summaryTextItemContainer;
 	private IClientServiceSiteUI2 clientSiteUI;
 	private String connectionId;
+	private final String debugServiceId;
 	
     
-    public TRKConnectionWizardPage(ISummaryTextItemContainer summaryTextItemContainer) {
+    public TRKConnectionWizardPage(ISummaryTextItemContainer summaryTextItemContainer,
+    		String debugServiceId) {
         super(Messages.getString("TRKConnectionWizardPage.0")); //$NON-NLS-1$
+		this.debugServiceId = debugServiceId;
 		Check.checkArg(summaryTextItemContainer);
 		this.summaryTextItemContainer = summaryTextItemContainer;
         setPageComplete(false);
@@ -59,7 +61,9 @@
         GridLayout layout = new GridLayout();
         composite.setLayout(layout);
 
-		clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+		clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(
+				RemoteConnectionsActivator.getConnectionTypeProvider().
+				findServiceByID(debugServiceId));
 		clientSiteUI.createComposite(composite);
 		clientSiteUI.addListener(new IListener() {
 			public void connectionSelected() {
diff -r 86b9e2a7db20 -r 3482df86a51d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Wed Sep 08 17:14:34 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Wed Sep 08 17:21:24 2010 -0500
@@ -1,6 +1,6 @@
-AppTRKLaunchWizard.1=New Application TRK Launch Configuration
-AppTRKLaunchWizard.2=Application TRK Launch Configuration
-AppTRKLaunchWizard.3=Application TRK is a debug agent that runs on released phones and allows you to debug your executables. The debugger downloads the Symbian OS installation file to the phone and installs it prior to launching.
+AppTRKLaunchWizard.1=New Application TCF Debugger Launch Configuration
+AppTRKLaunchWizard.2=Application TCF Debugger Launch Configuration
+AppTRKLaunchWizard.3=Application TCF Debugger is a debug agent that runs on released phones and allows you to debug your executables. The debugger downloads the Symbian OS installation file to the phone and installs it prior to launching.
 AttachTRKLaunchWizard.1=New Attach to Process Launch Configuration
 AttachTRKLaunchWizard.2=Attach to Process Launch Configuration
 AttachTRKLaunchWizard.3=The debugger attempts to debug a process already running on the phone.
@@ -19,7 +19,7 @@
 LaunchCategorySelectionPage.title=Launch Categories
 LaunchCategorySelectionPage.description=Select a launch category.
 LaunchCategorySelectionPage.phone=Phone
-LaunchCategorySelectionPage.phoneDesc=Launches on a phone using System TRK or Application TRK.
+LaunchCategorySelectionPage.phoneDesc=Launches on a phone using System or Application TCF TRK.
 LaunchCategorySelectionPage.categoryLabel=Select where you want to launch
 LaunchWizardSelectionPage.0=Launch Wizard
 LaunchWizardSelectionPage.1=Launch Types
@@ -46,9 +46,9 @@
 MainExecutableSelectionWizardPage.SelectExectuableTitle=Select Exectuable To Launch
 MainExecutableSelectionWizardPage.UsePathLabel.device=Specify device path of remote process to launch
 MainExecutableSelectionWizardPage.UsePathLabel.device.ToolTip=The specified process will be launched on the phone
-SystemTRKLaunchWizard.1=New System TRK Launch Configuration
-SystemTRKLaunchWizard.2=System TRK Launch Configuration
-SystemTRKLaunchWizard.3=System TRK is a debug agent that runs on reference boards and prototype phones and allows you to debug your executables. The debugger downloads the executable files to the phone prior to launching. With System TRK, you can also debug the binaries included in the ROM image.
+SystemTRKLaunchWizard.1=New System TCF TRK Launch Configuration
+SystemTRKLaunchWizard.2=System TCF TRK Launch Configuration
+SystemTRKLaunchWizard.3=System TCF TRK is a debug agent that runs on reference boards and prototype phones and allows you to debug your executables. The debugger downloads the executable files to the phone prior to launching. With the System TCF TRK, you can also debug the binaries included in the ROM image.
 TRKConnectionWizardPage.0=Connection Settings
 TRKConnectionWizardPage.1=Select the remote connection to use to connect for debugging
 TRKConnectionWizardPage.2=Serial Port\: