Added tests for operation to cache the base contents

6 files changed, 634 insertions, 13 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java
index 9cb32f7d3..fedd69bbf 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java
@@ -240,5 +240,12 @@ public class ResourceVariantCache {
 	public String getName() {
 		return name;
 	}
+	
+	/*
+	 * Method used for testing only
+	 */
+	public ResourceVariantCacheEntry[] getEntries() {
+		return (ResourceVariantCacheEntry[]) cacheEntries.values().toArray(new ResourceVariantCacheEntry[cacheEntries.size()]);
+	}
 
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java
index 4f8a007e2..98c7f4b79 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java
@@ -35,10 +35,12 @@ import org.eclipse.ui.IWorkbenchPart;
 public class CacheBaseContentsOperation extends SingleCommandOperation {
 
 	private final SyncInfoTree tree;
+	private final boolean includeOutgoing;
 
-	public CacheBaseContentsOperation(IWorkbenchPart part, ResourceMapping[] mappers, LocalOption[] options, SyncInfoTree tree) {
+	public CacheBaseContentsOperation(IWorkbenchPart part, ResourceMapping[] mappers, LocalOption[] options, SyncInfoTree tree, boolean includeOutgoing) {
 		super(part, mappers, options);
 		this.tree = tree;
+		this.includeOutgoing = includeOutgoing;
 	}
 
 	protected void execute(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
@@ -79,7 +81,8 @@ public class CacheBaseContentsOperation extends SingleCommandOperation {
 	 * @return whether the operation is enabled for the given change direction
 	 */
 	protected boolean isEnabledForDirection(int direction) {
-		return direction == SyncInfo.CONFLICTING;
+		return direction == SyncInfo.CONFLICTING || 
+		(includeOutgoing && direction == SyncInfo.OUTGOING);
 	}
 
 	/* (non-Javadoc)
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 32cc64720..7cc5bede4 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
@@ -3,27 +3,526 @@
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <stringAttribute key="bootstrap" value=""/>
 <booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="tracing" value="true"/>
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<mapAttribute key="tracingOptions">
+<mapEntry key="com.ibm.xtools.draw2d.ui.render/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.render/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.query.ocl/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
+<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core.provider/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.jem.ui/debug/logtracefile" value="default"/>
+<mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
+<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.ocl/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressions" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/commands/execute" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.figures/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.emf.msl.commands/debug/methods/exiting" value="false"/>
+<mapEntry key="com.ibm.xtools.notation.msl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.common.printing/debug/actions/admin" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.ocl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.dnd/debug/services/config" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.notation.msl/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
+<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.pathvariables.ide/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
+<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/log" value="true"/>
+<mapEntry key="com.ibm.xtools.emf.query/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.providers/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.team.ui/syncmodels" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.clipboard/debug/methods/exiting" value="false"/>
+<mapEntry key="com.ibm.xtools.common.printing/debug/actions/repeat" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.commands/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+<mapEntry key="org.eclipse.wst.css.core/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.dnd/debug" value="true"/>
+<mapEntry key="org.eclipse.wst.rdb.core/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
+<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
+<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/taglib/indexcreation" value="false"/>
+<mapEntry key="org.eclipse.team.core/streams" value="false"/>
+<mapEntry key="org.eclipse.wst.javascript.core/debug" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
+<mapEntry key="com.ibm.xtools.gef/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
+<mapEntry key="org.eclipse.jem.proxy/debug/logtracefile" value="default"/>
+<mapEntry key="org.eclipse.jface/newlook/preferences/showNewLook" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/jspsearch" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.query/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
+<mapEntry key="com.ibm.xtools.emf.clipboard/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.wst.xml.core/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.render/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.action/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.dnd/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/>
+<mapEntry key="com.ibm.xtools.common.printing/debug" value="true"/>
+<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.providers/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="com.ibm.xtools.common.printing/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/debug/tracefilter" value=""/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.figures/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.wst.internet.monitor.core/debug" value="true"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui.properties/debug/exceptions/catching" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core.provider/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/debug/outline" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/tldcmdocument/manager" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="true"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/commands/admin" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.action/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
+<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/trace" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
+<mapEntry key="org.eclipse.wst.server.core/debug" value="true"/>
+<mapEntry key="org.eclipse.wst.internet.monitor.core/parsing" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui.properties/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.wst.css.core/debug/tracefilter" value=""/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/gotoNextAnnotation" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
+<mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/>
+<mapEntry key="com.ibm.xtools.emf.msl.commands/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.help.base/debug" value="true"/>
+<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
+<mapEntry key="org.eclipse.wst.sse.core/debug" value="true"/>
+<mapEntry key="com.ibm.datatools.core.ui/plugin/log" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
+<mapEntry key="org.eclipse.jem.proxy/remote/debug/notimeouts" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/>
+<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugtoolbar" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.wst.server.core/resources" value="false"/>
+<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.pathvariables.ide/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
+<mapEntry key="org.eclipse.jem/debug/logtrace" value="default"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/providers" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.commands/debug/events/tracing" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/services/activate" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.dnd/debug/exceptions/catching" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.core.provider/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
+<mapEntry key="org.eclipse.wst.html.core/debug/tracefilter" value=""/>
+<mapEntry key="org.eclipse.wst.sse.core/resourcechangehandling" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.wst.server.ui/editor" value="false"/>
+<mapEntry key="com.ibm.datatools.core.ui/editor/log" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/plugin/ondemand/loading" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.pathvariables.ide/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/jsptranslation" value="false"/>
+<mapEntry key="org.eclipse.wst.xml.ui/projectionperf" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.figures/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.ui.action/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.common.printing/debug/actions/run" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/readtime" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
+<mapEntry key="com.ibm.xtools.emf.msl.commands/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/jspvalidator" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
+<mapEntry key="com.ibm.xtools.notation.msl/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/tldcmdocument/factory" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/jspjavamapping" value="false"/>
+<mapEntry key="org.eclipse.team.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui.properties/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerjob" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.core/debug/events/tracing" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/taglib/events" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/>
+<mapEntry key="org.eclipse.jface/trace/actions" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
+<mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/>
+<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
+<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug/filter/events" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
+<mapEntry key="org.eclipse.help/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
+<mapEntry key="com.ibm.xtools.notation.msl/debug" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/preferences/set" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/propertyChangeUpdateActionContributionItem" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug/filter/canonical" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui.properties/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
+<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core.provider/debug/ElementActionFilterProvider/tracing" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/tasks/registry" value="false"/>
+<mapEntry key="com.ibm.xtools.common.printing/debug/exceptions/catching" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.jface/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/preferences/get" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
+<mapEntry key="org.eclipse.wst.sse.core/tasks/detection" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.providers/debug" value="true"/>
+<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.query.ocl/debug/methods/exiting" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.clipboard/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
+<mapEntry key="org.eclipse.wst.html.core/debug" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
+<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/services/execute" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.action/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.jem.beaninfo/debug/logtracefile" value="default"/>
+<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.providers/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
+<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/constraints/disabled" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/partitioner/prefixlistener" value="false"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.action/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.pathvariables.ide/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.action/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/tasks/overalltime" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/constraints" value="false"/>
+<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressionstimethreshold" value="100"/>
+<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/taglibvars" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.figures/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
+<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.actions/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.gef/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
+<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/commands/redo" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
+<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
+<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugmenu" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
+<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/>
+<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug/actions/run" value="false"/>
+<mapEntry key="org.eclipse.jem.proxy/debug/logtrace" value="default"/>
+<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/state" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
+<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.ocl/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
+<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.query.ocl/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/hideDerivedFromRefactoring" value="false"/>
+<mapEntry key="com.ibm.xtools.common.printing/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.clipboard/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/cache" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.core/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
+<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/jobs/locks" value="false"/>
+<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services/debug" value="true"/>
+<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.clipboard/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.actions/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
+<mapEntry key="org.eclipse.wst.javascript.core/debug/tracefilter" value=""/>
+<mapEntry key="com.ibm.xtools.common.ui.services.action/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.providers/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui/debug/model/operations" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
+<mapEntry key="com.ibm.xtools.gef/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.commands/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.ui.action/debug/exceptions/catching" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.action/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.jem.proxy/debug/loglevel" value="default"/>
+<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
+<mapEntry key="org.eclipse.jem.proxy/remote/debug/vmtraceout" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/tasks/preferences" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.action/debug" value="true"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug" value="true"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.action/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/xml" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.render/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.diagram/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.help/debug/context" value="false"/>
+<mapEntry key="org.eclipse.wst.css.ui/projectionperf" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/tasks/time" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/tracefilter" value=""/>
+<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingIsEqualTo" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/methods/exiting" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
+<mapEntry key="org.eclipse.jst.server.tomcat.core/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.ui.pathvariables.ide/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/constraints/evaluation" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/debug/jspindexmanager" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/taglib/indextime" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.actions/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core.provider/debug/StorageUnitActionFilterProvider/tracing" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.query.ocl/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services.dnd/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug" value="true"/>
+<mapEntry key="org.eclipse.team.core/debug" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugpopup" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/commands/undo" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
+<mapEntry key="org.eclipse.wst.xml.core/debug/tracefilter" value=""/>
+<mapEntry key="org.eclipse.jem/debug/logtracefile" value="default"/>
+<mapEntry key="com.ibm.xtools.emf.msl.core/debug/resources" value="false"/>
+<mapEntry key="com.ibm.datatools.core.ui/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.render/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
+<mapEntry key="com.ibm.xtools.emf.query/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.figures/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui.properties/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.gef/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.jface/debug/dialog/noparent" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
+<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
+<mapEntry key="org.eclipse.jface/trace/toolbarDisposal" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/listeners" value="false"/>
+<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
+<mapEntry key="com.ibm.xtools.gef/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui.actions/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ui/consolebuffering" value="false"/>
+<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/parsers" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.core.provider/debug/exceptions/catching" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.msl.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui.services/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.xtools.diagram.ui/debug/filter/persistencemgr" value="false"/>
+<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/transferbuilder/time" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
+<mapEntry key="org.eclipse.jem.proxy/remote/debug/debugvm" value="false"/>
+<mapEntry key="org.eclipse.jem.ui/debug/logtrace" value="default"/>
+<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
+<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/>
+<mapEntry key="com.ibm.xtools.emf.query/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.figures/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
+<mapEntry key="com.ibm.xtools.draw2d.ui.render/debug/exceptions/catching" value="false"/>
+<mapEntry key="com.ibm.xtools.notation.msl/debug/exceptions/catching" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.ocl/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
+<mapEntry key="com.ibm.xtools.common.printing/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
+<mapEntry key="com.ibm.xtools.emf.query.ocl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
+<mapEntry key="com.ibm.xtools.emf.validation/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/methods/entering" value="false"/>
+<mapEntry key="com.ibm.xtools.common.core.provider/debug/methods/exiting" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug/resource/tracing" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/tasks/job" value="false"/>
+<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
+<mapEntry key="com.ibm.xtools.gef/debug/methods/exiting" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.query/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
+<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
+<mapEntry key="com.ibm.xtools.emf.ocl/debug" value="true"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug/actions/admin" value="false"/>
+<mapEntry key="org.eclipse.jst.jsp.core/taglib/resolve" value="false"/>
+<mapEntry key="com.ibm.xtools.common.ui/debug/actions/repeat" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
+<mapEntry key="com.ibm.xtools.common.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.jem.ui/debug/loglevel" value="default"/>
+<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
+<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
+<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
+<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
+<mapEntry key="org.eclipse.wst.server.ui/debug" value="true"/>
+<mapEntry key="com.ibm.datatools.core.ui/modelExplorerDecoration/trace" value="true"/>
+<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
+</mapAttribute>
+<stringAttribute key="selectedPlugin" value="org.eclipse.team.cvs.core"/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <booleanAttribute key="automaticAdd" value="true"/>
 <booleanAttribute key="includeFragments" value="false"/>
+<stringAttribute key="location" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
+<stringAttribute key="configLocation" value=""/>
 <booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.mappings.ResourceMapperTests"/>
 <stringAttribute key="location1" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os win32 -ws win32 -arch x86 -nl en_CA"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName=testCacheBase"/>
 <booleanAttribute key="default" value="true"/>
-<stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName=testOverrideOutgoingChanges"/>
 <booleanAttribute key="clearConfig" value="true"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="onePluginID" value=""/>
-<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_CA"/>
 <booleanAttribute key="useDefaultConfig" value="true"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/>
 <booleanAttribute key="askclear" value="false"/>
 <booleanAttribute key="onePlugin" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location0" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
 </launchConfiguration>
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index c261a4b0a..ce72760c2 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -833,15 +833,19 @@ public class EclipseTest extends ResourceTest {
 	}
 	
 	protected void setContentsAndEnsureModified(IFile file) throws CoreException, TeamException {
-		setContentsAndEnsureModified(file, getRandomContents().toString());
+		setContentsAndEnsureModified(file, getRandomContents());
 	}
 	
 	protected void setContentsAndEnsureModified(IFile file, String contents) throws CoreException, CVSException {
+		if (contents == null) contents ="";
+		setContentsAndEnsureModified(file, new ByteArrayInputStream(contents.getBytes()));
+	}
+	
+	protected void setContentsAndEnsureModified(IFile file, InputStream stream) throws CoreException, CVSException {
 		ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor(file);
 		int count = 0;
-		if (contents == null) contents ="";
 		do {
-			file.setContents(new ByteArrayInputStream(contents.getBytes()), false, false, null);
+			file.setContents(stream, false, false, null);
 			assertTrue("Timestamp granularity is too small. Increase test wait factor", count <= CVSTestSetup.WAIT_FACTOR);
 			if (!cvsFile.isModified(null)) {
 				waitMsec(1500);
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java
index f28c6da4e..c84747ac0 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java
@@ -11,21 +11,30 @@
 package org.eclipse.team.tests.ccvs.core.mappings;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 
 import junit.framework.Test;
 
+import org.eclipse.core.internal.resources.mapping.SimpleResourceMapping;
 import org.eclipse.core.resources.*;
 import org.eclipse.core.resources.mapping.*;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.synchronize.*;
+import org.eclipse.team.core.variants.CachedResourceVariant;
+import org.eclipse.team.core.variants.IResourceVariant;
 import org.eclipse.team.internal.ccvs.core.*;
+import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
 import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTree;
 import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder;
 import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
+import org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation;
+import org.eclipse.team.internal.core.ResourceVariantCache;
+import org.eclipse.team.internal.core.ResourceVariantCacheEntry;
 import org.eclipse.team.tests.ccvs.core.EclipseTest;
 
 /**
@@ -276,6 +285,9 @@ public class ResourceMapperTests extends EclipseTest {
                         new ResourceTraversal(resources, depth, IResource.NONE)
                     };
             }
+			public String getModelProviderId() {
+				return ResourceModelProvider.MODEL_PROVIDER_ID;
+			}
         };
     }
     
@@ -531,4 +543,70 @@ public class ResourceMapperTests extends EclipseTest {
         add(asResourceMapping(new IResource[] { project }, IResource.DEPTH_INFINITE));
     }
     
+    public void testCacheBase() throws TeamException, CoreException {
+        IProject project = createProject("testCacheBase", new String[] { "changed.txt", "deleted.txt", "folder1/", "folder1/a.txt", "folder1/b.txt", "folder1/subfolder1/c.txt"  });
+        IProject copy = checkoutCopy(project, "-copy");
+        
+        // First, make some local changes and then cache the bases
+        setContentsAndEnsureModified(project.getFile("changed.txt"));
+        setContentsAndEnsureModified(project.getFile("folder1/b.txt"));
+        project.getFile("deleted.txt").delete(false, true, null);
+        cacheBase(project, true /* cache for outgoing and conflicting */);
+        cacheBase(project, false /* cache for conflicting only*/);
+        
+        // Next, retry after releasing some changes (to ensure proper contents are fetched)
+        setContentsAndEnsureModified(copy.getFile("changed.txt"));
+        commitProject(copy);
+        cacheBase(project, true /* cache for outgoing and conflicting */);
+        cacheBase(project, false /* cache for conflicting only */);
+    }
+
+	private void cacheBase(IProject project, boolean includeOutgoing) throws CoreException {
+		clearCachedBased(project);
+		CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().refresh(new IProject[] { project }, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		SyncInfoTree tree = getAllOutOfSync(new IProject[] { project });
+		ResourceMapping[] mappings = new ResourceMapping[] {new SimpleResourceMapping(project)};
+		CacheBaseContentsOperation op = new CacheBaseContentsOperation(null, mappings, Command.NO_LOCAL_OPTIONS, tree, includeOutgoing);
+		executeHeadless(op);
+		ensureBaseCached(tree, includeOutgoing);
+	}
+
+	private void ensureBaseCached(SyncInfoTree tree, boolean includeOutgoing) throws TeamException, CoreException {
+		for (Iterator iter = tree.iterator(); iter.hasNext();) {
+			SyncInfo info = (SyncInfo) iter.next();
+			IResourceVariant base = info.getBase();
+			if (base != null) {
+				boolean isCached = ((CachedResourceVariant)base).isContentsCached();
+				int direction = SyncInfo.getDirection(info.getKind());
+				if (direction == SyncInfo.CONFLICTING || (includeOutgoing && direction == SyncInfo.OUTGOING)) {
+					assertTrue(NLS.bind("The base contents should be cached for {0}", new String[] {info.getLocal().getFullPath().toString()}), isCached);
+					// For conflicts, ensure that the cache contents do not match the remote
+					if (direction == SyncInfo.CONFLICTING) {
+						IResourceVariant remote = info.getRemote();
+						if (remote != null) {
+							InputStream baseIn = base.getStorage(DEFAULT_MONITOR).getContents();
+							InputStream remoteIn = remote.getStorage(DEFAULT_MONITOR).getContents();
+							if (compareContent(baseIn, remoteIn)) {
+								fail(NLS.bind("The remote was fetched instead of the base for {0}", new String[] {info.getLocal().getFullPath().toString()}));
+							}
+						}
+					}
+				} else {
+					assertFalse(NLS.bind("The base contents should NOT be cached for {0}", new String[] {info.getLocal().getFullPath().toString()}), isCached);
+				}
+			}
+		}
+	}
+
+	private void clearCachedBased(IProject project) {
+		ResourceVariantCache cache = ResourceVariantCache.getCache(CVSProviderPlugin.ID);
+		if (cache != null) {
+			ResourceVariantCacheEntry[] entries = cache.getEntries();
+			for (int i = 0; i < entries.length; i++) {
+				ResourceVariantCacheEntry entry = entries[i];
+				entry.dispose();
+			}
+		}
+	}
+    
 }
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SyncInfoSetTraveralContext.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SyncInfoSetTraveralContext.java
index ad14b21ed..9eec8540c 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SyncInfoSetTraveralContext.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SyncInfoSetTraveralContext.java
@@ -48,11 +48,10 @@ public class SyncInfoSetTraveralContext extends RemoteResourceMappingContext {
     /* (non-Javadoc)
      * @see org.eclipse.core.resources.mapping.ITraversalContext#fetchContents(org.eclipse.core.resources.IFile, org.eclipse.core.runtime.IProgressMonitor)
      */
-    public IStorage fetchContents(IFile file, IProgressMonitor monitor) throws CoreException {
+    public IStorage fetchRemoteContents(IFile file, IProgressMonitor monitor) throws CoreException {
         SyncInfo info = getSyncInfo(file);
-        //TODO: Speced to throw an exception when remote doesn't exist
         if (info == null)
-            return file;
+            return null;
         IResourceVariant remote = info.getRemote();
         if (remote == null)
             return null;
@@ -73,4 +72,35 @@ public class SyncInfoSetTraveralContext extends RemoteResourceMappingContext {
         // Do nothing
     }
 
+	public boolean isThreeWay() {
+		for (Iterator iter = set.iterator(); iter.hasNext();) {
+			SyncInfo info = (SyncInfo) iter.next();
+			return info.getComparator().isThreeWay();
+		}
+		return true;
+	}
+
+	public boolean hasRemoteChange(IResource resource, IProgressMonitor monitor) throws CoreException {
+		SyncInfo info = set.getSyncInfo(resource);
+		int direction = SyncInfo.getDirection(info.getKind());
+		return direction == SyncInfo.INCOMING || direction == SyncInfo.CONFLICTING;
+	}
+
+	public boolean hasLocalChange(IResource resource, IProgressMonitor monitor) throws CoreException {
+		SyncInfo info = set.getSyncInfo(resource);
+		int direction = SyncInfo.getDirection(info.getKind());
+		return direction == SyncInfo.OUTGOING || direction == SyncInfo.CONFLICTING;
+
+	}
+
+	public IStorage fetchBaseContents(IFile file, IProgressMonitor monitor) throws CoreException {
+        SyncInfo info = getSyncInfo(file);
+        if (info == null)
+            return null;
+        IResourceVariant base = info.getBase();
+        if (base == null)
+            return null;
+        return base.getStorage(monitor);
+	}
+
 }