# HG changeset patch
# User bkirk
# Date 1284851938 25200
# Node ID deb27f632e39df4bd2b8d4500b62f52368a607de
# Parent  683a3be65e072e27bf4b6427b7bf57789cfb0c05
should be using JavaSE-1.6 VM, and .classpath, codegen.targetPlatform, compliance and source should also all be 1.6

diff -r 683a3be65e07 -r deb27f632e39 builder/com.nokia.carbide.cdt.builder/.classpath
--- a/builder/com.nokia.carbide.cdt.builder/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="schema"/>
diff -r 683a3be65e07 -r deb27f632e39 builder/com.nokia.carbide.cdt.builder/.settings/org.eclipse.jdt.core.prefs
--- a/builder/com.nokia.carbide.cdt.builder/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Thu Jul 31 13:06:24 CDT 2008
+#Sat Sep 18 15:57:22 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF
--- a/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -29,4 +29,4 @@
  com.nokia.carbide.cdt.internal.api.builder,
  com.nokia.carbide.cdt.internal.api.builder.ui,
  com.nokia.carbide.cdt.internal.builder;x-friends:="com.nokia.carbide.cpp.builder.utils"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 builder/com.nokia.carbide.cpp.builder.utils/.classpath
--- a/builder/com.nokia.carbide.cpp.builder.utils/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 builder/com.nokia.carbide.cpp.builder.utils/META-INF/MANIFEST.MF
--- a/builder/com.nokia.carbide.cpp.builder.utils/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -8,16 +8,15 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.core.resources,
  com.nokia.carbide.cdt.builder,
  org.eclipse.cdt.core,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.cpp.utils.core,
  com.nokia.cpp.utils.ui,
  org.eclipse.ui.ide,
- org.eclipse.jface.text,
  com.nokia.carbide.cpp.project.ui,
  com.nokia.carbide.cpp.epoc.engine,
  org.eclipse.cdt.ui,
  org.eclipse.core.expressions
 Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/META-INF/MANIFEST.MF
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -8,7 +8,7 @@
 Require-Bundle: org.eclipse.cdt.core,
  org.eclipse.core.runtime,
  com.nokia.carbide.remoteConnections
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/jna.jar,
@@ -16,5 +16,4 @@
  pccsPlugin.jar
 Export-Package: com.nokia.carbide.remoteconnections.discovery.pccs.agent,
  com.nokia.carbide.remoteconnections.discovery.pccs.pccsnative
-Import-Package: com.nokia.cpp.internal.api.utils.core,
- com.nokia.cpp.internal.api.utils.ui
+Import-Package: com.nokia.cpp.internal.api.utils.core
diff -r 683a3be65e07 -r deb27f632e39 connectivity/com.nokia.tcf/.classpath
--- a/connectivity/com.nokia.tcf/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/connectivity/com.nokia.tcf/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 connectivity/com.nokia.tcf/.settings/org.eclipse.jdt.core.prefs
--- a/connectivity/com.nokia.tcf/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/connectivity/com.nokia.tcf/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Mon Sep 29 14:53:55 CDT 2008
+#Sat Sep 18 15:57:23 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 connectivity/com.nokia.tcf/META-INF/MANIFEST.MF
--- a/connectivity/com.nokia.tcf/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/connectivity/com.nokia.tcf/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -10,4 +10,4 @@
 Export-Package: com.nokia.tcf.api,
  com.nokia.tcf.impl;x-friends:="com.nokia.tcf.test,com.nokia.tcf.legacy,com.nokia.carbide.cpp.edc.agent.trk"
 Bundle-ClassPath: tcfPlugin.jar
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.bugreport/.classpath
--- a/core/com.nokia.carbide.bugreport/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.bugreport/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-httpclient-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.bugreport/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.bugreport/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.bugreport/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -19,4 +19,4 @@
  .,
  lib/commons-logging-1.1.jar,
  lib/commons-codec-1.3.jar
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.compiler.doc.user/build.properties
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/build.properties	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/build.properties	Sat Sep 18 16:18:58 2010 -0700
@@ -14,8 +14,7 @@
                cpp_embTOC.xml,\
                errorsTOC.xml,\
                META-INF/,\
