--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htiextension/com.nokia.carbide.extensions.hticonnection.discovery/META-INF/MANIFEST.MF	Mon Sep 06 08:30:18 2010 +0300
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: com.nokia.carbide.extensions.hticonnection Discovery Items
+Bundle-SymbolicName: com.nokia.carbide.extensions.hticonnection.discovery;singleton:=true
+Bundle-Version: 1.5.0.qualifier
+Bundle-Localization: plugin
+Bundle-Vendor: Nokia
+Require-Bundle: org.eclipse.equinox.p2.discovery

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htiextension/com.nokia.carbide.extensions.hticonnection.discovery/build.properties	Mon Sep 06 08:30:18 2010 +0300
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               images/,\
+               plugin.properties

Binary file htiextension/com.nokia.carbide.extensions.hticonnection.discovery/images/HTI_icon.png has changed

Binary file htiextension/com.nokia.carbide.extensions.hticonnection.discovery/images/HTI_shot.png has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htiextension/com.nokia.carbide.extensions.hticonnection.discovery/plugin.properties	Mon Sep 06 08:30:18 2010 +0300
@@ -0,0 +1,1 @@
+summary=The HTI Connection service provides a communication interface between Carbide.c++ and an S60 target device. HTI Connection manages the connection between Carbide.c++ and the device by starting the HTI Datagateway, and shows a generated log in the HTI Connection view. The HTI Connection view shows information of events and errors from Datagateway.exe. The connection parameters can be modified from HTI Preferences.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htiextension/com.nokia.carbide.extensions.hticonnection.discovery/plugin.xml	Mon Sep 06 08:30:18 2010 +0300
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
+
+      <connectorDescriptor
+            categoryId="com.nokia.carbide.rndutilities.category"
+            description="Harmonized Test Interface provides a communication interface between Carbide and S60 device"
+            groupId="com.nokia.carbide.rndutilities.category"
+            id="com.nokia.carbide.extensions.hticonnection.feature.group"
+            kind="task"
+            license="EPL 1.0"
+            name="HTI Connection"
+            provider="Nokia"
+            siteUrl="${SITE_URL}">
+         <overview
+               summary="%summary"
+               screenshot="images/HTI_shot.png"
+               url="http://developer.symbian.org/wiki/index.php/HTI_Connection_Carbide_Extension">
+         </overview>
+         <icon
+               image32="images/HTI_icon.png">
+         </icon>
+      </connectorDescriptor>
+
+
+   </extension>
+</plugin>

--- a/htiextension/com.nokia.carbide.extensions.hticonnection/feature.xml	Tue Aug 31 11:53:05 2010 +0300
+++ b/htiextension/com.nokia.carbide.extensions.hticonnection/feature.xml	Mon Sep 06 08:30:18 2010 +0300
@@ -2,7 +2,7 @@
 <feature
       id="com.nokia.carbide.extensions.hticonnection"
       label="Carbide.c++ Extensions - HTI Connection"
-      version="1.4.0"
+      version="1.5.0"
       provider-name="Nokia"
       plugin="com.nokia.s60tools.hticonnection">
 
@@ -35,9 +35,8 @@
       <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface.text" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="com.nokia.s60tools.ui" version="1.1.9" match="greaterOrEqual"/>
-      <import plugin="com.nokia.s60tools.util" version="1.1.11" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.4.0" match="greaterOrEqual"/>
+      <import feature="com.nokia.s60tools.extensions.framework"/>
    </requires>
 
    <plugin

--- a/htiextension/com.nokia.s60tools.hticonnection.help/META-INF/MANIFEST.MF	Tue Aug 31 11:53:05 2010 +0300
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/META-INF/MANIFEST.MF	Mon Sep 06 08:30:18 2010 +0300
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name:  Carbide.c++ Extensions - HTI Connection Help Plug-in
+Bundle-Name:  Carbide.c++ Extensions - HTI Connection Help
 Bundle-SymbolicName: com.nokia.s60tools.hticonnection.help;singleton:=true
-Bundle-Version: 1.4.0
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

--- a/htiextension/com.nokia.s60tools.hticonnection/META-INF/MANIFEST.MF	Tue Aug 31 11:53:05 2010 +0300
+++ b/htiextension/com.nokia.s60tools.hticonnection/META-INF/MANIFEST.MF	Mon Sep 06 08:30:18 2010 +0300
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Carbide.c++ Extensions - HTI Connection
 Bundle-SymbolicName: com.nokia.s60tools.hticonnection;singleton:=true
