--- a/debuggercdi/com.nokia.carbide.trk.support/plugin.xml	Mon Mar 29 15:56:12 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/plugin.xml	Tue Mar 30 10:56:37 2010 -0600
@@ -44,5 +44,11 @@
             class="com.nokia.carbide.trk.support.connection.TCPIPConnectionType">
       </connectionType>
    </extension>
+   <extension
+         point="com.nokia.carbide.remoteConnections.connectionType">
+      <connectionType
+            class="com.nokia.carbide.trk.support.connection.TCFConnectionType">
+      </connectionType>
+   </extension>
  	
 </plugin>

--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Mon Mar 29 15:56:12 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Tue Mar 30 10:56:37 2010 -0600
@@ -60,3 +60,6 @@
 TracingService.Label=Tracing
 USBConnectionType.Desc=USB serial port connection settings
 USBConnectionType.Label=USB
+TCFConnectionType.Desc=TCP/IP settings
+TCFConnectionType.Label=TCP/IP
+

--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java	Mon Mar 29 15:56:12 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java	Tue Mar 30 10:56:37 2010 -0600
@@ -29,6 +29,8 @@
 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.TCFConnection;
+import com.nokia.carbide.trk.support.connection.TCFConnectionType;
 import com.nokia.carbide.trk.support.connection.USBConnectionType;
 import com.nokia.cpp.internal.api.utils.core.HostOS;
 
@@ -49,7 +51,7 @@
 		}
 		else if (service instanceof TRKService &&
 				isCompatibleConnection(getCompatibleTRKConnectionTypeIds(), connection)) {
-			if (HostOS.IS_UNIX)
+			if (HostOS.IS_UNIX || connection instanceof TCFConnection)
 				return new RemoteConnectedService(service);	// TODO: not ported
 			return new TRKConnectedService(service, (AbstractSynchronizedConnection) connection);
 		}
@@ -75,7 +77,8 @@
 	
 	private Collection<String> getCompatibleTRKConnectionTypeIds() {
 		return Arrays.asList(new String[] {
-				SerialConnectionType.ID, 
+				SerialConnectionType.ID,
+				TCFConnectionType.ID,
 				SerialBTConnectionType.ID,
 				USBConnectionType.ID}); 
 	}