# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1282584605 25200
# Node ID bd9f2d7c64a664c25be1760b4e66323dcaaac8ae
# Parent  06589bf52fa72ae7dbdcbc96a507565feb0c2021
Debugger is now Symbian-independant

diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.core/bin/org/symbian/tools/tmw/core/utilities/CoreUtil.class
Binary file plugins/org.symbian.tools.tmw.core/bin/org/symbian/tools/tmw/core/utilities/CoreUtil.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.core/src/org/symbian/tools/tmw/core/utilities/CoreUtil.java
--- a/plugins/org.symbian.tools.tmw.core/src/org/symbian/tools/tmw/core/utilities/CoreUtil.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.core/src/org/symbian/tools/tmw/core/utilities/CoreUtil.java	Mon Aug 23 10:30:05 2010 -0700
@@ -35,4 +35,8 @@
     public static boolean isMac() {
         return "macosx".equals(Platform.getOS());
     }
+
+    public static boolean isLinux() {
+        return "linux".equals(Platform.getOS());
+    }
 }
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/META-INF/MANIFEST.MF
--- a/plugins/org.symbian.tools.tmw.debug/META-INF/MANIFEST.MF	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/META-INF/MANIFEST.MF	Mon Aug 23 10:30:05 2010 -0700
@@ -22,7 +22,7 @@
  org.eclipse.wst.sse.core;bundle-version="1.1.400",
  org.eclipse.wst.html.core;bundle-version="1.1.300",
  org.eclipse.wst.jsdt.core;bundle-version="1.0.200",
- org.symbian.tools.wrttools;bundle-version="1.0.0"
+ org.symbian.tools.tmw.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/ChromeDebugUtils.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/ChromeDebugUtils.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/PreferenceInitializer.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/PreferenceInitializer.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/launch/ChromeInstancesManager.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/launch/ChromeInstancesManager.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge$1.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge$1.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge$VmResourceImpl.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge$VmResourceImpl.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler$1.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler$1.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler$2.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler$2.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/property/PropertyTester.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/internal/property/PropertyTester.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/ui/actions/DebugAction.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/ui/actions/DebugAction.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/ui/launch/WidgetBasicTab.class
Binary file plugins/org.symbian.tools.tmw.debug/bin/org/symbian/tools/tmw/debug/ui/launch/WidgetBasicTab.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/ChromeDebugUtils.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/ChromeDebugUtils.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/ChromeDebugUtils.java	Mon Aug 23 10:30:05 2010 -0700
@@ -20,7 +20,7 @@
 
 import java.io.File;
 
