--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/http/WorkspaceResourcesServlet.java	Mon Feb 01 13:26:14 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/http/WorkspaceResourcesServlet.java	Mon Feb 01 13:39:41 2010 -0800
@@ -132,7 +132,7 @@
 
 	private String readFile(IProject project, String fileName)
 			throws CoreException, UnsupportedEncodingException, IOException {
-		IFile file = project.getFile(fileName);
+		IFile file = getFile(project, fileName);
 		if (file.isAccessible()) {
 			InputStream contents = file.getContents();
 			final BufferedReader reader = new BufferedReader(
@@ -152,6 +152,19 @@
 		return null;
 	}
 
+	private IFile getFile(IProject project, String fileName) throws CoreException {
+		String n = fileName.toLowerCase();
+		IResource[] members = project.members();
+		for (IResource iResource : members) {
+			if (iResource.getType() == IResource.FILE
+					&& n.equals(iResource.getName().toLowerCase())
+					&& iResource.isAccessible()) {
+				return (IFile) iResource;
+			}
+		}
+		return null;
+	}
+
 	private InputStream getPluginResourceStream(IPath path) throws IOException {
 		URL url = FileLocator.find(PreviewerPlugin.getDefault().getBundle(),
 				path, null);

--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/AbstractPreviewPage.java	Mon Feb 01 13:26:14 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/AbstractPreviewPage.java	Mon Feb 01 13:39:41 2010 -0800
@@ -170,5 +170,8 @@
 	public void setSelection(ISelection selection) {
 		// Do nothing
 	}
-	
+
+	public boolean isDisposed() {
+		return browser != null && browser.isDisposed();
+	}
 }

--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/IPreviewPage.java	Mon Feb 01 13:26:14 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/IPreviewPage.java	Mon Feb 01 13:39:41 2010 -0800
@@ -7,4 +7,5 @@
 
 public interface IPreviewPage extends IPageBookViewPage {
 	void process(Collection<IFile> files);
+	boolean isDisposed();
 }

--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java	Mon Feb 01 13:26:14 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java	Mon Feb 01 13:39:41 2010 -0800
@@ -107,7 +107,7 @@
 		IProject project = resource.getProject();
 		IPreviewPage page = projectToPage.get(project);
 
-		if (page == null) {
+		if (page == null || page.isDisposed()) {
 			page = createPreviewPage(project);
 			initPage(page);
 			page.createControl(getPageBook());

--- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch	Mon Feb 01 13:26:14 2010 -0800
+++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch	Mon Feb 01 13:39:41 2010 -0800
@@ -21,8 +21,8 @@
 <stringAttribute key="product" value="org.symbian.tools.wrttools.product.product"/>
 <stringAttribute key="productFile" value="\org.symbian.tools.wrttools.product\wrt-ide.product"/>
 <booleanAttribute key="restart" value="false"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.wst.common.ui@default:default,org.apache.axis@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.ui.intro@default:default,org.mozilla.xulrunner.win32.win32.x86@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.wst.standard.schemas@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.velocity@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.wst.internet.cache@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.apache.lucene.analysis@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.sat4j.pb@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,javax.xml.rpc@default:default,org.apache.commons.lang*2.3.0.v200803061910@default:default,javax.activation*1.1.0.v200906290531@default:default,org.apache.commons.codec@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.http.registry@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.workbench@default:default,org.eclipse.wst.validation@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.platform.doc.user@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.eclipse.wst.common.emf@default:default,org.apache.commons.logging@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.wst.doc.user@default:default,javax.xml.soap@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.objectweb.asm@default:default,org.eclipse.jsch.core@default:default,org.apache.commons.jxpath@default:default,org.eclipse.jem@default:default,org.apache.oro@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.rcp@default:default,org.eclipse.wst.command.env@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.ui.views.log@default:default,org.apache.xalan@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.wst.validation.ui@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.dstore.extra@default:default,javax.xml.bind*2.0.0.v20080604-1500@default:default,org.eclipse.wst.command.env.infopop@default:default,org.apache.xerces@default:default,org.eclipse.help@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.core.net@default:default,javax.transaction@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.dstore.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.ds@1:true,org.apache.commons.net@default:default,org.apache.commons.collections@default:default,org.eclipse.core.boot@default:default,org.eclipse.core.resources@default:default,org.jdom@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.publisher@default:default,org.apache.log4j@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.update.ui@default:default,org.mozilla.xulrunner@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.wst.command.env.doc.user@default:default,javax.servlet.jsp@default:default,org.mozilla.xpcom@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.eclipse.gef@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.command.env.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.help.appserver@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.wst.jsdt.doc@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.common.core@default:default,commonj.sdo@default:default,org.eclipse.team.ui@default:default,org.eclipse.compare.win32@default:default,org.eclipse.search@default:default,org.apache.bcel@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jsch.ui@default:default,javax.persistence@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.net@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.html.core@default:default,javax.wsdl*1.5.1.v200806030408@default:default,org.eclipse.team.cvs.ssh@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.mortbay.jetty.server@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.epp.package.jee@default:default,org.apache.commons.el@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.http.servlet@default:default,com.ibm.icu@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ui.views@default:default,javax.xml.stream@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jem.util@default:default,org.sat4j.core@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.cvs@default:default,org.apache.commons.httpclient@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.osgi.services@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.wtp.epp.package.jee.intro@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.help.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.debug.ui@default:default,org.apache.lucene@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.team.cvs.ui@default:default,org.apache.xml.serializer@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.internet.monitor.ui@default:default,javax.servlet@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.emf.mapping.ui@default:default,org.eclipse.compare@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ui.forms@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.jasper@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.ui@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,java_cup.runtime@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.xml.xpath.ui@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.util@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,javax.xml@default:default,org.apache.commons.discovery@default:default,javax.wsdl*1.6.2.v200806030405@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.platform@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.win32@default:false,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.draw2d@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.update.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.edit@default:default,javax.mail*1.4.0.v200905040518@default:default,javax.xml.bind*2.1.9.v200905050702@default:default,org.eclipse.wst.common.frameworks@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.symbian.tools.wrttools@default:default,org.chromium.sdk@default:default,org.symbian.tools.wrttools.previewer@default:default,org.chromium.debug.ui@default:default,org.chromium.debug.core@default:default,org.symbian.tools.wrttools.product@default:default,org.symbian.tools.wrttools.debug.core@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.win32@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.wst.sse.ui@default:default,org.apache.commons.jxpath@default:default,org.eclipse.help@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.apache.commons.net@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.wst.xml.core@default:default,org.apache.bcel@default:default,org.eclipse.epp.package.jee@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.commands@default:default,org.eclipse.wst.common.uriresolver@default:default,org.mozilla.xulrunner.win32.win32.x86@default:false,org.eclipse.core.resources.compatibility@default:false,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.jdom@default:default,com.ibm.icu@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.equinox.http.registry@default:default,javax.xml.rpc@default:default,org.eclipse.wst.xml.xpath.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.apache.lucene.analysis@default:default,org.apache.jasper@default:default,commonj.sdo@default:default,org.eclipse.emf.ecore.xmi@default:default,org.mortbay.jetty.util@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.text@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.wst.sse.doc.user@default:default,org.objectweb.asm@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jsch.ui@default:default,javax.xml.soap@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.doc.user@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.apache.oro@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.ui.intro.universal@default:default,javax.transaction@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.help.base@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.jsdt.doc@default:default,org.eclipse.platform@default:default,org.eclipse.ecf.identity@default:default,org.apache.axis@default:default,javax.xml.bind*2.1.9.v200905050702@default:default,org.eclipse.core.variables@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.wst.command.env.core@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.osgi@-1:true,org.eclipse.wst.common.emf@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.command.env.infopop@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.apache.log4j@default:default,org.eclipse.ui.editors@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.net@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.security@default:default,org.apache.xalan@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ui.forms@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.emf.edit@default:default,org.eclipse.ui.views@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.mozilla.xulrunner@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.appserver@default:default,org.apache.commons.el@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.wst.common.frameworks@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.eclipse.wst.common.environment@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.publisher@default:default,org.hamcrest.core@default:default,org.eclipse.wst.validation.infopop@default:default,org.apache.xml.serializer@default:default,org.sat4j.pb@default:default,org.apache.lucene@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.compare@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.wtp.epp.package.jee.intro@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.console@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.cvs@default:default,com.jcraft.jsch@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.security.macosx@default:false,java_cup.runtime@default:default,org.apache.commons.logging@default:default,javax.wsdl*1.5.1.v200806030408@default:default,org.eclipse.search@default:default,org.eclipse.help.ui@default:default,org.eclipse.wst.xml.xpath.core@default:default,javax.persistence@default:default,org.eclipse.emf.mapping.ui@default:default,org.mozilla.xpcom@default:default,org.eclipse.draw2d@default:default,org.eclipse.osgi.services@default:default,org.eclipse.compare.win32@default:default,org.eclipse.debug.ui@default:default,javax.wsdl*1.6.2.v200806030405@default:default,org.eclipse.emf.common@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.apache.commons.collections@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.team.core@default:default,org.eclipse.wst.command.env.doc.user@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.css.ui@default:default,javax.servlet@default:default,javax.xml@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,javax.mail*1.4.0.v200905040518@default:default,org.eclipse.jface@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.ui@default:default,org.eclipse.dstore.core@default:default,org.eclipse.team.cvs.ssh@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.validation@default:default,javax.xml.bind*2.0.0.v20080604-1500@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.lang*2.3.0.v200803061910@default:default,org.eclipse.wst.internet.monitor.ui@default:default,org.eclipse.jsch.core@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.update.core@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.emf@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.director@default:default,org.apache.commons.discovery@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.sat4j.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.expressions@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.ecf@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.jem.util@default:default,org.eclipse.wst.command.env@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.velocity@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.mortbay.jetty.server@default:default,org.eclipse.team.ui@default:default,javax.xml.stream@default:default,org.eclipse.gef@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.compare.core@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.common@2:true,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.ide@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.core.boot@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jem@default:default,org.eclipse.wst.common.ui@default:default,javax.activation*1.1.0.v200906290531@default:default,org.apache.xerces@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.chromium.debug.ui@default:default,org.symbian.tools.wrttools.product@default:default,org.symbian.tools.wrttools.previewer@default:default,org.chromium.sdk@default:default,org.symbian.tools.wrttools@default:default,org.symbian.tools.wrttools.debug.core@default:default,org.chromium.debug.core@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useDefaultConfig" value="true"/>

--- a/org.symbian.tools.wrttools.product/wrt-ide.product	Mon Feb 01 13:26:14 2010 -0800
+++ b/org.symbian.tools.wrttools.product/wrt-ide.product	Mon Feb 01 13:39:41 2010 -0800
@@ -32,7 +32,6 @@
       </win>
    </launcher>
 
-
    <vm>
       <macos>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</macos>
       <windows>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
@@ -254,6 +253,7 @@
       <plugin id="org.eclipse.wst.css.core"/>
       <plugin id="org.eclipse.wst.css.ui"/>
       <plugin id="org.eclipse.wst.doc.user"/>
+      <plugin id="org.eclipse.wst.dtd.core"/>
       <plugin id="org.eclipse.wst.html.core"/>
       <plugin id="org.eclipse.wst.html.ui"/>
       <plugin id="org.eclipse.wst.html.ui.infopop"/>

--- a/org.symbian.tools.wrttools/plugin.xml	Mon Feb 01 13:26:14 2010 -0800
+++ b/org.symbian.tools.wrttools/plugin.xml	Mon Feb 01 13:39:41 2010 -0800
@@ -145,6 +145,44 @@
 				This wizard generates an empty widget project with a minimal Info.plist, html,css and js.
          </description>
 		</projectTemplate>
+      <projectTemplate
+            archive="projecttemplates/wrtkit.zip"
+            default-css-name="basic"
+            default-html-name="index"
+            default-js-name="basic"
+            icon="icons/main16.gif"
+            id-pattern="com.{0}.basic.widget"
+            name="Basic WRT Project with WRTKit Support">
+         <description>
+            This wizard generates an basic project with a minimal Info.plist, html,css and js along with WRTKit.
+         </description>
+      </projectTemplate>
+      <projectTemplate
+            archive="projecttemplates/flickr.zip"
+            default-css-name="Flickr"
+            default-html-name="index"
+            default-js-name="Flickr"
+            icon="icons/flickr.gif"
+            id-pattern="com.{0}.flickr.widget"
+            name="Flickr Application Project"
+            wizard-page-factory="org.symbian.tools.wrttools.wizards.FlickrProjectDetailsWizardPage$Factory">
+         <description>
+            This wizard generates an Flickr project with a minimal Info.plist, html,css and js and WRTKit.
+         </description>
+      </projectTemplate>
+      <projectTemplate
+            archive="projecttemplates/rssreader.zip"
+            default-css-name="RSSReader"
+            default-html-name="index"
+            default-js-name="RSSReader"
+            icon="icons/rss.gif"
+            id-pattern="com.{0}.rssreader.widget"
+            name="RSS Reader Application Project"
+            wizard-page-factory="org.symbian.tools.wrttools.wizards.RssReaderProjectDetailsWizardPage$Factory">
+         <description>
+            This wizard generates an RSS Reader project with a minimal Info.plist, html,css and js and WRTKit.
+         </description>
+      </projectTemplate>
 	</extension>
 	
 <!-- Import Wizard -->

Binary file org.symbian.tools.wrttools/projecttemplates/flickr.zip has changed

Binary file org.symbian.tools.wrttools/projecttemplates/rssreader.zip has changed

Binary file org.symbian.tools.wrttools/projecttemplates/wrtkit.zip has changed

--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/WidgetProjectNature.java	Mon Feb 01 13:26:14 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/WidgetProjectNature.java	Mon Feb 01 13:39:41 2010 -0800
@@ -19,51 +19,19 @@
 
 package org.symbian.tools.wrttools;
 
-import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IProjectNature;
 import org.eclipse.core.runtime.CoreException;
 
-import org.symbian.tools.wrttools.core.validator.WidgetProjectValidator;
-
 public class WidgetProjectNature implements IProjectNature {
 	public static final String ID = Activator.PLUGIN_ID + ".WidgetProjectNature";
 	
 	private IProject project;
 
 	public void configure() throws CoreException {
-		IProjectDescription desc = project.getDescription();
-		ICommand[] commands = desc.getBuildSpec();
-
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals(WidgetProjectValidator.BUILDER_ID)) {
-				return;
-			}
-		}
-
-		ICommand[] newCommands = new ICommand[commands.length + 1];
-		System.arraycopy(commands, 0, newCommands, 0, commands.length);
-		ICommand command = desc.newCommand();
-		command.setBuilderName(WidgetProjectValidator.BUILDER_ID);
-		newCommands[newCommands.length - 1] = command;
-		desc.setBuildSpec(newCommands);
-		project.setDescription(desc, null);
 	}
 
 	public void deconfigure() throws CoreException {
-		IProjectDescription description = getProject().getDescription();
-		ICommand[] commands = description.getBuildSpec();
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals(WidgetProjectValidator.BUILDER_ID)) {
-				ICommand[] newCommands = new ICommand[commands.length - 1];
-				System.arraycopy(commands, 0, newCommands, 0, i);
-				System.arraycopy(commands, i + 1, newCommands, i,
-						commands.length - i - 1);
-				description.setBuildSpec(newCommands);
-				return;
-			}
-		}
 	}
 
 	public IProject getProject() {

--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/validator/WidgetProjectValidator.java	Mon Feb 01 13:26:14 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,466 +0,0 @@
-/**
- * Copyright (c) 2009 Symbian Foundation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of the License "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Symbian Foundation - initial contribution.
- * Contributors:
- * Description:
- * Overview:
- * Details:
- * Platforms/Drives/Compatibility:
- * Assumptions/Requirement/Pre-requisites:
- * Failures and causes:
- */
-
-package org.symbian.tools.wrttools.core.validator;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.osgi.framework.Bundle;
-
-import org.symbian.tools.wrttools.sdt.utils.DefaultMessageListener;
-import org.symbian.tools.wrttools.sdt.utils.FileUtils;
-import org.symbian.tools.wrttools.sdt.utils.MessageLocation;
-import org.symbian.tools.wrttools.sdt.utils.VariableSubstitutionEngine;
-import org.symbian.tools.wrttools.Activator;
-import org.symbian.tools.wrttools.core.exception.ValidationException;
-import org.symbian.tools.wrttools.core.packager.WRTPackagerConstants;
-import org.symbian.tools.wrttools.core.widgetmodel.WidgetModel;
-import org.symbian.tools.wrttools.previewer.preview.PreviewSupport;
-
-public class WidgetProjectValidator {
-	
-    static final String INFO_PLIST = "info.plist";
-    boolean previewMainCreated = false; 
-    private IProject project;
-    private WidgetModel model = null;
-   
-	public static final String BUILDER_ID = "org.symbian.tools.wrttools.core.validator.widgetProjectValidator";
-
-	public WidgetProjectValidator() {
-		super();
-		ValidateAction validator = new ValidateAction();
-		validator.isValidProject(project);
-		//return null;
-	}
-	void checkResource(IResource resource, IProject project  ) {
-		if (resource instanceof IFile) {
-			try {
-				if(!previewMainCreated )	{
-					//createEmptyPreviewMainHTML();
-					createPreviewFrameHTML(project);
-					
-				}
-				//if info.plist modified
-				if (isInfoPList(resource)) {
-					// did a change to info.plist result in a different main html file?
-					
-					IResource prevMainHTML = null;
-					String mainHtmlName = project.getPersistentProperty(PreviewSupport.MAIN_HTML_PROPERTY);
-					if (mainHtmlName != null) {
-						prevMainHTML = project.findMember(mainHtmlName, false);
-					}
-				     model = null;
-					IFile currMainHTML = getMainHTMLFromModel(project);
-
-					 if ( currMainHTML != null){
-						if(!currMainHTML.equals(prevMainHTML)) {
-								updateHTMLPreview(currMainHTML);
-								
-						}
-					 }
-					else{
-						createEmptyPreviewMainHTML(project);
-						project.setPersistentProperty(PreviewSupport.MAIN_HTML_PROPERTY, null);
-					}
-					
-					
-				}
-				else{		
-					IFile currMainHTML = getMainHTMLFromModel(project);
-				   String mainHtmlPath = project.getPersistentProperty(PreviewSupport.MAIN_HTML_PROPERTY);
-				  if(mainHtmlPath == null){					  
-					  if (currMainHTML != null && !currMainHTML.equals(resource)) {
-					    	updateHTMLPreview(currMainHTML);
-					 }
-				 }
-				else if (mainHtmlPath.equals(resource.getProjectRelativePath().toString())) {					
-					updateHTMLPreview((IFile)resource);
-					
-				  }
-				}
-			} catch (CoreException e) {
-				Activator.log(IStatus.ERROR, "Error building resource:"+resource.getFullPath().toString(), e);
-			} catch (IOException e) {
-				Activator.log(IStatus.ERROR, "Error building resource:"+resource.getFullPath().toString(), e);
-			} catch (URISyntaxException e) {
-				Activator.log(IStatus.ERROR, "Error building resource:"+resource.getFullPath().toString(), e);
-			}
-		}
-	}
-	
-	private void updateHTMLPreview(IFile htmlFile) throws CoreException, IOException, URISyntaxException {
-		createPreviewMainHTML(getMainHTML(project));	
-		//createPreviewFrameHTML();
-
-	}
-
-	protected void updatePreviewFiles(IProject project)
-			throws CoreException {
-		final List<String> filesToPackage = new ArrayList<String>();
-		try {
-			updatePreviewSupportFiles(project);
-			project.accept(new IResourceVisitor() {
-
-				public boolean visit(IResource resource) throws CoreException {
-					if (resource instanceof IFile) {
-						IFile file = (IFile) resource;
-						boolean add = true;
-						// skip user-excluded and automatically-excluded files
-						String value = file
-								.getPersistentProperty(WRTPackagerConstants.EXCLUDE_PROPERTY);
-						if (value != null) {
-							add = false;
-						}
-						String name = file.getName();
-						// skip Aptana temporarily generated files
-						if (name.startsWith(".tmp_")) {
-							add = false;
-						}
-						// if(name.endsWith(".wgz")){
-						// add = false;
-						// }
-						if (name.equals("Thumbs.db")) {
-							add = false;
-						}
-						if (add) {
-							if (file.getProject().getLocation().toString()
-									.endsWith(file.getProject().getName())) {
-
-								filesToPackage.add(file.getLocation()
-										.toString().substring(
-												file.getProject().getLocation()
-														.toString().length()
-														- file.getProject()
-																.getName()
-																.length()));
-							} else {
-								String projectDir = file.getProject()
-										.getLocation().toString().substring(
-												file.getProject().getLocation()
-														.toString()
-														.lastIndexOf("/") + 1);
-								String fullpath = file.getFullPath().toString();
-								fullpath = fullpath.substring(fullpath
-										.indexOf(file.getProject().getName())
-										+ file.getProject().getName().length());
-								fullpath = projectDir + fullpath;
-								filesToPackage.add(fullpath);
-
-							}
-						}
-					}
-					return true;
-				}
-			});
-		} catch (CoreException x) {
-			Activator.log(IStatus.ERROR, "Error updating widget preview", x);
-		}
-	}
-	
-	private boolean isInfoPList(IResource resource) {
-		return INFO_PLIST.equalsIgnoreCase(resource.getProjectRelativePath().toString());
-	}
-	
-	private IFile getMainHTML(IProject project) {
-		IFile result = null;
-		try {
-			String mainHtmlName = project.getPersistentProperty(PreviewSupport.MAIN_HTML_PROPERTY);
-			if (mainHtmlName != null) {
-				IResource resource = project.findMember(mainHtmlName, false);
-				if (resource != null && resource instanceof IFile) {
-					result = (IFile) resource;
-				} else {
-					project.setPersistentProperty(PreviewSupport.MAIN_HTML_PROPERTY, null);
-				}
-			}
-			if (result == null) {
-				result = getMainHTMLFromModel(project);
-			}
-		} catch (CoreException x) {
-			Activator.log(IStatus.ERROR, "error getting main html property", x);
-		}
-		return result;
-	}
-	
-	private IFile getMainHTMLFromModel(IProject project) {
-		IFile result = null;
-		if(model == null)
-			model = getModel(project);
-		String mainHtml = model.getMainHtml();
-		if(mainHtml != null) {
-			IResource resource = project.findMember(mainHtml, false);
-			if (resource != null && resource instanceof IFile) {
-				try {
-					project.setPersistentProperty(PreviewSupport.MAIN_HTML_PROPERTY, mainHtml);
-					result = (IFile) resource;
-				}catch (CoreException x) {
-					Activator.log(IStatus.ERROR, "error setting file persistent property", x);
-				}
-			}else{
-				try {
-					project.setPersistentProperty(PreviewSupport.MAIN_HTML_PROPERTY, null);
-					result = (IFile) resource;
-				}catch (CoreException x) {
-					Activator.log(IStatus.ERROR, "error setting file persistent property", x);
-				}
-			}
-		}
-		return result;
-	}
-	
-	private WidgetModel getModel(IProject project) {
-		WidgetModel model = new WidgetModel();
-		String path = project.getLocation().toString();
-		model.setWidgetDirectory(path);
-		try {
-			model.getWidgetModel(new File(path));
-		} catch (ValidationException x) {
-			Activator.log(IStatus.ERROR, "invalid widget", x);
-		}
-		return model;
-	}
-	
-	private String readFileIntoString(File file) throws CoreException, FileNotFoundException {
-		InputStream is = new FileInputStream(file);
-		return new String(FileUtils.readInputStreamContents(is, "UTF-8"));
-	}
-
-	private void setFileFromString(IFile file, String contents) throws UnsupportedEncodingException, CoreException {
-		ByteArrayInputStream is = new ByteArrayInputStream(contents.getBytes("UTF-8"));
-		if (!file.exists()) {
-			file.create(is, true, new NullProgressMonitor());
-		} else {
-			file.setContents(is, true, false, new NullProgressMonitor());
-		}
-	}
-	
-	private void updatePreviewSupportFiles(IProject project) {
-		try {
-			PreviewSupport ps = new PreviewSupport(project);
-			IFolder previewFolder = ps.getPreviewFolder();
-			IProgressMonitor progressMonitor = new NullProgressMonitor();
-			IProject projects[] = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-			
-			if (previewFolder.exists()) {
-				// Use File-based utility since IFolder.delete doesn't always delete subfolders
-				FileUtils.delTree(previewFolder.getLocation().toFile());
-				previewFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				for(int u=0; u < projects.length; u++){
-					projects[u].refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				}
-			}
-			if(!previewFolder.isSynchronized(IResource.DEPTH_INFINITE)){
-				for(int u=0; u < projects.length; u++){
-					projects[u].refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				}
-				previewFolder.getProject().refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				previewFolder.getParent().refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				previewFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-			}
-			//No need to delete empty folder, we will reuse the same folder for copying new files and sub folders into this.
-			//previewFolder.delete(IResource.FORCE|IFolder.INCLUDE_TEAM_PRIVATE_MEMBERS|IContainer.INCLUDE_PHANTOMS, progressMonitor);
-			
-			if(!previewFolder.isSynchronized(IResource.DEPTH_INFINITE)){
-				for(int u=0; u < projects.length; u++){
-					projects[u].refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				}
-				previewFolder.getProject().refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				previewFolder.getParent().refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				previewFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-			}
-			// No need to create preview folder as we are using existing empty preview folder and copying into that 
-			//previewFolder.create(true, false, progressMonitor);
-			
-			if(!previewFolder.isSynchronized(IResource.DEPTH_INFINITE)){
-				for(int u=0; u < projects.length; u++){
-					projects[u].refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				}
-				previewFolder.getProject().refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				previewFolder.getParent().refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				previewFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-			}
-			previewFolder.setDerived(true);
-			
-			File destRootDir = previewFolder.getLocation().toFile();
-			copyPreviewFiles("/preview", "/preview", destRootDir);
-			//previewFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-			//previewFolder.setPersistentProperty(WRTPackagerConstants.EXCLUDE_PROPERTY, Boolean.TRUE.toString());
-			if(!previewFolder.isSynchronized(IResource.DEPTH_INFINITE)){
-				for(int u=0; u < projects.length; u++){
-					projects[u].refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				}
-				previewFolder.getProject().refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				previewFolder.getParent().refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-				previewFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-			}
-			previewFolder.setPersistentProperty(WRTPackagerConstants.EXCLUDE_PROPERTY, Boolean.TRUE.toString());
-
-			
-			previewFolder.accept(new IResourceVisitor() {
-				public boolean visit(IResource r) {
-					try {
-						// inhibit packaging for preview files
-				 		r.setPersistentProperty(WRTPackagerConstants.EXCLUDE_PROPERTY, Boolean.TRUE.toString());
-				 		// inhibit version control for preview files
-				 		r.setDerived(true);
-					} catch (CoreException x) {
-						Activator.log(IStatus.ERROR, "error setting packager property on "+r.getFullPath().toString(), x);
-					}
-					return true;
-				}
-			});
-		}
-		catch (IOException x) {
-			Activator.log(IStatus.ERROR, "Error updating preview support files", x);
-		} catch (CoreException x) {
-			Activator.log(IStatus.ERROR, "Error updating preview support files", x);
-		}
-	}
-	
-	private void copyPreviewFiles(String sourceRootDir, String topRootDir, File destRootDir) throws IOException, CoreException {
-		Bundle bundle = Activator.getDefault().getBundle();
-		Enumeration e = bundle.getEntryPaths(sourceRootDir);
-		if (e != null) {
-			 while (e.hasMoreElements()) {
-			 	String path = (String) e.nextElement();
-			 	// paths indicating subdirectories end with '/'. 
-			 	if (path.endsWith("/")) {
-			 		// need to trim first component off path, which is the base preview dir
-			 		IPath destPath = new Path(path);
-			 		destPath = destPath.removeFirstSegments(1);
-			 		File newDir = new File(destRootDir, destPath.toString());
-			 		newDir.mkdirs();
-			 		copyPreviewFiles(path, topRootDir, destRootDir);
-			 	} else {
-			 		// skip PREVIEW_HTML_TEMPLATE, we don't copy to preview folder
-			 		IPath destPath = new Path(path);
-			 		destPath = destPath.removeFirstSegments(1);			 	
-			 		File newFile = new File(destRootDir, destPath.toString());
-			 		if (!newFile.getName().equals(PreviewSupport.PREVIEW_HTML_TEMPLATE)) {
-			 			InputStream is = openBundleFile(new Path(path));
-			 			FileUtils.copyFile(is, newFile);
-			 		}
-			 	}
-			 }
-		}
-	}
-	
-	private InputStream openBundleFile(IPath path) throws IOException {
-		InputStream is = FileLocator.openStream(Activator.getDefault().getBundle(),
-				path, false);
-		return is;
-	}
-	
-	private void createPreviewFrameHTML(IProject project) throws IOException, CoreException, URISyntaxException {
-		
-		PreviewSupport ps = new PreviewSupport(project);
-		InputStream templateStream = openBundleFile(ps.getPreviewFrameTemplate());
-		String templateText = new String(FileUtils.readInputStreamContents(templateStream, null));
-
-		Map<String, String> vars = new HashMap<String,String>();
-		String previewBasePath = PreviewSupport.PREVIEW_FOLDER + "/";
-		vars.put("preview_base", previewBasePath);
-		VariableSubstitutionEngine engine = new VariableSubstitutionEngine(
-				new DefaultMessageListener(), 
-				new MessageLocation(ps.getProject(), 0, 0));
-		engine.setVariableToken('(');
-		String resultText = engine.substitute(vars, templateText);
-		
-		IFile previewFrame = ps.getPreviewFrameHtml();
-		boolean updateProperty = !previewFrame.exists();
-		setFileFromString(previewFrame, resultText);
-		if (updateProperty) {
-		previewFrame.setPersistentProperty(WRTPackagerConstants.EXCLUDE_PROPERTY, Boolean.TRUE.toString());
-		}
-		previewFrame.setDerived(true);
-	}
-	
-	private void createEmptyPreviewMainHTML(IProject project) throws CoreException, UnsupportedEncodingException, FileNotFoundException {
-		if(previewMainCreated)
-			return;
-		
-		previewMainCreated = true;
-		PreviewSupport ps = new PreviewSupport(project);
-		
-		IFile previewMainHtml = ps.getPreviewMainHtml();
-		
-		setFileFromString(previewMainHtml, "");
-		previewMainHtml.setPersistentProperty(WRTPackagerConstants.EXCLUDE_PROPERTY, Boolean.TRUE.toString());
-		previewMainHtml.setDerived(true);
-		
-	}
-	
-	private void createPreviewMainHTML(IFile src) throws CoreException, UnsupportedEncodingException, FileNotFoundException {
-		
-		PreviewSupport ps = new PreviewSupport(project);
-		File inputFile = src.getLocation().toFile();
-		String contents = readFileIntoString(inputFile);
-		Pattern headPattern = Pattern.compile("<head\\b[^>]*>", Pattern.CASE_INSENSITIVE|Pattern.MULTILINE);
-		
-		String previewBasePath = PreviewSupport.PREVIEW_FOLDER;
-		StringBuffer buf = new StringBuffer();
-		buf.append("\t<script language=\"JavaScript\" type=\"text/javascript\" src=\"" + previewBasePath + "/script/lib/loader.js\"></script>\n");
-		String previewScripts = buf.toString();
-		
-		Matcher matcher = headPattern.matcher(contents);
-		if (matcher.find()) {
-			String replacement = "<head>\n" + previewScripts;
-			contents = matcher.replaceFirst(replacement);
-		} else {
-			Pattern bodyPattern = Pattern.compile("<body\\b[^>]*>", Pattern.CASE_INSENSITIVE|Pattern.MULTILINE);
-			matcher = bodyPattern.matcher(contents);
-			if (matcher.find()) {
-				String replacement = "\n" + previewScripts + "<body>";
-				contents = matcher.replaceFirst(replacement);
-			}
-		}
-		
-		IFile previewMainHtml = ps.getPreviewMainHtml();
-		setFileFromString(previewMainHtml, contents);
-		previewMainHtml.setPersistentProperty(WRTPackagerConstants.EXCLUDE_PROPERTY, Boolean.TRUE.toString());
-		previewMainHtml.setDerived(true);
-	}
-}

--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/previewer/preview/PreviewSupport.java	Mon Feb 01 13:26:14 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/**
- * Copyright (c) 2009 Symbian Foundation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of the License "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Symbian Foundation - initial contribution.
- * Contributors:
- * Description:
- * Overview:
- * Details:
- * Platforms/Drives/Compatibility:
- * Assumptions/Requirement/Pre-requisites:
- * Failures and causes:
- */
-
-package org.symbian.tools.wrttools.previewer.preview;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.QualifiedName;
-
-import org.symbian.tools.wrttools.sdt.utils.Check;
-import org.symbian.tools.wrttools.sdt.utils.TrackedResource;
-
-	/**
-	 * This class encapsulates the creation and naming 
-	 * of the preview folder and support files
-	 * @author dpodwall
-	 *
-	 */
-public class PreviewSupport {
-	
-	public static final String PREVIEW_FOLDER = "preview";
-	public static final String PREVIEW_MAIN_HTML = "wrt_preview_main.html";
-	public static final String PREVIEW_FRAME_HTML = "wrt_preview_frame.html";
-	public static final String PREVIEW_HTML_TEMPLATE = "wrt_preview.html";
-	public static final QualifiedName MAIN_HTML_PROPERTY = new QualifiedName("org.symbian.tools.wrttools", "mainHTML");
-	//public static final String PREVIEW_BROWSER_NAME1 = "WRT Widget (S60)";
-	public static final String PREVIEW_BROWSER_NAME =  "Web Runtime (WRT)";
-	
-	private TrackedResource projectTracker;
-	
-	public PreviewSupport(IProject project) {
-		Check.checkArg(project);
-		this.projectTracker = new TrackedResource(project);
-	}
-	
-	public void dispose() {
-		if (projectTracker != null) {
-			projectTracker.dispose();
-		}
-	}
-	
-	public IProject getProject() {
-		return projectTracker.getProject();
-	}
-	
-	/**
-	 * Returns the folder containing preview support files, creating it
-	 * if needed.
-	 * @throws CoreException
-	 */
-	public IFolder getPreviewFolder() throws CoreException {
-		IFolder result = getProject().getFolder(PREVIEW_FOLDER);
-		if (!result.exists()) {
-			result.create(true, true, new NullProgressMonitor());
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns the main file, which is a copy of the user's main html
-	 * file. The copy is modified to include the widget preview environment
-	 * JavaScript files.
-	 * The returned IFile may not exist yet
-	 * @throws CoreException
-	 */
-	public IFile getPreviewMainHtml() throws CoreException {
-		IFile result = getProject().getFile(PREVIEW_MAIN_HTML);
-		return result;
-	}
-	
-	/**
-	 * Returns the preview file, which is the outermost html
-	 * file of the preview environment. It includes the main
-	 * file in an iframe.
-	 * The returned IFile may not exist yet
-	 * @throws CoreException
-	 */
-	public IFile getPreviewFrameHtml() throws CoreException {
-		IFile result = getProject().getFile(PREVIEW_FRAME_HTML);
-		return result;
-	}
-	public IFile getMainHtml() throws CoreException {
-		IFile result = null;
-		String mainFilePath = getProject().getPersistentProperty(MAIN_HTML_PROPERTY);
-		if (mainFilePath != null) {
-			IResource resource = getProject().findMember(mainFilePath);
-			if (resource instanceof IFile) {
-				result = (IFile) resource;
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns the base path for preview support files
-	 * in the plugin
-	 * @return
-	 */
-	public IPath getPreviewPluginBase() {
-		return new Path("preview");
-	}
-	
-	public IPath getPreviewFrameTemplate() {
-		return getPreviewPluginBase().append(PREVIEW_HTML_TEMPLATE);
-	}
-
-}