-               book.css,\
-               index/
+               book.css
 src.includes = c_behaviorTOC.xml,\
                c_compilerTOC.xml,\
                cmd_lineTOC.xml,\
@@ -23,14 +22,12 @@
                cpp_behaviorTOC.xml,\
                cpp_compilerTOC.xml,\
                cpp_embTOC.xml,\
-               META-INF/,\
                html/,\
                introductionTOC.xml,\
                performanceTOC.xml,\
                symbolsTOC.xml,\
                pragmas_x86TOC.xml,\
                pragmasTOC.xml,\
-               plugin.xml,\
                errorsTOC.xml,\
                book.css
 
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -5,6 +5,5 @@
 Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help,
- org.eclipse.ui.cheatsheets
 Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.doc.user/build.properties
--- a/core/com.nokia.carbide.cpp.doc.user/build.properties	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/build.properties	Sat Sep 18 16:18:58 2010 -0700
@@ -3,9 +3,9 @@
                intro/,\
                tocCarbide.xml,\
                plugin.xml,\
-               html/
+               html/,\
+               META-INF/
 src.includes = tocCarbide.xml,\
-               plugin.xml,\
                intro/,\
                html/,\
                debuggerTOC.xml,\
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.featureTracker/.classpath
--- a/core/com.nokia.carbide.cpp.featureTracker/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.featureTracker/.settings/org.eclipse.jdt.core.prefs
--- a/core/com.nokia.carbide.cpp.featureTracker/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Mon Feb 09 14:56:44 CST 2009
+#Sat Sep 18 15:57:22 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.featureTracker/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.featureTracker/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -6,7 +6,7 @@
 Bundle-Activator: com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.api.featureTracker,
  com.nokia.carbide.cpp.internal.featureTracker
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.oss/.classpath
--- a/core/com.nokia.carbide.cpp.oss/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.oss/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.oss/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.oss/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.oss/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -5,3 +5,4 @@
 Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: Nokia
 Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.oss/build.properties
--- a/core/com.nokia.carbide.cpp.oss/build.properties	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.oss/build.properties	Sat Sep 18 16:18:58 2010 -0700
@@ -1,5 +1,4 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
+bin.includes = META-INF/,\
                binutils-2.15.tar.gz,\
                omniORB-4.0.4.zip,\
                rhino1_6R2.zip
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.sdk.ui/.classpath
--- a/core/com.nokia.carbide.cpp.sdk.ui/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.sdk.ui/.settings/org.eclipse.jdt.core.prefs
--- a/core/com.nokia.carbide.cpp.sdk.ui/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Thu Jul 31 13:47:53 CDT 2008
+#Sat Sep 18 15:57:22 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.sdk.ui/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.sdk.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -6,9 +6,7 @@
 Bundle-Activator: com.nokia.carbide.cpp.sdk.ui.SDKUIPlugin
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
+Require-Bundle: org.eclipse.core.runtime,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.cpp.ui,
  com.nokia.carbide.templatewizard,
@@ -19,4 +17,4 @@
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.api.sdk.ui,
  com.nokia.carbide.cpp.sdk.ui.shared
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.sysdoc.hover.dependencies/.classpath
--- a/core/com.nokia.carbide.cpp.sysdoc.hover.dependencies/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover.dependencies/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.sysdoc.hover.dependencies/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.sysdoc.hover.dependencies/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover.dependencies/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: com.nokia.carbide.cpp.sysdoc.hover.dependencies;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Nokia
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
  org.eclipse.ui;bundle-version="3.4.1",
  org.eclipse.jface.text;bundle-version="3.4.1"
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.sysdoc.hover/.classpath
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.sysdoc.hover/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -11,16 +11,9 @@
  org.eclipse.cdt.core;bundle-version="5.0.1",
  org.eclipse.core.filesystem;bundle-version="1.2.0",
  com.nokia.carbide.cpp.sdk.core;bundle-version="2.0.0",
