diff options
7 files changed, 10 insertions, 77 deletions
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java index 77ea395ac..a8a4b1c04 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2010, 2011 IBM Corporation and others. +* Copyright (c) 2010, 2017 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 @@ -29,13 +29,6 @@ public class PreferenceManager { private static final String PREF_HAS_MIGRATED = "org.eclipse.core.net.hasMigrated"; //$NON-NLS-1$ - /** - * Preference constants used by Update to record the HTTP proxy - */ - private static String HTTP_PROXY_HOST = "org.eclipse.update.core.proxy.host"; //$NON-NLS-1$ - private static String HTTP_PROXY_PORT = "org.eclipse.update.core.proxy.port"; //$NON-NLS-1$ - private static String HTTP_PROXY_ENABLE = "org.eclipse.update.core.proxy.enable"; //$NON-NLS-1$ - private static final int DEFAULT_INT = -1; private static final String DEFAULT_STRING = null; private static final boolean DEFAULT_BOOLEAN = false; @@ -313,10 +306,9 @@ public class PreferenceManager { // Only set the migration bit when initializing if (isInitialize) instanceScope.putBoolean(PREF_HAS_MIGRATED, true); - Preferences updatePrefs = instanceScope.parent().node("org.eclipse.update.core"); //$NON-NLS-1$ - String httpProxyHost = getHostToMigrate(updatePrefs, isInitialize /* checkSystemProperties */); - int port = getPortToMigrate(updatePrefs, isInitialize /* checkSystemProperties */); - boolean httpProxyEnable = getEnablementToMigrate(updatePrefs, isInitialize /* checkSystemProperties */); + String httpProxyHost = getHostToMigrate(isInitialize /* checkSystemProperties */); + int port = getPortToMigrate(isInitialize /* checkSystemProperties */); + boolean httpProxyEnable = getEnablementToMigrate(isInitialize /* checkSystemProperties */); if (httpProxyHost != null) { ProxyData proxyData = new ProxyData(IProxyData.HTTP_PROXY_TYPE, httpProxyHost, port, false, null); @@ -333,23 +325,21 @@ public class PreferenceManager { } } - private String getHostToMigrate(Preferences updatePrefs, boolean checkSystemProperties) { - String httpProxyHost = updatePrefs.get(HTTP_PROXY_HOST, ""); //$NON-NLS-1$ + private String getHostToMigrate(boolean checkSystemProperties) { + String httpProxyHost = ""; //$NON-NLS-1$ if (checkSystemProperties && "".equals(httpProxyHost)) { //$NON-NLS-1$ httpProxyHost = System.getProperty("http.proxyHost", ""); //$NON-NLS-1$ //$NON-NLS-2$ } if ("".equals(httpProxyHost)) //$NON-NLS-1$ httpProxyHost = null; - updatePrefs.remove(HTTP_PROXY_HOST); return httpProxyHost; } - private int getPortToMigrate(Preferences updatePrefs, boolean checkSystemProperties) { - String httpProxyPort = updatePrefs.get(HTTP_PROXY_PORT, ""); //$NON-NLS-1$ + private int getPortToMigrate(boolean checkSystemProperties) { + String httpProxyPort = ""; //$NON-NLS-1$ if (checkSystemProperties && "".equals(httpProxyPort)) { //$NON-NLS-1$ httpProxyPort = System.getProperty("http.proxyPort", ""); //$NON-NLS-1$ //$NON-NLS-2$ } - updatePrefs.remove(HTTP_PROXY_PORT); int port = -1; if (httpProxyPort != null && !"".equals(httpProxyPort)) //$NON-NLS-1$ try { @@ -360,13 +350,10 @@ public class PreferenceManager { return port; } - private boolean getEnablementToMigrate(Preferences updatePrefs, boolean checkSystemProperties) { + private boolean getEnablementToMigrate(boolean checkSystemProperties) { boolean httpProxyEnable = false; - if (checkSystemProperties && updatePrefs.get(HTTP_PROXY_ENABLE, null) == null) { + if (checkSystemProperties) { httpProxyEnable = Boolean.getBoolean("http.proxySet"); //$NON-NLS-1$ - } else { - httpProxyEnable = updatePrefs.getBoolean(HTTP_PROXY_ENABLE, false); - updatePrefs.remove(HTTP_PROXY_ENABLE); } return httpProxyEnable; } diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch index e2284a4df..7a4245533 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch @@ -21,7 +21,6 @@ <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/> <mapEntry key="org.eclipse.jface/trace/actions" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/> -<mapEntry key="org.eclipse.update.core/debug" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/> @@ -50,8 +49,6 @@ <mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/> <mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/> <mapEntry key="org.eclipse.ant.core/buildfile/timing" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> <mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/> @@ -67,7 +64,6 @@ <mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/> <mapEntry key="org.eclipse.core.boot/trace/filename" value="runtime.traces"/> <mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> <mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/> <mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/> @@ -88,16 +84,13 @@ <mapEntry key="org.eclipse.ui/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> <mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/> <mapEntry key="org.eclipse.help.ui/debug/ieadapter" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> <mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> @@ -107,7 +100,6 @@ <mapEntry key="org.eclipse.team.cvs.ui/debug" value="false"/> <mapEntry key="org.eclipse.team.ftp/responses" value="true"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/> -<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> <mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/> <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> @@ -116,7 +108,6 @@ <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/> <mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> <mapEntry key="org.eclipse.team.cvs.ui/consolebuffering" value="false"/> <mapEntry key="org.eclipse.help.ui/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests (1).launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests (1).launch index eb6582146..dd4c7b330 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests (1).launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests (1).launch @@ -32,7 +32,6 @@ <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/> <mapEntry key="org.eclipse.core.boot/trace/pluginActivation" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/> -<mapEntry key="org.eclipse.update.core/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/ieadapter" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> @@ -41,14 +40,12 @@ <mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/> <mapEntry key="org.eclipse.jdt.core/debug" value="true"/> <mapEntry key="org.eclipse.core.resources/restore" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/> <mapEntry key="org.eclipse.core.resources/build/delta" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> <mapEntry key="org.eclipse.core.boot/monitor/bundles" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/> @@ -59,18 +56,14 @@ <mapEntry key="org.eclipse.team.cvs.core/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> <mapEntry key="org.eclipse.core.resources/save" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> <mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/> <mapEntry key="org.eclipse.core.resources/debug" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> <mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/> <mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> <mapEntry key="org.eclipse.help/debug/context" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> <mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/> @@ -79,7 +72,6 @@ <mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/> <mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/> <mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> @@ -107,7 +99,6 @@ <mapEntry key="org.eclipse.team.cvs.ui/consolebuffering" value="false"/> <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> <mapEntry key="org.eclipse.ant.core/buildfile/timing" value="false"/> diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch index 273976800..b6cdbfaad 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch @@ -57,11 +57,9 @@ <mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/> <mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/ieadapter" value="false"/> <mapEntry key="org.eclipse.ant.core/debug" value="true"/> <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> <mapEntry key="org.eclipse.ui/debug" value="true"/> <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> <mapEntry key="org.eclipse.help/debug/protocols" value="false"/> @@ -71,7 +69,6 @@ <mapEntry key="org.eclipse.core.resources/monitor/listeners" value="false"/> <mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> <mapEntry key="org.eclipse.help/debug/context" value="false"/> <mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/> @@ -93,7 +90,6 @@ <mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> <mapEntry key="org.eclipse.core.runtime/timing/shutdown" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/> <mapEntry key="org.eclipse.help.webapp/debug" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> @@ -105,10 +101,8 @@ <mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/> <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> <mapEntry key="org.eclipse.core.resources/natures" value="false"/> <mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> <mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/> <mapEntry key="org.eclipse.help/debug/search" value="false"/> @@ -117,7 +111,6 @@ <mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> <mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> @@ -131,7 +124,6 @@ <mapEntry key="org.eclipse.core.resources/debug" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/debug" value="true"/> <mapEntry key="org.eclipse.help/debug" value="true"/> <mapEntry key="org.eclipse.team.ftp/list" value="true"/> @@ -140,7 +132,6 @@ <mapEntry key="org.eclipse.team.cvs.ui/consolebuffering" value="false"/> <mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/> <mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/> -<mapEntry key="org.eclipse.update.core/debug" value="true"/> <mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test (CVSNT).launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test (CVSNT).launch index e039d6470..5a250b18a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test (CVSNT).launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test (CVSNT).launch @@ -37,7 +37,6 @@ <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/> <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/> <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/> -<mapEntry key="org.eclipse.update.core/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/> <mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/> <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/> @@ -65,7 +64,6 @@ <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/> <mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/> <mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> <mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/> <mapEntry key="org.eclipse.ui/trace/commands" value="false"/> <mapEntry key="org.eclipse.osgi/debug" value="false"/> @@ -80,7 +78,6 @@ <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/> <mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/> <mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/> @@ -103,10 +100,8 @@ <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/> <mapEntry key="org.eclipse.jface/newlook/preferences/showNewLook" value="false"/> <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/> -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> <mapEntry key="org.eclipse.core.resources/save" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> <mapEntry key="org.eclipse.debug.ui/debug/viewer_cache_debug" value="false"/> <mapEntry key="org.eclipse.jface/debug" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/> @@ -114,7 +109,6 @@ <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/> <mapEntry key="org.eclipse.ui/perf/part.control" value="800"/> <mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/> <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> @@ -123,7 +117,6 @@ <mapEntry key="org.eclipse.team.core/threading" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> <mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> <mapEntry key="org.eclipse.osgi/debug/security" value="false"/> <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/> @@ -138,7 +131,6 @@ <mapEntry key="org.eclipse.jface/debug/dialog/noparent" value="false"/> <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/> <mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> <mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/> <mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/> <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/> @@ -205,7 +197,6 @@ <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/> -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.ui/trace/operations" value="false"/> <mapEntry key="org.eclipse.ui/debug/contributions" value="false"/> <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/> diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch index bceb92ed0..86ded76de 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch @@ -272,15 +272,6 @@ <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/> <mapEntry key="org.eclipse.ui/trace/sources" value="false"/> <mapEntry key="org.eclipse.update.configurator/debug" value="false"/> -<mapEntry key="org.eclipse.update.core/debug" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> </mapAttribute> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Test using Ant application.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Test using Ant application.launch index 697068a4d..6c8671b0a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Test using Ant application.launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Test using Ant application.launch @@ -138,15 +138,6 @@ <mapEntry key="org.eclipse.ui/trace/perspective" value="false"/> <mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/> <mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/> -<mapEntry key="org.eclipse.update.core/debug" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> </mapAttribute> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> |