-import org.symbian.tools.wrttools.util.CoreUtil;
+import org.symbian.tools.tmw.core.utilities.CoreUtil;
 
 public final class ChromeDebugUtils {
 	public static String getExecutablePath(String folder) {
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/PreferenceInitializer.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/PreferenceInitializer.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/PreferenceInitializer.java	Mon Aug 23 10:30:05 2010 -0700
@@ -22,7 +22,7 @@
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.symbian.tools.wrttools.util.CoreUtil;
+import org.symbian.tools.tmw.core.utilities.CoreUtil;
 
 public class PreferenceInitializer extends AbstractPreferenceInitializer {
 	private final static String DEFAULT_CHROME_LOCATION = "Local Settings/Application Data/Google/Chrome/Application";
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/launch/ChromeInstancesManager.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/launch/ChromeInstancesManager.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/launch/ChromeInstancesManager.java	Mon Aug 23 10:30:05 2010 -0700
@@ -32,9 +32,9 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
+import org.symbian.tools.tmw.core.utilities.CoreUtil;
 import org.symbian.tools.tmw.debug.internal.Activator;
 import org.symbian.tools.tmw.debug.internal.ChromeDebugUtils;
-import org.symbian.tools.wrttools.util.CoreUtil;
 
 public class ChromeInstancesManager {
     private static final String[] CHROME_ARGS = { "%s", "--remote-shell-port=%d", // Here we will set port
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/launch/WRTProjectWorkspaceBridge.java	Mon Aug 23 10:30:05 2010 -0700
@@ -62,7 +62,7 @@
         this.project = project;
         this.resourceManager = new ResourceManager();
         this.sourceLocator = new WebApplicationSourceLocator(resourceManager);
-        breakpointHandler = new WorkspaceBreakpointHandler(debugTargetImpl, resourceManager);
+        breakpointHandler = new WorkspaceBreakpointHandler(debugTargetImpl);
         ILaunch launch = debugTargetImpl.getLaunch();
         try {
             sourceLocator.initializeDefaults(launch.getLaunchConfiguration());
@@ -111,9 +111,7 @@
                     Collection<ChromiumLineBreakpoint> breakpoints = new ArrayList<ChromiumLineBreakpoint>(
                             markers.length);
                     for (IMarker marker : markers) {
-                        // If it is not ChromiumLineBreakpoint -
-                        // something's gone horribly wrong. Better get
-                        // ClassCastException
+                        // If it is not ChromiumLineBreakpoint - something's gone horribly wrong. Better get ClassCastException
                         ChromiumLineBreakpoint breakpoint = (ChromiumLineBreakpoint) DebugPlugin.getDefault()
                                 .getBreakpointManager().getBreakpoint(marker);
                         breakpointHandler.breakpointAdded(breakpoint);
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/model/WorkspaceBreakpointHandler.java	Mon Aug 23 10:30:05 2010 -0700
@@ -26,12 +26,9 @@
 public final class WorkspaceBreakpointHandler implements BreakpointHandler {
 	private final BreakpointMap.InTargetMap breakpointInTargetMap = new BreakpointMap.InTargetMap();
 	private final DebugTargetImpl debugTarget;
-	private final ResourceManager resourceManager;
 	
-    public WorkspaceBreakpointHandler(DebugTargetImpl debugTarget, ResourceManager resourceManager) {
+    public WorkspaceBreakpointHandler(DebugTargetImpl debugTarget) {
 		this.debugTarget = debugTarget;
-        //		this.vm = vm;
-		this.resourceManager = resourceManager;
 	}
 
     public void breakpointAdded(IBreakpoint breakpoint) {
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/property/PropertyTester.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/property/PropertyTester.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/internal/property/PropertyTester.java	Mon Aug 23 10:30:05 2010 -0700
@@ -19,16 +19,15 @@
 package org.symbian.tools.tmw.debug.internal.property;
 
 import org.eclipse.core.resources.IResource;
-import org.symbian.tools.wrttools.util.ProjectUtils;
+import org.symbian.tools.tmw.core.TMWCore;
 
 public class PropertyTester extends org.eclipse.core.expressions.PropertyTester {
 
-	public boolean test(Object receiver, String property, Object[] args,
-			Object expectedValue) {
-		if (property.equals("isWrtProject")) {
-			return ProjectUtils.hasWrtNature(((IResource) receiver).getProject());
-		}
-		return false;
-	}
+    public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+        if (property.equals("isWrtProject")) {
+            return TMWCore.create(((IResource) receiver).getProject()) != null;
+        }
+        return false;
+    }
 
 }
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/ui/actions/DebugAction.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/ui/actions/DebugAction.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/ui/actions/DebugAction.java	Mon Aug 23 10:30:05 2010 -0700
@@ -23,7 +23,7 @@
 import org.eclipse.debug.internal.ui.actions.DebugLastAction;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.symbian.tools.wrttools.util.ProjectUtils;
+import org.symbian.tools.tmw.core.TMWCore;
 
 @SuppressWarnings("restriction")
 public class DebugAction extends DebugLastAction {
@@ -32,13 +32,13 @@
         boolean hasWrtProjects = false;
         IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
         for (IProject project : projects) {
-            if (project.isAccessible() && ProjectUtils.hasWrtNature(project)) {
+            if (project.isAccessible() && TMWCore.create(project) != null) {
                 hasWrtProjects = true;
                 break;
             }
         }
         if (hasWrtProjects) {
-        super.run(action);
+            super.run(action);
         } else {
             MessageDialog.openInformation(getShell(), "Cannot launch debugger",
                     "There are no open projects in your workspace");
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/ui/launch/WidgetBasicTab.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/ui/launch/WidgetBasicTab.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/ui/launch/WidgetBasicTab.java	Mon Aug 23 10:30:05 2010 -0700
@@ -42,11 +42,11 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.symbian.tools.tmw.core.TMWCore;
 import org.symbian.tools.tmw.debug.internal.Activator;
 import org.symbian.tools.tmw.debug.internal.ChromeDebugUtils;
 import org.symbian.tools.tmw.debug.internal.IConstants;
 import org.symbian.tools.tmw.debug.internal.Images;
-import org.symbian.tools.wrttools.util.ProjectUtils;
 
 public class WidgetBasicTab extends AbstractLaunchConfigurationTab {
 	private ComboViewer project;
@@ -92,7 +92,7 @@
 				.getProjects();
 		LinkedList<IProject> filtered = new LinkedList<IProject>();
 		for (IProject p : projects) {
-			if (ProjectUtils.hasWrtNature(p)) {
+            if (TMWCore.create(p) != null) {
 				filtered.add(p);
 			}
 		}
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.previewer/bin/org/symbian/tools/tmw/previewer/http/WorkspaceResourcesServlet.class
Binary file plugins/org.symbian.tools.tmw.previewer/bin/org/symbian/tools/tmw/previewer/http/WorkspaceResourcesServlet.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.tmw.previewer/src/org/symbian/tools/tmw/previewer/http/WorkspaceResourcesServlet.java
--- a/plugins/org.symbian.tools.tmw.previewer/src/org/symbian/tools/tmw/previewer/http/WorkspaceResourcesServlet.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.previewer/src/org/symbian/tools/tmw/previewer/http/WorkspaceResourcesServlet.java	Mon Aug 23 10:30:05 2010 -0700
@@ -139,7 +139,10 @@
             IApplicationLayoutProvider provider = PreviewerPlugin.getExtensionsManager().getLayoutProvider(
                     file.getProject());
             if (provider != null) {
-                p = provider.getResourcePath(file);
+                IPath path = provider.getResourcePath(file);
+                if (path != null) {
+                    p = p.append(file.getProject().getName()).append(path).makeAbsolute();
+                }
             }
         }
         String uri = getServerURIForResource(p, null).toASCIIString();
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch
--- a/plugins/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch	Mon Aug 23 10:30:05 2010 -0700
@@ -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.common.modulecore@default:default,javax.servlet@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.draw2d@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.doc.user@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.ui.win32@default:false,org.eclipse.update.configurator@3:true,org.eclipse.jface@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.search@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.apache.xml.resolver@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,javax.xml@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.apache.jasper@default:default,org.eclipse.rcp@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.jem.util@default:default,org.apache.lucene.analysis@default:default,org.apache.xerces@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.velocity@default:default,java_cup.runtime@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.help.appserver@default:default,org.mozilla.xulrunner@default:default,org.jdom@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui@default:default,org.apache.xml.serializer@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.jsdt.ui@default:default,org.apache.commons.collections@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.net@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.osgi.services@default:default,org.apache.lucene@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.wst.standard.schemas@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.ui.editors@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.wst.jsdt.core@default:default,org.apache.xalan@default:default,org.eclipse.help.base@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xml.xpath.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.cvs@default:default,org.eclipse.ecf@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.wst.html.core@default:default,org.eclipse.help.webapp@default:default,org.mozilla.xpcom@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.core.runtime@default:true,org.apache.commons.lang@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.common@default:default,org.eclipse.debug.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.gef@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.wst.sse.ui.infopop@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.text@default:default,org.eclipse.update.ui@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.emf.edit@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.validation@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.browser@default:default,org.eclipse.wst.sse.ui@default:default,org.mozilla.xulrunner.win32.win32.x86@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.internet.monitor.ui@default:default,org.eclipse.equinox.util@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.jsch.core@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.databinding.property@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.boot@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.ui.net@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,com.ibm.icu@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.databinding.beans@default:default,org.sat4j.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.platform@default:default,org.eclipse.core.databinding@default:default,org.apache.commons.el@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.compare@default:default,org.eclipse.swt@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.team.core@default:default,org.eclipse.help@default:default,com.jcraft.jsch@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.apache.bcel@default:default,org.eclipse.core.variables@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.log4j@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.wst.jsdt.doc@default:default,org.eclipse.team.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.wst.css.core@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.symbian.tools.wrttools.product@default:default,org.symbian.tools.tmw.ui@default:default,org.symbian.tools.tmw.core@default:default,org.symbian.tools.tmw.previewer@default:default,org.w3c.css@default:default,org.symbian.tools.wrttools.doc.WebDeveloper@default:default,org.symbian.tools.wrttools.debug.core@default:default,org.symbian.tools.wrttools@default:default,org.chromium.debug.ui@default:default,org.chromium.debug.core@default:default,org.chromium.sdk@default:default,org.symbian.tools.wrttools.doc.WRTKit@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.wst.html.core@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.jsch.core@default:default,org.apache.commons.el@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.wst.internet.monitor.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.help@default:default,javax.servlet.jsp@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.platform@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.help.base@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.ui.browser@default:default,org.jdom@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.environment@default:default,javax.xml@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ui.net@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.ui.intro@default:default,org.eclipse.swt@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.wst.common.core@default:default,org.apache.commons.lang@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.equinox.common@2:true,org.eclipse.team.core@default:default,org.apache.velocity@default:default,com.jcraft.jsch@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.xerces@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jsch.ui@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.win32@default:false,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.gef@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.update.core@default:default,org.eclipse.draw2d@default:default,org.mozilla.xulrunner@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.help.ui@default:default,org.mozilla.xpcom@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.ui.editors@default:default,org.eclipse.emf.ecore.change@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.jsdt.doc@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.help.appserver@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.xml.xpath.ui@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.security.ui@default:default,com.ibm.icu@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.wst.validation.infopop@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.wst.common.project.facet.ui@default:default,javax.servlet@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jem.util@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.resources@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.wst.doc.user@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.update.core.win32@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.osgi@-1:true,org.apache.xalan@default:default,org.mozilla.xulrunner.win32.win32.x86@default:false,org.eclipse.wst.html.ui@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.rcp@default:default,org.eclipse.core.databinding.property@default:default,org.apache.jasper@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.jface.text@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.apache.bcel@default:default,org.eclipse.ui@default:default,org.apache.log4j@default:default,org.eclipse.team.ui@default:default,org.eclipse.core.filebuffers@default:default,org.apache.commons.collections@default:default,org.sat4j.core@default:default,org.eclipse.update.configurator@3:true,org.eclipse.text@default:default,org.apache.lucene@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.compare@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.cvs@default:default,org.eclipse.core.boot@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.navigator@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.jobs@default:default,org.sat4j.pb@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.wst.common.modulecore@default:default,java_cup.runtime@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.core.runtime@default:true,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.team.cvs.ssh2@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.ui.console@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.wst.common.emf@default:default,org.apache.xml.resolver@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.core.expressions@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.symbian.tools.wrttools.product@default:default,org.symbian.tools.tmw.previewer@default:default,org.symbian.tools.wrttools.doc.WRTKit@default:default,org.symbian.tools.wrttools@default:default,org.chromium.debug.core@default:default,org.symbian.tools.wrttools.doc.WebDeveloper@default:default,org.symbian.tools.tmw.debug.core@default:default,org.symbian.tools.tmw.core@default:default,org.chromium.debug.ui@default:default,org.w3c.css@default:default,org.symbian.tools.tmw.ui@default:default,org.chromium.sdk@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="true"/>
 <mapAttribute key="tracingOptions">
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.wrttools/bin/org/symbian/tools/wrttools/core/project/WRT11ApplicationLayout.class
Binary file plugins/org.symbian.tools.wrttools/bin/org/symbian/tools/wrttools/core/project/WRT11ApplicationLayout.class has changed
diff -r 06589bf52fa7 -r bd9f2d7c64a6 plugins/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/project/WRT11ApplicationLayout.java
--- a/plugins/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/project/WRT11ApplicationLayout.java	Mon Aug 23 09:55:57 2010 -0700
+++ b/plugins/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/project/WRT11ApplicationLayout.java	Mon Aug 23 10:30:05 2010 -0700
@@ -148,7 +148,7 @@
                 Activator.log(e);
             }
         }
-        return file.exists() && isFileIncluded(file) ? file : null;
+        return (file != null && file.exists()) && isFileIncluded(file) ? file : null;
     }
 
 }