-Bundle-Version: 1.4.0
+Bundle-Version: 1.5.0.quaifier
 Bundle-ClassPath: .,
  htiapi.jar
 Bundle-Vendor: Nokia
@@ -13,8 +13,7 @@
  com.nokia.s60tools.ui;bundle-version="1.5.0",
  com.nokia.s60tools.util;bundle-version="1.1.11",
  com.nokia.carbide.remoteConnections;bundle-version="1.4.0",
- com.nokia.carbide.trk.support;bundle-version="1.4.0",
- com.freescale.cdt.debug.cw.core;bundle-version="1.4.0"
+ com.nokia.carbide.trk.support;bundle-version="1.4.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Activator: com.nokia.s60tools.hticonnection.HtiApiActivator
 Bundle-ActivationPolicy: lazy

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htiextension/com.nokia.s60tools.hticonnection/plugin.properties	Mon Sep 06 08:30:18 2010 +0300
@@ -0,0 +1,22 @@
+################################################################################
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+#
+################################################################################
+# plugin.properties
+# contains externalized strings for plugin.xml
+
+htiApiPreference.common=hti

--- a/htiextension/com.nokia.s60tools.hticonnection/plugin.xml	Tue Aug 31 11:53:05 2010 +0300
+++ b/htiextension/com.nokia.s60tools.hticonnection/plugin.xml	Mon Sep 06 08:30:18 2010 +0300
@@ -24,13 +24,25 @@
                tooltip="HTI Connection"/>
       </actionSet>
    </extension>
+   
+   <extension
+       point="org.eclipse.ui.keywords">
+    <keyword
+          id="com.nokia.s60tools.hticonnection.preferences.common"
+          label="%htiApiPreference.common">
+    </keyword>
+ </extension>
+   
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             category="com.nokia.carbide.cpp.preferences.ExtensionsPreferencesPage"
             class="com.nokia.s60tools.hticonnection.preferences.HtiApiPreferencePage"
             id="com.nokia.s60tools.hticonnection.preferences.HtiApiPreferencePage"
-            name="HTI Connection Preferences">
+            name="HTI Connection">
+            <keywordReference
+               id="com.nokia.s60tools.hticonnection.preferences.common">
+            </keywordReference>
       </page>
    </extension>
    <extension

--- a/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/gateway/DataGatewayManager.java	Tue Aug 31 11:53:05 2010 +0300
+++ b/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/gateway/DataGatewayManager.java	Mon Sep 06 08:30:18 2010 +0300
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import com.freescale.cdt.debug.cw.core.SerialConnectionSettings;
 import com.nokia.carbide.remoteconnections.interfaces.IConnection;
 import com.nokia.s60tools.hticonnection.HtiApiActivator;
 import com.nokia.s60tools.hticonnection.common.ProductInfoRegistry;
@@ -45,6 +44,13 @@
 	private static final String COMM_CHANNEL_SERIAL = "SERIAL"; //$NON-NLS-1$
 	private static final String COMM_CHANNEL_IP = "IPCOMM"; //$NON-NLS-1$
 	
+	// This constant is introduced to remove the dependency to class com.freescale.cdt.debug.cw.core.SerialConnectionSettings,
+	// which existed only because of the string value of constant SerialConnectionSettings.Port.
+	// The string value is the same as SerialConnectionSettings.Port. 
+	// It is essentially API and will not be changed.
+	private static final String PORT = "port"; //$NON-NLS-1$
+	
+	
 	/**
 	 * Class that holdes Datagateway.exe process that is running.
 	 */
@@ -124,7 +130,7 @@
 				type.equals(HTIService.USB_TYPE)) {
 			// Handling serial connections
 			
-			String comPort = "COM" + connection.getSettings().get(SerialConnectionSettings.PORT); //$NON-NLS-1$
+			String comPort = "COM" + connection.getSettings().get(PORT); //$NON-NLS-1$
 
 			String[] cmd = new String[] {
 					path + File.separator + ProductInfoRegistry.getDatagatewayExeName(), 

--- a/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/preferences/HtiApiPreferencePage.java	Tue Aug 31 11:53:05 2010 +0300
+++ b/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/preferences/HtiApiPreferencePage.java	Mon Sep 06 08:30:18 2010 +0300
@@ -70,7 +70,7 @@
 	 * Constructor
 	 */
 	public HtiApiPreferencePage() {
-		super(ProductInfoRegistry.getProductName() + Messages.getString("HtiApiPreferencePage.Preferences_Postfix")); //$NON-NLS-1$
+		super(ProductInfoRegistry.getProductName()); //$NON-NLS-1$
 		isCreated = true;
 	}