--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WidgetLaunchDelegate.java Mon Jan 25 16:30:51 2010 -0500
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WidgetLaunchDelegate.java Mon Jan 25 16:59:39 2010 -0800
@@ -27,6 +27,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -85,12 +86,11 @@
// 2. Start Chrome
synchronized (CHROME_ARGS) { // No chances for collision. Still, better safe then spend several days looking for hard-to-reproduce problem
CHROME_ARGS[EXECUTABLE_ARG_NUM] = browserExecutable;
- CHROME_ARGS[PROFILE_ARG_NUM] = "--user-data-dir=\"" + Activator.getDefault().getStateLocation().append("chromeprofile").toOSString() + "\"";
+ CHROME_ARGS[PROFILE_ARG_NUM] = "--user-data-dir=\"" + getChromeProfilePath() + "\"";
CHROME_ARGS[PORT_ARG_NUM] = "--remote-shell-port=" + port;
CHROME_ARGS[APP_ARG_NUM] = MessageFormat.format("--app={0}", uri.toASCIIString());
try {
- Runtime.getRuntime().exec(CHROME_ARGS, null,
- new File(browserExecutable).getParentFile());
+ Runtime.getRuntime().exec(CHROME_ARGS, null, null);
} catch (IOException e) {
launchManager.removeLaunch(launch);
StringBuffer commandLine = new StringBuffer(CHROME_ARGS[0]);
@@ -109,6 +109,12 @@
}
+ private String getChromeProfilePath() {
+ IPath location = ResourcesPlugin.getWorkspace().getRoot().getLocation();
+ return location.append(".chrome").toOSString();
+ }
+
+
private int findFreePort() {
try {
final ServerSocket socket = new ServerSocket(0);
--- a/org.symbian.tools.wrttools.jseditors/META-INF/MANIFEST.MF Mon Jan 25 16:30:51 2010 -0500
+++ b/org.symbian.tools.wrttools.jseditors/META-INF/MANIFEST.MF Mon Jan 25 16:59:39 2010 -0800
@@ -15,7 +15,6 @@
org.eclipse.ui.intro,
org.eclipse.ui.intro.universal,
org.eclipse.ui.console,
- org.eclipse.jdt.ui,
org.eclipse.swt,
org.eclipse.jface,
org.eclipse.ui.workbench
--- a/org.symbian.tools.wrttools.jseditors/src/org/symbian/tools/wrttools/jseditors/perspectives/RelEngPerspective.java Mon Jan 25 16:30:51 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +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:
- */
-
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.symbian.tools.wrttools.jseditors.perspectives;
-
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.jdt.ui.JavaUI;
-
-
-/**
- * This class is meant to serve as an example for how various contributions
- * are made to a perspective. Note that some of the extension point id's are
- * referred to as API constants while others are hardcoded and may be subject
- * to change.
- */
-public class RelEngPerspective implements IPerspectiveFactory {
-
- private IPageLayout factory;
-
- public RelEngPerspective() {
- super();
- }
-
- public void createInitialLayout(IPageLayout factory) {
- this.factory = factory;
- addViews();
- addActionSets();
- addNewWizardShortcuts();
- addPerspectiveShortcuts();
- addViewShortcuts();
- }
-
- private void addViews() {
- // Creates the overall folder layout.
- // Note that each new Folder uses a percentage of the remaining EditorArea.
-
- IFolderLayout bottom =
- factory.createFolder(
- "bottomRight", //NON-NLS-1
- IPageLayout.BOTTOM,
- 0.75f,
- factory.getEditorArea());
- bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
- bottom.addView("org.eclipse.team.ui.GenericHistoryView"); //NON-NLS-1
- bottom.addPlaceholder(IConsoleConstants.ID_CONSOLE_VIEW);
-
- IFolderLayout topLeft =
- factory.createFolder(
- "topLeft", //NON-NLS-1
- IPageLayout.LEFT,
- 0.25f,
- factory.getEditorArea());
- topLeft.addView(IPageLayout.ID_RES_NAV);
- topLeft.addView("org.eclipse.jdt.junit.ResultView"); //NON-NLS-1
-
- factory.addFastView("org.eclipse.team.ccvs.ui.RepositoriesView",0.50f); //NON-NLS-1
- factory.addFastView("org.eclipse.team.sync.views.SynchronizeView", 0.50f); //NON-NLS-1
- }
-
- private void addActionSets() {
- factory.addActionSet("org.eclipse.debug.ui.launchActionSet"); //NON-NLS-1
- factory.addActionSet("org.eclipse.debug.ui.debugActionSet"); //NON-NLS-1
- factory.addActionSet("org.eclipse.debug.ui.profileActionSet"); //NON-NLS-1
- factory.addActionSet("org.eclipse.jdt.debug.ui.JDTDebugActionSet"); //NON-NLS-1
- factory.addActionSet("org.eclipse.jdt.junit.JUnitActionSet"); //NON-NLS-1
- factory.addActionSet("org.eclipse.team.ui.actionSet"); //NON-NLS-1
- factory.addActionSet("org.eclipse.team.cvs.ui.CVSActionSet"); //NON-NLS-1
- factory.addActionSet("org.eclipse.ant.ui.actionSet.presentation"); //NON-NLS-1
- factory.addActionSet(JavaUI.ID_ACTION_SET);
- factory.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET);
- factory.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET); //NON-NLS-1
- }
-
- private void addPerspectiveShortcuts() {
- factory.addPerspectiveShortcut("org.eclipse.team.ui.TeamSynchronizingPerspective"); //NON-NLS-1
- factory.addPerspectiveShortcut("org.eclipse.team.cvs.ui.cvsPerspective"); //NON-NLS-1
- factory.addPerspectiveShortcut("org.eclipse.ui.resourcePerspective"); //NON-NLS-1
- }
-
- private void addNewWizardShortcuts() {
- factory.addNewWizardShortcut("org.eclipse.team.cvs.ui.newProjectCheckout");//NON-NLS-1
- factory.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//NON-NLS-1
- factory.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//NON-NLS-1
- }
-
- private void addViewShortcuts() {
- factory.addShowViewShortcut("org.eclipse.ant.ui.views.AntView"); //NON-NLS-1
- factory.addShowViewShortcut("org.eclipse.team.ccvs.ui.AnnotateView"); //NON-NLS-1
- factory.addShowViewShortcut("org.eclipse.pde.ui.DependenciesView"); //NON-NLS-1
- factory.addShowViewShortcut("org.eclipse.jdt.junit.ResultView"); //NON-NLS-1
- factory.addShowViewShortcut("org.eclipse.team.ui.GenericHistoryView"); //NON-NLS-1
- factory.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
- factory.addShowViewShortcut(JavaUI.ID_PACKAGES);
- factory.addShowViewShortcut(IPageLayout.ID_RES_NAV);
- factory.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
- factory.addShowViewShortcut(IPageLayout.ID_OUTLINE);
- }
-
-}
--- a/org.symbian.tools.wrttools.product/wrt-ide.product Mon Jan 25 16:30:51 2010 -0500
+++ b/org.symbian.tools.wrttools.product/wrt-ide.product Mon Jan 25 16:59:39 2010 -0800
@@ -46,7 +46,6 @@
<plugin id="javax.transaction" fragment="true"/>
<plugin id="javax.xml"/>
<plugin id="javax.xml.stream"/>
- <plugin id="javax.xml.ws" fragment=""/>
<plugin id="org.apache.bcel"/>
<plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.collections"/>
@@ -73,7 +72,7 @@
<plugin id="org.eclipse.ant.core"/>
<plugin id="org.eclipse.compare"/>
<plugin id="org.eclipse.compare.core"/>
- <plugin id="org.eclipse.compare.win32" fragment=""/>
+ <plugin id="org.eclipse.compare.win32"/>
<plugin id="org.eclipse.core.boot"/>
<plugin id="org.eclipse.core.commands"/>
<plugin id="org.eclipse.core.contenttype"/>
@@ -196,11 +195,9 @@
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.osgi.util"/>
<plugin id="org.eclipse.platform"/>
- <plugin id="org.eclipse.platform.doc.isv" fragment=""/>
<plugin id="org.eclipse.platform.doc.user"/>
<plugin id="org.eclipse.rcp"/>
<plugin id="org.eclipse.search"/>
- <plugin id="org.eclipse.servertools.doc.isv" fragment=""/>
<plugin id="org.eclipse.swt"/>
<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
@@ -275,7 +272,6 @@
<plugin id="org.eclipse.wst.sse.ui.infopop"/>
<plugin id="org.eclipse.wst.standard.schemas"/>
<plugin id="org.eclipse.wst.validation"/>
- <plugin id="org.eclipse.wst.validation.doc.isv" fragment=""/>
<plugin id="org.eclipse.wst.validation.infopop"/>
<plugin id="org.eclipse.wst.validation.ui"/>
<plugin id="org.eclipse.wst.xml.core"/>