- com.nokia.carbide.cpp.sdk.ui;bundle-version="1.4.0",
- com.nokia.carbide.cdt.builder;bundle-version="2.0.0",
- org.eclipse.core.resources;bundle-version="3.4.1",
- org.eclipse.ui.editors;bundle-version="3.4.0",
- org.eclipse.ui.ide;bundle-version="3.4.1",
- org.eclipse.help;bundle-version="3.3.101",
- org.eclipse.equinox.http.registry,
  javax.servlet;bundle-version="2.4.0",
  com.nokia.carbide.cpp.sysdoc.hover.dependencies;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Nokia
 Bundle-ClassPath: library.jar,
  .
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.ui/.classpath
--- a/core/com.nokia.carbide.cpp.ui/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -9,9 +9,7 @@
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  com.nokia.cpp.utils.core,
- com.nokia.cpp.utils.ui,
  com.nokia.sdt.utils,
- org.eclipse.core.resources,
  org.eclipse.ui.forms,
  com.nokia.carbide.cpp.featureTracker;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
@@ -22,3 +20,4 @@
    com.nokia.sdt.symbian.ui",
  com.nokia.carbide.cpp.ui,
  com.nokia.carbide.cpp.ui.images
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp/.classpath
--- a/core/com.nokia.carbide.cpp/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -8,15 +8,13 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.ui.intro,
- org.eclipse.ui.cheatsheets,
  org.eclipse.core.resources,
  org.eclipse.core.filesystem,
  org.eclipse.ui.ide,
- org.eclipse.cdt.core,
  com.nokia.carbide.discovery.ui;bundle-version="3.0.0",
  org.eclipse.equinox.p2.ui;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp,
  com.nokia.carbide.cpp.logging
 Service-Component: component.xml
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -19,8 +19,6 @@
  org.eclipse.equinox.p2.repository;bundle-version="2.0.0",
  org.eclipse.equinox.p2.engine;bundle-version="2.0.0",
  org.eclipse.equinox.p2.director;bundle-version="2.0.0",
- org.eclipse.jface.text,
- org.eclipse.ui.editors,
  org.eclipse.ui.forms;bundle-version="3.5.0",
  com.nokia.cpp.utils.ui;bundle-version="1.0.0",
  com.nokia.cpp.utils.core;bundle-version="1.0.0",
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.discovery.ui/build.properties
--- a/core/com.nokia.carbide.discovery.ui/build.properties	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/build.properties	Sat Sep 18 16:18:58 2010 -0700
@@ -5,5 +5,4 @@
                .,\
                icons/,\
                contexts.xml,\
-               OSGI-INF/l10n/bundle.properties,\
                plugin.properties
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.sdt.utils/.classpath
--- a/core/com.nokia.carbide.sdt.utils/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.sdt.utils/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry sourcepath="libs/rhino1_6R2/src" kind="lib" path="libs/rhino1_6R2/js.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-awt-util.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/batik.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-bridge.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-css.jar"/>
-	<classpathentry sourcepath="libs/batik-1.6/batik-src-1.6.zip" kind="lib" path="libs/batik-1.6/lib/batik-dom.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-ext.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-extension.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-gui-util.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-gvt.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-parser.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-script.jar"/>
-	<classpathentry sourcepath="libs/batik-1.6/batik-src-1.6.zip" kind="lib" path="libs/batik-1.6/lib/batik-svg-dom.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-svggen.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-swing.jar"/>
-	<classpathentry sourcepath="libs/batik-1.6/batik-src-1.6.zip" kind="lib" path="libs/batik-1.6/lib/batik-transcoder.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-util.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-xml.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/pdf-transcoder.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/xerces_2_5_0.jar"/>
-	<classpathentry kind="lib" path="libs/batik-1.6/lib/xml-apis.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="libs/rhino1_6R2/js.jar" sourcepath="libs/rhino1_6R2/src"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-awt-util.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/batik.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-bridge.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-css.jar"/>
+	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-dom.jar" sourcepath="libs/batik-1.6/batik-src-1.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-ext.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-extension.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-gui-util.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-gvt.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-parser.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-script.jar"/>
+	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-svg-dom.jar" sourcepath="libs/batik-1.6/batik-src-1.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-svggen.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-swing.jar"/>
+	<classpathentry kind="lib" path="libs/batik-1.6/lib/batik-transcoder.jar" sourcepath="libs/batik-1.6/batik-src-1.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-util.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/batik-xml.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/pdf-transcoder.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/batik-1.6/lib/xerces_2_5_0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.sdt.utils/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.sdt.utils/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.sdt.utils/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -27,11 +27,8 @@
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
  org.eclipse.ui,
  org.eclipse.core.filebuffers,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
  com.nokia.cpp.utils.core,
  com.nokia.cpp.utils.ui
 Bundle-ActivationPolicy: lazy
