# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1284587810 18000
# Node ID d6760e7efd55e8622cd2ce24af11a3e5515942e6
# Parent  b3e017e143356fe4a88ebccf365c4c844eac302c# Parent  1f9d642f8f252246c2cd3aaabff2df62f0b42857
Merge commit

diff -r b3e017e14335 -r d6760e7efd55 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java	Wed Sep 15 16:55:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java	Wed Sep 15 16:56:50 2010 -0500
@@ -70,7 +70,7 @@
 							sbsv2BuildInfo.setPreviouslyScanned(true);
 							File featureDir = new File(sdk.getEPOCROOT() + SDK_FEATURE_SUBDIR);
 							try {
-								IStatus status = DynamicP2Installer.install(featureDir, subMonitor);
+								IStatus status = DynamicP2Installer.install(sdk.getUniqueId(), featureDir, subMonitor);
 								if (status.isOK()) {
 									// TODO advise user??
 									installed = true;
diff -r b3e017e14335 -r d6760e7efd55 core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF	Wed Sep 15 16:55:53 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF	Wed Sep 15 16:56:50 2010 -0500
@@ -22,6 +22,7 @@
  org.eclipse.jface.text,
  org.eclipse.ui.editors,
  org.eclipse.ui.forms;bundle-version="3.5.0",
+ com.nokia.carbide.remoteConnections;bundle-version="3.0.0",
  com.nokia.cpp.utils.ui;bundle-version="1.0.0",
  com.nokia.cpp.utils.core;bundle-version="1.0.0",
  org.eclipse.equinox.p2.touchpoint.natives;bundle-version="1.0.200"
diff -r b3e017e14335 -r d6760e7efd55 core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/p2/DynamicP2Installer.java
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/p2/DynamicP2Installer.java	Wed Sep 15 16:55:53 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/p2/DynamicP2Installer.java	Wed Sep 15 16:56:50 2010 -0500
@@ -39,6 +39,7 @@
 import org.eclipse.equinox.p2.ui.ProvisioningUI;
 
 import com.nokia.carbide.discovery.ui.Activator;
+import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
 
 /**
  * Installer to install features from a p2 repository at a supplied URL or directory.
@@ -80,10 +81,12 @@
 	 * @param monitor An implementation of IProgressMonitor, usually showing the 
 	 * installation progress as a Progress Bar to the user.
 	 */
-	public static IStatus install(File repositoryDirectory, IProgressMonitor monitor) {
+	public static IStatus install(String sdkId, File repositoryDirectory, IProgressMonitor monitor) {
 		try {
 			DynamicP2Installer installer = new DynamicP2Installer(repositoryDirectory);
 			installer.doInstall(monitor);
+			RemoteConnectionsActivator.getStatusDisplay().displayStatus(
+					Activator.makeStatus(IStatus.INFO, "Installed features from " + sdkId, null));
 			return Status.OK_STATUS;
 		} catch (CoreException e) {
 			return e.getStatus();
diff -r b3e017e14335 -r d6760e7efd55 templates/com.nokia.carbide.cpp.templates/plugin.xml
--- a/templates/com.nokia.carbide.cpp.templates/plugin.xml	Wed Sep 15 16:55:53 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/plugin.xml	Wed Sep 15 16:56:50 2010 -0500
@@ -43,14 +43,6 @@
             templateId="com.nokia.carbide.cpp.templates.symbian.empty"
             wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
 
-      <template
-      		displayName="%openc.label"
-            filterArguments=""
-            groupLabel="%S60.3.label"
-            image="icons/icon_S60.png"
-            location="templates/projecttemplates/OpenC-HelloWorld/template.xml"
-            templateId="com.nokia.carbide.cpp.templates.openC.helloworld"
-            wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
    </extension>
 
 	<!-- CLASS WIZARDS -->
diff -r b3e017e14335 -r d6760e7efd55 templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml	Wed Sep 15 16:55:53 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml	Wed Sep 15 16:56:50 2010 -0500
@@ -73,7 +73,7 @@
 		<!-- SIS -->
 		<parameter name="file"
 			sourcePath="sis/Basename.pkg" 
-			targetPath="$(sisDir)/$(baseName)_S60_3_X_v_1_0_0.pkg" 
+			targetPath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg" 
 			/> 
 		<parameter name="file"
 			sourcePath="sis/backup_registration.xml"
@@ -97,7 +97,7 @@
 		<parameter name="project" projectName="$(projectName)"
 			bldInfPath="$(groupDir)/bld.inf"
 			targetMMPFileName="$(baseName).mmp" 
-			pkgFilePath="$(sisDir)/$(baseName)_S60_3_X_v_1_0_0.pkg" /> 
+			pkgFilePath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg" /> 
 	</process>
 
 </template>
diff -r b3e017e14335 -r d6760e7efd55 templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/template.properties
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/template.properties	Wed Sep 15 16:55:53 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/template.properties	Wed Sep 15 16:56:50 2010 -0500
@@ -1,6 +1,6 @@
-template.label=3rd-Future Ed. GUI Application
+template.label=GUI Application
 template.desc=A simple platform security enabled GUI application (Hello world).\r\n\
-This wizard generates a Platform Security enabled executable for Nokia S60 3rd-Future Editions only.
+This wizard generates a Platform Security enabled executable for Nokia AVKON SDKs.
 basics.label=Basic Settings
 basics.desc=Basic properties of a project
 basics.uid3.label=Application UID:
diff -r b3e017e14335 -r d6760e7efd55 templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.properties
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.properties	Wed Sep 15 16:55:53 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.properties	Wed Sep 15 16:56:50 2010 -0500
@@ -1,7 +1,7 @@
 template.label=GUI Application
 template.desc=A simple platform security enabled GUI application (Hello world).\r\n\
 The main container can receive Touch UI events in Touch-enabled SDKs.\r\n\
-This wizard generates a Platform Security enabled executable for Nokia S60 SDKs with Touch UI support.
+This wizard generates a Platform Security enabled executable for Nokia SDKs supporting AVKON and Touch UI.
 basics.label=Basic Settings
 basics.desc=Basic properties of a project
 basics.uid3.label=Application UID:
diff -r b3e017e14335 -r d6760e7efd55 templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.xml
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.xml	Wed Sep 15 16:55:53 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.xml	Wed Sep 15 16:56:50 2010 -0500
@@ -124,7 +124,7 @@
 			/> 
 		<parameter name="file"
 			sourcePath="sis/baseName.pkg"
-			targetPath="$(sisDir)/$(baseName)_S60_3_X_v_1_0_0.pkg"
+			targetPath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg"
 			/> 
 		<parameter name="file"
 			sourcePath="sis/backup_registration.xml"
@@ -203,7 +203,7 @@
 		<parameter name="project" projectName="$(projectName)"
 			bldInfPath="$(groupDir)/bld.inf"
 			targetMMPFileName="$(baseName).mmp" 
-			pkgFilePath="$(sisDir)/$(baseName)_S60_3_X_v_1_0_0.pkg" /> 
+			pkgFilePath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg" /> 
 	</process>
 	
 </template>