# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1266960256 28800
# Node ID 0e1e53a7906bbecbd751e027fd5a613ee960f119
# Parent  30ef4c917204d406fef077434e00627b89a40c1f# Parent  68a2eac79db202f2089a940765970918d1b3e685
Heads merge

diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools.doc.WebDeveloper/.classpath
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/.classpath	Tue Feb 23 13:24:16 2010 -0800
@@ -0,0 +1,8 @@
+<?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 exported="true" kind="lib" path="lib/Web_Developers_Library_1.4.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools.doc.WebDeveloper/.project
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/.project	Tue Feb 23 13:24:16 2010 -0800
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.symbian.tools.wrttools.doc.WebDeveloper</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools.doc.WebDeveloper/.settings/org.eclipse.jdt.core.prefs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/.settings/org.eclipse.jdt.core.prefs	Tue Feb 23 13:24:16 2010 -0800
@@ -0,0 +1,8 @@
+#Fri Feb 19 11:36:03 PST 2010
+eclipse.preferences.version=1
+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.6
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools.doc.WebDeveloper/META-INF/MANIFEST.MF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/META-INF/MANIFEST.MF	Tue Feb 23 13:24:16 2010 -0800
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: WebDeveloper
+Bundle-SymbolicName: org.symbian.tools.wrttools.doc.WebDeveloper
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.symbian.wrttools.doc.webdeveloper.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools.doc.WebDeveloper/build.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/build.properties	Tue Feb 23 13:24:16 2010 -0800
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools.doc.WebDeveloper/lib/Web_Developers_Library_1.4.jar
Binary file org.symbian.tools.wrttools.doc.WebDeveloper/lib/Web_Developers_Library_1.4.jar has changed
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools.doc.WebDeveloper/src/org/symbian/wrttools/doc/webdeveloper/Activator.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/src/org/symbian/wrttools/doc/webdeveloper/Activator.java	Tue Feb 23 13:24:16 2010 -0800
@@ -0,0 +1,50 @@
+package org.symbian.wrttools.doc.webdeveloper;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.symbian.tools.wrttools.doc.WebDeveloper";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/Activator.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/Activator.java	Tue Feb 23 13:23:31 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/Activator.java	Tue Feb 23 13:24:16 2010 -0800
@@ -73,7 +73,7 @@
 		plugin = null;
 		super.stop(context);
 	}
-	
+/*	
 	public void startBluetoothOperation() {
 		IPreferenceStore prefStore = getPreferenceStore();
 		if (prefStore.getBoolean(PreferenceConstants.DEBUG_ENABLED))
@@ -83,6 +83,7 @@
 	public void stopBluetoothOperation() {
 		enableBlueCoveDiagnostics(false);
 	}
+*/
 	
 	/** Toggle BlueCove logging
 	 */
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deploy/DeployPreferencePage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deploy/DeployPreferencePage.java	Tue Feb 23 13:23:31 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deploy/DeployPreferencePage.java	Tue Feb 23 13:24:16 2010 -0800
@@ -328,7 +328,10 @@
 				boolean debugEnabled = debugButton.getSelection();
 				prefOkStore.setValue(PreferenceConstants.DEBUG_ENABLED, 
 						Boolean.valueOf(debugEnabled).toString());
+				
+/* TODO -- do not enable blueCove diagnostics
 				Activator.enableBlueCoveDiagnostics(debugEnabled);
+*/
 	
 				boolean res = super.performOk();
 				return res;
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.wrttools.doc.WRTKit/.project
--- a/org.symbian.wrttools.doc.WRTKit/.project	Tue Feb 23 13:23:31 2010 -0800
+++ b/org.symbian.wrttools.doc.WRTKit/.project	Tue Feb 23 13:24:16 2010 -0800
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.symbian.wrttools.doc.WRTKit</name>
+	<name>org.symbian.tools.wrttools.doc.WRTKit</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff -r 30ef4c917204 -r 0e1e53a7906b org.symbian.wrttools.doc.WRTKit/META-INF/MANIFEST.MF
--- a/org.symbian.wrttools.doc.WRTKit/META-INF/MANIFEST.MF	Tue Feb 23 13:23:31 2010 -0800
+++ b/org.symbian.wrttools.doc.WRTKit/META-INF/MANIFEST.MF	Tue Feb 23 13:24:16 2010 -0800
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WRTKit
-Bundle-SymbolicName: org.symbian.wrttools.doc.WRTKit
+Bundle-SymbolicName: org.symbian.tools.wrttools.doc.WRTKit
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.symbian.wrttools.lib.wrtkit.Activator
 Require-Bundle: org.eclipse.ui,