@@ -40,4 +37,5 @@
  org.mozilla.javascript,
  org.mozilla.javascript.tools
 Bundle-ManifestVersion: 2
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.sdt.utils/build.properties
--- a/core/com.nokia.carbide.sdt.utils/build.properties	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.sdt.utils/build.properties	Sat Sep 18 16:18:58 2010 -0700
@@ -32,9 +32,5 @@
                libs/batik-1.6/lib/xerces_2_5_0.jar,\
                libs/batik-1.6/lib/xml-apis.jar
 src.includes = libs/rhino1_6R2/js.jar,\
-               src/,\
-               build.properties,\
-               META-INF/,\
-               libs/,\
-               .classpath
+               libs/
 
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.search.system/.classpath
--- a/core/com.nokia.carbide.search.system/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.search.system/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.search.system/.settings/org.eclipse.jdt.core.prefs
--- a/core/com.nokia.carbide.search.system/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.search.system/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,8 +1,9 @@
-#Thu Oct 25 14:02:07 CDT 2007
+#Sat Sep 18 15:57:22 PDT 2010
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.search.system/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.search.system/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.search.system/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -21,3 +21,4 @@
  org.eclipse.search,org.eclipse.core.filesystem,org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)",org.eclipse.ui.workbench.texteditor;bundle-version="[3.3.0,4.0.0)",org.eclipse.jface.text;bundle-version="[3.3.0,4.0.0)",org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"
 Import-Package: com.ibm.icu.text
 Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.templatewizard/.classpath
--- a/core/com.nokia.carbide.templatewizard/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.templatewizard/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -23,4 +23,4 @@
  com.nokia.carbide.templatewizard,
  com.nokia.carbide.templatewizard.process,
  com.nokia.carbide.templatewizard.processes
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.updater/.classpath
--- a/core/com.nokia.carbide.updater/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.updater/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.updater/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.updater/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.updater/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -8,7 +8,6 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.core.resources,
  com.nokia.cpp.utils.core,
  com.nokia.cpp.utils.ui,
  org.eclipse.ltk.core.refactoring,
@@ -18,3 +17,4 @@
 Export-Package: com.nokia.carbide.internal.api.updater,
  com.nokia.carbide.updater,
  com.nokia.carbide.updater.extension
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.win32.utils/.classpath
--- a/core/com.nokia.carbide.win32.utils/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.win32.utils/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.carbide.win32.utils/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.win32.utils/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.carbide.win32.utils/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -8,7 +8,6 @@
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.core.expressions;bundle-version="3.4.100"
+ org.eclipse.cdt.core
 Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.cpp.utils.core/.classpath
--- a/core/com.nokia.cpp.utils.core/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.cpp.utils.core/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.cpp.utils.core/.settings/org.eclipse.jdt.core.prefs
--- a/core/com.nokia.cpp.utils.core/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.cpp.utils.core/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Fri Oct 17 08:40:13 CDT 2008
+#Sat Sep 18 15:57:23 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.cpp.utils.core/META-INF/MANIFEST.MF
--- a/core/com.nokia.cpp.utils.core/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.cpp.utils.core/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -6,12 +6,11 @@
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.core.filebuffers,
  org.eclipse.jface,
  org.eclipse.core.filesystem;bundle-version="1.2.0",
  org.eclipse.core.net;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.cpp.internal.api.utils.core
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.cpp.utils.core/build.properties
--- a/core/com.nokia.cpp.utils.core/build.properties	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.cpp.utils.core/build.properties	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = .,\
-				               META-INF/
-src.includes = src/,\
-               META-INF/
+			   META-INF/
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.cpp.utils.ui/.classpath
--- a/core/com.nokia.cpp.utils.ui/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.cpp.utils.ui/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.cpp.utils.ui/.settings/org.eclipse.jdt.core.prefs
--- a/core/com.nokia.cpp.utils.ui/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.cpp.utils.ui/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Fri Oct 17 08:40:12 CDT 2008
+#Sat Sep 18 15:57:23 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.cpp.utils.ui/META-INF/MANIFEST.MF
--- a/core/com.nokia.cpp.utils.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.cpp.utils.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -9,9 +9,8 @@
  org.eclipse.core.runtime,
  org.eclipse.ui.ide,
  com.nokia.cpp.utils.core,
