# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1268359258 28800
# Node ID a691cdb6c78af7f2245690916100da53e9347ffb
# Parent  38f012067872b59ab3a845cebe738ce8cd71ebad
Bugs 2170 and 2046

diff -r 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WRTKit/.classpath
--- a/org.symbian.tools.wrttools.doc.WRTKit/.classpath	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WRTKit/.classpath	Thu Mar 11 18:00:58 2010 -0800
@@ -2,7 +2,5 @@
 <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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/s60.nokia.com.WRTKit_1.0.1.jar" sourcepath="lib/s60.nokia.com.WRTKit_1.0.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WRTKit/META-INF/MANIFEST.MF
--- a/org.symbian.tools.wrttools.doc.WRTKit/META-INF/MANIFEST.MF	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WRTKit/META-INF/MANIFEST.MF	Thu Mar 11 18:00:58 2010 -0800
@@ -3,7 +3,6 @@
 Bundle-Name: WRTKit Documentation
 Bundle-SymbolicName: org.symbian.tools.wrttools.doc.WRTKit;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.symbian.tools.wrttools.doc.WRTKit.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
diff -r 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WRTKit/build.properties
--- a/org.symbian.tools.wrttools.doc.WRTKit/build.properties	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WRTKit/build.properties	Thu Mar 11 18:00:58 2010 -0800
@@ -1,5 +1,8 @@
-source.. = src/
+source.. = 
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               WRT_Doc.xml,\
+               toc.xml,\
+               html/
diff -r 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WRTKit/lib/s60.nokia.com.WRTKit_1.0.1.jar
Binary file org.symbian.tools.wrttools.doc.WRTKit/lib/s60.nokia.com.WRTKit_1.0.1.jar has changed
diff -r 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WRTKit/plugin.xml
--- a/org.symbian.tools.wrttools.doc.WRTKit/plugin.xml	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WRTKit/plugin.xml	Thu Mar 11 18:00:58 2010 -0800
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
+<?eclipse version="3.0"?>
 <plugin>
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
+  <extension point="org.eclipse.help.toc">
+    <toc file="toc.xml" primary="true" />
+    <toc file="WRT_Doc.xml" />
    </extension>
-   <extension
-         point="org.eclipse.ui.helpSupport">
-   </extension>
-
 </plugin>
diff -r 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WRTKit/src/org/symbian/tools/wrttools/doc/WRTKit/Activator.java
--- a/org.symbian.tools.wrttools.doc.WRTKit/src/org/symbian/tools/wrttools/doc/WRTKit/Activator.java	Thu Mar 11 16:45:18 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-package org.symbian.tools.wrttools.doc.WRTKit;
-
-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.WRTKitGuide";
-
-	// 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 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WebDeveloper/.classpath
--- a/org.symbian.tools.wrttools.doc.WebDeveloper/.classpath	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/.classpath	Thu Mar 11 18:00:58 2010 -0800
@@ -2,7 +2,5 @@
 <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.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 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WebDeveloper/META-INF/MANIFEST.MF
--- a/org.symbian.tools.wrttools.doc.WebDeveloper/META-INF/MANIFEST.MF	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/META-INF/MANIFEST.MF	Thu Mar 11 18:00:58 2010 -0800
@@ -4,7 +4,6 @@
 Bundle-Name: Web Developer's Library 1.4
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.symbian.tools.wrttools.doc.WebDeveloper;singleton:=true
-Bundle-Activator: org.symbian.tools.wrttools.doc.WebDeveloper.Activator 
 Import-Package: org.eclipse.core.runtime,
  org.eclipse.ui.plugin,
  org.osgi.framework
diff -r 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WebDeveloper/build.properties
--- a/org.symbian.tools.wrttools.doc.WebDeveloper/build.properties	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/build.properties	Thu Mar 11 18:00:58 2010 -0800
@@ -1,5 +1,7 @@
-source.. = src/
+source.. = 
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               html/,\
+               toc.xml
diff -r 38f012067872 -r a691cdb6c78a 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 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WebDeveloper/plugin.xml
--- a/org.symbian.tools.wrttools.doc.WebDeveloper/plugin.xml	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/plugin.xml	Thu Mar 11 18:00:58 2010 -0800
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?eclipse version="3.4"?>
+<?eclipse version="3.0"?>
 <plugin>
 	<extension point="org.eclipse.help.toc">
 		<toc file="toc.xml" primary="true"/>
 	</extension>
-	<extension
-         point="org.eclipse.ui.helpSupport">
-    </extension>
 </plugin>
\ No newline at end of file
diff -r 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WebDeveloper/src/org/symbian/tools/wrttools/doc/WebDeveloper/Activator.java
--- a/org.symbian.tools.wrttools.doc.WebDeveloper/src/org/symbian/tools/wrttools/doc/WebDeveloper/Activator.java	Thu Mar 11 16:45:18 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-package org.symbian.tools.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 38f012067872 -r a691cdb6c78a org.symbian.tools.wrttools.doc.WebDeveloper/toc.xml
--- a/org.symbian.tools.wrttools.doc.WebDeveloper/toc.xml	Thu Mar 11 16:45:18 2010 -0800
+++ b/org.symbian.tools.wrttools.doc.WebDeveloper/toc.xml	Thu Mar 11 18:00:58 2010 -0800
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-<toc label="Web Developer's Library 1.4" topic="GUID-4D13AF3F-4733-44E7-996F-F27A11C9D6BF_cover.html">
+<toc label="Web Developer's Library 1.4" topic="html/GUID-4D13AF3F-4733-44E7-996F-F27A11C9D6BF_cover.html">
 <topic href="html/GUID-E0223DD8-CB25-4990-A369-F2B0A67193B2.html" label="Legal notice"/>
 <topic href="html/GUID-43F2AB31-124B-4654-8AB0-AEEBB6E0447B.html" label="Change history"/>
 <topic href="html/GUID-56D42F03-F3C2-4977-AC32-772760AE1D4D.html" label="Guide to Web Developer's Library">