- org.eclipse.ui.forms,
- org.eclipse.core.resources
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ org.eclipse.ui.forms
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.cpp.internal.api.utils.ui,
  com.nokia.cpp.internal.api.utils.ui.editor
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 core/com.nokia.cpp.utils.ui/build.properties
--- a/core/com.nokia.cpp.utils.ui/build.properties	Sat Sep 18 16:25:07 2010 -0500
+++ b/core/com.nokia.cpp.utils.ui/build.properties	Sat Sep 18 16:18:58 2010 -0700
@@ -2,5 +2,3 @@
 output.. = bin/
 bin.includes = .,\
 		               META-INF/
-src.includes = META-INF/,\
-               src/
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.carbide.trk.support/.classpath
--- a/debuggercdi/com.nokia.carbide.trk.support/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<attributes>
 			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.nokia.carbide.trk.support/Native/GetTRKVersion/Release"/>
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF
--- a/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -10,8 +10,7 @@
  com.nokia.carbide.remoteConnections,
  com.nokia.cpp.utils.core,
  com.nokia.cpp.utils.ui;bundle-version="1.0.0",
- com.nokia.tcf,
- com.nokia.carbide.cpp.featureTracker;bundle-version="1.0.0"
+ com.nokia.tcf
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.nokia.carbide.trk.support.Activator
 Bundle-ClassPath: trksupport.jar,
@@ -20,4 +19,4 @@
  lib/commons-logging-1.1.jar
 Export-Package: com.nokia.carbide.trk.support.connection;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.carbide.cpp.edc",
  com.nokia.carbide.trk.support.service;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.carbide.cpp.edc"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.carbide.trk.support/build.properties
--- a/debuggercdi/com.nokia.carbide.trk.support/build.properties	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/build.properties	Sat Sep 18 16:18:58 2010 -0700
@@ -1,8 +1,6 @@
 bin.includes = plugin.xml,\
-		               META-INF/,\
-               trk/,\
+               META-INF/,\
                icons/,\
-               os/win32/x86/GetTRKVersion.dll,\
                plugin.properties,\
                lib/commons-codec-1.3.jar,\
                lib/commons-httpclient-3.1.jar,\
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.cdt.debug.common/.classpath
--- a/debuggercdi/com.nokia.cdt.debug.common/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.common/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.cdt.debug.common/.settings/org.eclipse.jdt.core.prefs
--- a/debuggercdi/com.nokia.cdt.debug.common/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.common/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,8 +1,8 @@
-#Tue Mar 09 15:31:12 CST 2010
+#Sat Sep 18 15:57:23 PDT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF
--- a/debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -10,10 +10,9 @@
  org.eclipse.cdt.debug.core;bundle-version="7.0.0",
  org.eclipse.debug.core;bundle-version="3.6.0",
  com.nokia.carbide.cdt.builder;bundle-version="2.0.0",
- org.eclipse.cdt.debug.edc,
  com.nokia.carbide.remoteConnections;bundle-version="1.4.0",
  org.eclipse.core.filesystem;bundle-version="1.3.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.cdt.debug.common.internal.api,
  com.nokia.cdt.debug.common.internal.executables,
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.cdt.debug.cw.symbian/.classpath
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -6,27 +6,19 @@
 Bundle-Activator: com.nokia.cdt.debug.cw.symbian.SymbianPlugin
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.cdt.ui,
- org.eclipse.ui,
+Require-Bundle: org.eclipse.cdt.ui,
  org.eclipse.cdt.core,
  org.eclipse.debug.ui,
- org.eclipse.debug.core,
  org.eclipse.cdt.debug.ui,
  org.eclipse.cdt.debug.core,
  org.eclipse.core.runtime,
  com.freescale.cdt.debug.cw.core,
  com.freescale.cdt.debug.cw.core.ui,
  org.eclipse.ui.console,
- com.nokia.carbide.cpp.support,
  com.nokia.carbide.cdt.builder,
- org.eclipse.help,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.cpp.ui,
- org.eclipse.jface.text,
  com.nokia.cpp.utils.core,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.filesystem,
  com.nokia.carbide.remoteConnections
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.cdt.debug.cw.symbian;
@@ -54,3 +46,4 @@
    com.nokia.carbide.automation.utils,
    com.nokia.cdt.debug.cw.symbian.tests,
    com.nokia.cdt.debug.launch"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.cdt.debug.launch/.classpath
--- a/debuggercdi/com.nokia.cdt.debug.launch/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 debuggercdi/com.nokia.cdt.debug.launch/META-INF/MANIFEST.MF
--- a/debuggercdi/com.nokia.cdt.debug.launch/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -33,4 +33,5 @@
  com.nokia.cdt.internal.debug.launch.ui,
  com.nokia.cdt.internal.debug.launch.wizard
 Bundle-ClassPath: .
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 
diff -r 683a3be65e07 -r deb27f632e39 project/com.nokia.carbide.cpp.epoc.engine/.classpath
--- a/project/com.nokia.carbide.cpp.epoc.engine/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="com/nokia/carbide/cpp/epoc/engine/dom/obsolete/|com/nokia/carbide/cpp/epoc/engine/internal/ChangeTrackingList.java|com/nokia/carbide/cpp/epoc/engine/internal/DirtyTrackingArrayList.java|com/nokia/carbide/cpp/epoc/engine/internal/DirtyTrackingHashMap.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 project/com.nokia.carbide.cpp.epoc.engine/.settings/org.eclipse.jdt.core.prefs
--- a/project/com.nokia.carbide.cpp.epoc.engine/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Tue Apr 01 13:54:27 CDT 2008
+#Sat Sep 18 15:57:22 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 project/com.nokia.carbide.cpp.epoc.engine/META-INF/MANIFEST.MF
--- a/project/com.nokia.carbide.cpp.epoc.engine/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -8,8 +8,6 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.core,
  org.eclipse.cdt.make.core;visibility:=reexport,
- org.eclipse.core.filebuffers,
- org.eclipse.core.resources,
  org.eclipse.jface.text;visibility:=reexport,
  com.nokia.cpp.utils.core,
  com.nokia.sdt.utils,
@@ -47,4 +45,4 @@
  com.nokia.carbide.internal.cpp.epoc.engine.parser.mmp;x-friends:="com.nokia.carbide.cpp.epoc.engine.tests",
  com.nokia.carbide.internal.cpp.epoc.engine.parser.pkg,
  com.nokia.carbide.internal.cpp.epoc.engine.preprocessor;x-friends:="com.nokia.carbide.cpp.epoc.engine.tests,com.nokia.sdt.sourcegen"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 project/com.nokia.carbide.cpp.project.core/.classpath
--- a/project/com.nokia.carbide.cpp.project.core/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.core/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 project/com.nokia.carbide.cpp.project.core/META-INF/MANIFEST.MF
--- a/project/com.nokia.carbide.cpp.project.core/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.core/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -6,13 +6,10 @@
 Bundle-Activator: com.nokia.carbide.cpp.project.core.ProjectCorePlugin
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.swt,
  org.eclipse.ui.workbench,
  org.eclipse.cdt.core,
  com.nokia.carbide.cdt.builder,
  com.nokia.cpp.utils.core,
- com.nokia.sdt.utils,
  com.nokia.carbide.cpp.epoc.engine,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.templatewizard,
@@ -22,4 +19,4 @@
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.api.project.core,
  com.nokia.carbide.cpp.project.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 project/com.nokia.carbide.cpp.project.ui/.classpath
--- a/project/com.nokia.carbide.cpp.project.ui/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF
--- a/project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -9,8 +9,6 @@
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.jface.text,
  org.eclipse.ui.editors,
  org.eclipse.ui.workbench.texteditor,
  com.nokia.carbide.cpp.project.core,
@@ -50,3 +48,4 @@
  com.nokia.carbide.cpp.project.ui.processes,
  com.nokia.carbide.cpp.project.ui.sharedui,
  com.nokia.carbide.cpp.project.ui.utils
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 qt/com.nokia.carbide.cpp.qt.core/.classpath
--- a/qt/com.nokia.carbide.cpp.qt.core/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.core/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 qt/com.nokia.carbide.cpp.qt.core/.settings/org.eclipse.jdt.core.prefs
--- a/qt/com.nokia.carbide.cpp.qt.core/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.core/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,9 +1,9 @@
-#Wed Feb 10 21:25:23 CST 2010
+#Sat Sep 18 15:57:22 PDT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -71,4 +71,4 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF
--- a/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -11,6 +11,6 @@
  com.nokia.carbide.cpp.sdk.ui,
  com.nokia.cpp.utils.core;bundle-version="1.0.0",
  com.trolltech.qtcppproject;bundle-version="1.6.0";resolution:=optional
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.qt.core
diff -r 683a3be65e07 -r deb27f632e39 qt/com.nokia.carbide.cpp.qt.ui/.classpath
--- a/qt/com.nokia.carbide.cpp.qt.ui/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff -r 683a3be65e07 -r deb27f632e39 qt/com.nokia.carbide.cpp.qt.ui/.settings/org.eclipse.jdt.core.prefs
--- a/qt/com.nokia.carbide.cpp.qt.ui/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Thu Jul 24 13:27:57 CDT 2008
+#Sat Sep 18 15:57:22 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF
--- a/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -8,11 +8,6 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.cdt.ui,
- org.eclipse.search,
- org.eclipse.ui.navigator.resources,
- org.eclipse.ui.console,
- org.eclipse.core.resources,
  com.nokia.carbide.cpp.project.ui,
  com.nokia.carbide.cpp.qt.core,
  com.nokia.carbide.cpp.sdk.core,
@@ -26,5 +21,5 @@
  com.nokia.cpp.utils.ui,
  com.nokia.cpp.utils.core;bundle-version="1.0.0",
  com.nokia.carbide.cpp.featureTracker;bundle-version="3.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff -r 683a3be65e07 -r deb27f632e39 qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileSelectionPage.java
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileSelectionPage.java	Sat Sep 18 16:25:07 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileSelectionPage.java	Sat Sep 18 16:18:58 2010 -0700
@@ -34,7 +34,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
diff -r 683a3be65e07 -r deb27f632e39 templates/com.nokia.carbide.cpp.qt.templates/.classpath
--- a/templates/com.nokia.carbide.cpp.qt.templates/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 templates/com.nokia.carbide.cpp.qt.templates/.settings/org.eclipse.jdt.core.prefs
--- a/templates/com.nokia.carbide.cpp.qt.templates/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:25:07 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/.settings/org.eclipse.jdt.core.prefs	Sat Sep 18 16:18:58 2010 -0700
@@ -1,7 +1,8 @@
-#Mon Jul 28 15:53:32 CDT 2008
+#Sat Sep 18 15:57:22 PDT 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff -r 683a3be65e07 -r deb27f632e39 templates/com.nokia.carbide.cpp.qt.templates/META-INF/MANIFEST.MF
--- a/templates/com.nokia.carbide.cpp.qt.templates/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -5,4 +5,4 @@
 Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 683a3be65e07 -r deb27f632e39 templates/com.nokia.carbide.cpp.templates/.classpath
--- a/templates/com.nokia.carbide.cpp.templates/.classpath	Sat Sep 18 16:25:07 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/.classpath	Sat Sep 18 16:18:58 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 683a3be65e07 -r deb27f632e39 templates/com.nokia.carbide.cpp.templates/META-INF/MANIFEST.MF
--- a/templates/com.nokia.carbide.cpp.templates/META-INF/MANIFEST.MF	Sat Sep 18 16:25:07 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/META-INF/MANIFEST.MF	Sat Sep 18 16:18:58 2010 -0700
@@ -6,3 +6,4 @@
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6