### Eclipse Workspace Patch 1.0
#P org.eclipse.releng.tools
Index: src/org/eclipse/releng/tools/CVSTagHelper.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CVSTagHelper.java,v
retrieving revision 1.1
diff -u -r1.1 CVSTagHelper.java
--- src/org/eclipse/releng/tools/CVSTagHelper.java	2 Nov 2007 20:34:06 -0000	1.1
+++ src/org/eclipse/releng/tools/CVSTagHelper.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2010 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
@@ -11,13 +11,17 @@
 package org.eclipse.releng.tools;
 
 import java.util.ArrayList;
+
+import org.eclipse.releng.tools.preferences.MapProjectPreferencePage;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
+
+import org.eclipse.core.runtime.CoreException;
+
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
+
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.releng.tools.preferences.MapProjectPreferencePage;
-import org.eclipse.team.internal.ccvs.core.CVSTag;
 
 /**
  * This is a helper class used for obtaining CVSTags and checking for projects that have no corresponding
@@ -60,13 +64,19 @@
 	 * @throws CVSException
 	 */
 	private CVSTag getTag(IResource resource) {
-		MapProject selectedMapProject = getSelectedMapProject();
-		if (selectedMapProject == null)
-			return CVSTag.DEFAULT;
-		MapEntry entry = selectedMapProject.getMapEntry(resource.getProject());
-		if (entry == null)
-			return CVSTag.DEFAULT;
-		return entry.getTag();
+		MapProject selectedMapProject= null;
+		try {
+			selectedMapProject= getSelectedMapProject();
+			if (selectedMapProject == null)
+				return CVSTag.DEFAULT;
+			MapEntry entry = selectedMapProject.getMapEntry(resource.getProject());
+			if (entry == null)
+				return CVSTag.DEFAULT;
+			return entry.getTag();
+		} finally {
+			if (selectedMapProject != null)
+				selectedMapProject.dispose();
+		}
 	}
 
 	//returns the MapProject that was selected by the user in the MapProjectSelectionWizard
Index: src/org/eclipse/releng/tools/CompareLocalToMap.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CompareLocalToMap.java,v
retrieving revision 1.14
diff -u -r1.14 CompareLocalToMap.java
--- src/org/eclipse/releng/tools/CompareLocalToMap.java	2 Nov 2007 20:34:06 -0000	1.14
+++ src/org/eclipse/releng/tools/CompareLocalToMap.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -11,18 +11,29 @@
 package org.eclipse.releng.tools;
 
 import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
+
 import org.eclipse.releng.tools.preferences.MapProjectPreferencePage;
-import org.eclipse.team.internal.ccvs.core.*;
+import org.eclipse.team.internal.ccvs.core.CVSCompareSubscriber;
+import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
 import org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction;
 import org.eclipse.team.internal.ccvs.ui.subscriber.CompareParticipant;
 import org.eclipse.team.ui.TeamUI;
 import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.OperationCanceledException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+
 /**
  * This class compares the locally selected projects againsts the versions
  * found in the releng map files. The releng map files are searched for in the 
@@ -30,6 +41,7 @@
  */
 public class CompareLocalToMap extends WorkspaceAction {
 	
+
 	/**
 	 * Returns true if the super would enable the option *and*
 	 * only projects are selected.  There is no concept of "releasing"
@@ -41,17 +53,46 @@
 		if (!super.isEnabled())
 			return false;
 		
-		//if any of the projects in the current workspace contain valid map files, return true
-		IProject[] workspaceProjects = RelEngPlugin.getWorkspace().getRoot().getProjects();
-        for (int i=0; i<workspaceProjects.length; i++) {
-        	try {
-    			if (new MapProject(workspaceProjects[i]).getValidMapFiles().length != 0)
-    				return true;
-    		} catch (CoreException e) {
-        		//do nothing
-    		}
-        }
-        return false;
+		return hasProjectFromMapFile();
+	}
+
+	static boolean hasProjectFromMapFile() {
+		final String FOUND= new String();
+		try {
+			final MapFile[] mapFiles= MapFile.findAllMapFiles(ResourcesPlugin.getWorkspace().getRoot());
+
+			IResourceProxyVisitor visitor= new IResourceProxyVisitor() {
+				public boolean visit(IResourceProxy resourceProxy) throws CoreException {
+					if (resourceProxy.getType() == IResource.ROOT)
+						return true;
+
+					if (resourceProxy.getType() != IResource.PROJECT || !resourceProxy.isAccessible())
+						return false;
+
+					IProject project= (IProject)resourceProxy.requestResource();
+					if (!RelEngPlugin.isShared(project))
+						return false;
+
+					if (contains(mapFiles, project))
+						throw new OperationCanceledException(FOUND);
+
+					return false;
+				}
+			};
+			ResourcesPlugin.getWorkspace().getRoot().accept(visitor, IResource.NONE);
+			return false;
+		} catch (OperationCanceledException ex) {
+			return ex.getMessage() == FOUND;
+		} catch (CoreException e) {
+			return false;
+		}
+	}
+
+	private static boolean contains(MapFile[] mapFiles, IProject project) {
+		for (int i= 0; i < mapFiles.length; i++)
+			if (mapFiles[i].contains(project))
+				return true;
+		return false;
 	}
 
 	/**
Index: src/org/eclipse/releng/tools/LoadMap.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/LoadMap.java,v
retrieving revision 1.9
diff -u -r1.9 LoadMap.java
--- src/org/eclipse/releng/tools/LoadMap.java	10 Apr 2007 15:54:52 -0000	1.9
+++ src/org/eclipse/releng/tools/LoadMap.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -17,21 +17,27 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IAction;
+
 import org.eclipse.team.core.ProjectSetCapability;
 import org.eclipse.team.core.RepositoryProviderType;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
 import org.eclipse.team.internal.ccvs.ui.actions.CVSAction;
 import org.eclipse.team.internal.ui.UIProjectSetSerializationContext;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+
+import org.eclipse.jface.action.IAction;
+
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
+
 public class LoadMap extends CVSAction {
 
 	/**
@@ -112,8 +118,10 @@
 		if (resources.length == 0) return false;
 		for (int i = 0; i < resources.length; i++) {
 			IResource resource = resources[i];
-			if (resource.getType() != IResource.FILE) return false;
-			if (!resource.getFileExtension().equals("map")) return false;
+			if (resource.getType() != IResource.FILE)
+				return false;
+			if (!MapFile.isMapFile((IFile)resource))
+				return false;
 		}
 		return true;
 	}
Index: src/org/eclipse/releng/tools/MapFile.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapFile.java,v
retrieving revision 1.5
diff -u -r1.5 MapFile.java
--- src/org/eclipse/releng/tools/MapFile.java	10 Apr 2007 15:52:00 -0000	1.5
+++ src/org/eclipse/releng/tools/MapFile.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -14,18 +14,27 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+
 public class MapFile {
 	
-	public static final String MAP_FILE_EXTENSION = "map";
+	private static final String MAP_FILE_EXTENSION = "map"; //$NON-NLS-1$
+	private static final String MAP_FILE_NAME_ENDING = '.' + MAP_FILE_EXTENSION;
 	
 	protected IFile file;
 	protected MapEntry[] entries;
@@ -114,4 +123,31 @@
 		return file.getName();
 	}
 
+	public static MapFile[] findAllMapFiles(IResource resource) throws CoreException {
+		final ArrayList mapFiles = new ArrayList();
+		IResourceProxyVisitor visitor= new IResourceProxyVisitor() {
+			public boolean visit(IResourceProxy resourceProxy) throws CoreException {
+				if (!resourceProxy.isAccessible())
+					return false;
+
+				int type= resourceProxy.getType();
+				if (type == IResource.PROJECT)
+					return RelEngPlugin.isShared((IProject)resourceProxy.requestResource());
+
+				if (type == IResource.FILE && resourceProxy.getName().endsWith(MAP_FILE_NAME_ENDING))
+					mapFiles.add(new MapFile((IFile)resourceProxy.requestResource()));
+
+				return true;
+			}
+		};
+		
+		resource.accept(visitor,IResource.NONE);
+		
+		return (MapFile[]) mapFiles.toArray(new MapFile[mapFiles.size()]);
+	}
+
+	public static boolean isMapFile(IFile aFile){
+		return MapFile.MAP_FILE_EXTENSION.equals(aFile.getFileExtension());
+	}
+
 }
Index: src/org/eclipse/releng/tools/MapProject.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProject.java,v
retrieving revision 1.12
diff -u -r1.12 MapProject.java
--- src/org/eclipse/releng/tools/MapProject.java	20 May 2009 19:07:04 -0000	1.12
+++ src/org/eclipse/releng/tools/MapProject.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -9,6 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.releng.tools;
+
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,6 +17,15 @@
 import java.util.List;
 import java.util.Set;
 
+import org.eclipse.team.core.TeamException;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
+import org.eclipse.team.internal.ccvs.core.client.Command;
+import org.eclipse.team.internal.ccvs.ui.operations.CommitOperation;
+import org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
@@ -23,17 +33,10 @@
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.team.core.TeamException;
-import org.eclipse.team.internal.ccvs.core.CVSTag;
-import org.eclipse.team.internal.ccvs.core.client.Command;
-import org.eclipse.team.internal.ccvs.ui.operations.CommitOperation;
-import org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation;
+
 
 public class MapProject implements IResourceChangeListener {
 	
@@ -57,7 +60,6 @@
 				RelEngPlugin.log(e);
 			}
 		}
-		
 		return mapProject;
 	}
 	
@@ -70,8 +72,8 @@
 
 	public MapProject(IProject p) throws CoreException {
 		this.project = p;
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
 		loadMapFiles();
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
 	}
 
 	public IProject getProject() {
@@ -176,6 +178,7 @@
 	 */
 	public void dispose(){
 		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+		mapFiles= null;
 	}
 	
 	/**
@@ -197,7 +200,7 @@
 				try{
 					IFile aFile = (IFile)(delta.getResource());
 					MapFile mFile = null;
-					if(isMapFile(aFile)){
+					if(MapFile.isMapFile(aFile)){
 						// Handle content change
 						if(delta.getKind() == IResourceDelta.CHANGED){	
 							mFile = getMapFileFor(aFile);
@@ -227,23 +230,7 @@
 	}
 
 	private void loadMapFiles() throws CoreException {
-		final ArrayList maps = new ArrayList();
-		project.accept(new IResourceVisitor() {
-			public boolean visit(IResource resource) throws CoreException {
-				if (resource.getType() == IResource.FILE) {
-					IFile file = (IFile) resource;
-					if (isMapFile(file)) {
-						maps.add(new MapFile(file));
-					}
-				}
-				return true;
-			}
-		});
-		if (maps.size() > 0) {
-			mapFiles = (MapFile[]) maps.toArray(new MapFile[maps.size()]);
-		} else {
-			mapFiles = new MapFile[0];
-		}
+		mapFiles = MapFile.findAllMapFiles(project);
 	}
 	
 	private MapFile getMapFileFor(IFile file) throws CoreException{
@@ -258,9 +245,4 @@
 		set.add(aFile);
 		mapFiles = (MapFile[])set.toArray(new MapFile[set.size()]); 
 	}
-	private boolean isMapFile(IFile aFile){
-		String extension = aFile.getFileExtension();
-		//In case file has no extension name or is not validate map file
-		return ( extension != null && extension.equals(MapFile.MAP_FILE_EXTENSION)); 
-	}
 }
Index: src/org/eclipse/releng/tools/MapProjectSelectionPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/MapProjectSelectionPage.java,v
retrieving revision 1.9
diff -u -r1.9 MapProjectSelectionPage.java
--- src/org/eclipse/releng/tools/MapProjectSelectionPage.java	2 Nov 2007 20:34:06 -0000	1.9
+++ src/org/eclipse/releng/tools/MapProjectSelectionPage.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 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
@@ -10,24 +10,37 @@
  *******************************************************************************/
 package org.eclipse.releng.tools;
 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.team.core.RepositoryProvider;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.team.core.RepositoryProvider;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Tree;
+
+import org.eclipse.core.runtime.CoreException;
+
+import org.eclipse.core.resources.IProject;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.wizard.WizardPage;
+
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.views.navigator.ResourceComparator;
 
+
 public class MapProjectSelectionPage extends WizardPage {
 	
 	private MapProject selectedMapProject;
@@ -88,7 +101,10 @@
 	}	
 
 	private void updateMapProject(){
-		selectedMapProject = null;	
+		if (selectedMapProject != null) {
+			selectedMapProject.dispose();	
+			selectedMapProject = null;
+		}
 		
 		IStructuredSelection selection = (IStructuredSelection)projectTree.getSelection();
 		if( !selection.isEmpty()){
@@ -97,6 +113,7 @@
 				try {
 					selectedMapProject = new MapProject((IProject)obj);
 					if(selectedMapProject.getValidMapFiles().length == 0){
+						selectedMapProject.dispose();
 						selectedMapProject = null;
 					}
 				} catch (CoreException e) {
@@ -106,6 +123,18 @@
 		}
 		setPageComplete(isValid(selectedMapProject));
 	}
+	
+	/*
+	 * @see org.eclipse.jface.dialogs.DialogPage#dispose()
+	 * @since 3.6
+	 */
+	public void dispose() {
+		if (selectedMapProject != null) {
+			selectedMapProject.dispose();	
+			selectedMapProject = null;
+		}
+		super.dispose();
+	}
 
 	private void initializedViewer(){
 		readSettings();
Index: src/org/eclipse/releng/tools/RelEngPlugin.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java,v
retrieving revision 1.5
diff -u -r1.5 RelEngPlugin.java
--- src/org/eclipse/releng/tools/RelEngPlugin.java	1 Dec 2005 21:16:42 -0000	1.5
+++ src/org/eclipse/releng/tools/RelEngPlugin.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -8,19 +8,25 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-
 package org.eclipse.releng.tools;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.team.core.RepositoryProvider;
+
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
+
 /**
  * A Plugin for performing certain important RelEng tasks.
  * Currentley this Plugin provides support for:
@@ -31,6 +37,8 @@
 	public static final String ID = "org.eclipse.releng.tools"; //$NON-NLS-1$
 	public static final String MAP_PROJECT_NAME = Messages.getString("RelEngPlugin.1"); //$NON-NLS-1$
 	public static final String MAP_FOLDER = Messages.getString("RelEngPlugin.2"); //$NON-NLS-1$
+	private static final String BINARY_REPOSITORY_PROVIDER_CLASS_NAME= "org.eclipse.pde.internal.core.BinaryRepositoryProvider"; //$NON-NLS-1$
+
 	
 	//The shared instance.
 	private static RelEngPlugin plugin;
@@ -121,7 +129,24 @@
 		}
 		return plugin;
 	}
-	
+
+	/**
+	 * Tells whether the given project is shared.
+	 * 
+	 * @param project the project
+	 * @return <code>true</code> if the project is shared
+	 * @since 3.6
+	 */
+	static boolean isShared(IProject project) {
+		Assert.isLegal(project != null);
+		if (!RepositoryProvider.isShared(project))
+			return false;
+
+		// Check for PDE's binary projects that also connect a provider to the project
+		RepositoryProvider provider= RepositoryProvider.getProvider(project);
+		return provider != null && !BINARY_REPOSITORY_PROVIDER_CLASS_NAME.equals(provider.getClass().getName());
+	}
+
 	/**
 	 * The following code is a sample of how to assign a
 	 * RelEng nature to a project.  This only ever needed
Index: src/org/eclipse/releng/tools/ReleaseWizard.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReleaseWizard.java,v
retrieving revision 1.18
diff -u -r1.18 ReleaseWizard.java
--- src/org/eclipse/releng/tools/ReleaseWizard.java	25 Nov 2009 09:03:24 -0000	1.18
+++ src/org/eclipse/releng/tools/ReleaseWizard.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -208,7 +208,19 @@
 		
 		if (defaultBeingUsed) broadcastMapProjectChange(mapProject);
 	}
-	
+
+	/*
+	 * @see org.eclipse.jface.wizard.Wizard#dispose()
+	 * @since 3.6
+	 */
+	public void dispose() {
+		if (mapProject != null) {
+			mapProject.dispose();
+			mapProject= null;
+		}
+		super.dispose();
+	}
+
 	private void addMapSelectionPage() {
 		mapSelectionPage = new MapProjectSelectionPage("MapProjectSelectionPage", //$NON-NLS-1$
 				Messages.getString("ReleaseWizard.4"), //$NON-NLS-1$
@@ -511,9 +523,6 @@
 		return true;
 	}
 
-	public MapProject getMapProject(){
-		return mapProject;
-	}	
 	public void broadcastMapProjectChange(MapProject m){
 		mapProject = m;
 		projectSelectionPage.updateMapProject(m);
Index: src/org/eclipse/releng/tools/ReplaceLocalFromMap.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ReplaceLocalFromMap.java,v
retrieving revision 1.9
diff -u -r1.9 ReplaceLocalFromMap.java
--- src/org/eclipse/releng/tools/ReplaceLocalFromMap.java	2 Nov 2007 20:34:06 -0000	1.9
+++ src/org/eclipse/releng/tools/ReplaceLocalFromMap.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -11,20 +11,27 @@
 package org.eclipse.releng.tools;
 
 import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceStore;
+
 import org.eclipse.releng.tools.preferences.MapProjectPreferencePage;
 import org.eclipse.team.core.TeamException;
-import org.eclipse.team.internal.ccvs.core.*;
+import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
+import org.eclipse.team.internal.ccvs.core.ICVSResource;
 import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
 import org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction;
 import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation;
 import org.eclipse.team.internal.core.InfiniteSubProgressMonitor;
 
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+
+import org.eclipse.core.resources.IResource;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+
 /**
  * This action replaces one or more projects in the local workspace
  * with the versions released to the RelEng map file.
@@ -77,26 +84,16 @@
 	public boolean isEnabled() {
 		if (!(super.isEnabled()))
 			return false;
-		
-		IResource[] resources = super.getSelectedResources();
+
+		IResource[] resources = getSelectedResources();
 		for (int i = 0; i < resources.length; i++) {
 			IResource resource = resources[i];
 			if (resource.getType() != IResource.PROJECT) {
 				return false;
 			}
 		}
-		
-		//if any of the projects in the current workspace contain valid map files, return true
-		IProject[] workspaceProjects = RelEngPlugin.getWorkspace().getRoot().getProjects();
-        for (int i=0; i<workspaceProjects.length; i++) {
-        	try {
-    			if (new MapProject(workspaceProjects[i]).getValidMapFiles().length != 0)
-    				return true;
-    		} catch (CoreException e) {
-        		//this is ok, we will move on to the next project
-    		}
-        }
-        return false;
+
+		return CompareLocalToMap.hasProjectFromMapFile();
 	}
 
 	/* (non-Javadoc)
Index: src/org/eclipse/releng/tools/TagMap.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/TagMap.java,v
retrieving revision 1.11
diff -u -r1.11 TagMap.java
--- src/org/eclipse/releng/tools/TagMap.java	26 Oct 2007 15:17:58 -0000	1.11
+++ src/org/eclipse/releng/tools/TagMap.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -10,16 +10,28 @@
  *******************************************************************************/
 package org.eclipse.releng.tools;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.team.internal.ccvs.core.*;
+import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
+import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource;
+import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
 import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation;
 import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
 import org.eclipse.team.internal.ccvs.ui.actions.TagInRepositoryAction;
 
+import org.eclipse.core.runtime.CoreException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+
+
 /**
  * Tags the versions in a map file with another tag
  */
@@ -122,8 +134,10 @@
 		if (resources.length == 0) return false;
 		for (int i = 0; i < resources.length; i++) {
 			IResource resource = resources[i];
-			if (resource.getType() != IResource.FILE) return false;
-			if (!resource.getFileExtension().equals("map")) return false;
+			if (resource.getType() != IResource.FILE)
+				return false;
+			if (!MapFile.isMapFile((IFile)resource))
+				return false;
 		}
 		return true;
 	}
Index: src/org/eclipse/releng/tools/preferences/MapProjectPreferencePage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/MapProjectPreferencePage.java,v
retrieving revision 1.1
diff -u -r1.1 MapProjectPreferencePage.java
--- src/org/eclipse/releng/tools/preferences/MapProjectPreferencePage.java	2 Nov 2007 20:34:06 -0000	1.1
+++ src/org/eclipse/releng/tools/preferences/MapProjectPreferencePage.java	9 Jun 2010 12:35:51 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2010 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
@@ -10,25 +10,39 @@
  *******************************************************************************/
 package org.eclipse.releng.tools.preferences;
 
-import java.util.ArrayList;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.releng.tools.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.releng.tools.MapFile;
+import org.eclipse.releng.tools.MapProject;
+import org.eclipse.releng.tools.Messages;
+import org.eclipse.releng.tools.RelEngPlugin;
+import org.eclipse.team.internal.ui.SWTUtils;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.team.core.RepositoryProvider;
-import org.eclipse.team.internal.ui.SWTUtils;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.List;
+
+import org.eclipse.core.runtime.CoreException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferencePage;
+
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
+
 public class MapProjectPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 
 	//used as key in the preference store
@@ -101,7 +115,7 @@
 	 * @param aComposite The Composite to which the List being populated will be attached.
 	 */
 	private void createMapProjectList(Composite aComposite) {
-		projectList = new List(aComposite, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+		projectList = new List(aComposite, SWT.BORDER | SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);
 		GridData data = new GridData();
 		//Set heightHint with a small value so the list size will be defined by 
 		//the space available in the dialog instead of resizing the dialog to
@@ -113,21 +127,16 @@
 		data.grabExcessVerticalSpace = true;
 		projectList.setLayoutData(data);
 
-		IProject[] workspaceProjects = RelEngPlugin.getWorkspace().getRoot().getProjects();
-		ArrayList temporaryProjectList = new ArrayList();
-		for (int i = 0; i < workspaceProjects.length; i++) {
-			MapProject aMapProject;
-			try {
-				aMapProject = new MapProject(workspaceProjects[i]);
-				if (aMapProject.getValidMapFiles().length != 0) {
-					temporaryProjectList.add(workspaceProjects[i]);
-				}
-			} catch (CoreException e) {
-				//do nothing
-			}
-		}
-		workspaceMapProjects = new IProject[temporaryProjectList.size()];
-		workspaceMapProjects = ((IProject[]) temporaryProjectList.toArray(new IProject[temporaryProjectList.size()]));
+		Set projects = new HashSet();
+		MapFile[] mapFiles;
+		try {
+			mapFiles = MapFile.findAllMapFiles(RelEngPlugin.getWorkspace().getRoot());
+		} catch (CoreException ex) {
+			mapFiles = new MapFile[0];
+		}
+		for (int i = 0; i < mapFiles.length; i++)
+			projects.add(mapFiles[i].getFile().getProject());
+		workspaceMapProjects = ((IProject[]) projects.toArray(new IProject[projects.size()]));
 
 		String[] projectNames = new String[workspaceMapProjects.length];
 		for (int i = 0; i < workspaceMapProjects.length; i++) {
@@ -149,16 +158,18 @@
 			return;
 		}
 		IProject selectedProject = workspaceMapProjects[selectedIndex];
+		boolean isValid = false;
 		MapProject mapProject = null;
 		try {
 			mapProject = new MapProject(selectedProject);
-			if (mapProject.getValidMapFiles().length == 0) {
-				mapProject = null;
-			}
+			isValid = mapProject.getValidMapFiles().length != 0;
 		} catch (CoreException e) {
-			mapProject = null;
+			isValid = false;
+		} finally {
+			if (mapProject != null)
+				mapProject.dispose();
 		}
-		setValid(isValid(mapProject));
+		setValid(isValid);
 	}
 
 	/*
@@ -213,16 +224,21 @@
 
 	private void highlightDefaultMapProject() {
 		String path = preferenceStore.getString(MapProjectPreferencePage.SELECTED_MAP_PROJECT_PATH);
-		MapProject selectedMapProject = null;
+		boolean isMapProjectSelected = false;
 		if (path.length() > 0) {
+			MapProject selectedMapProject= null;
 			try {
 				selectedMapProject = new MapProject(ResourcesPlugin.getWorkspace().getRoot().getProject(path));
+				isMapProjectSelected = true;
 			} catch (CoreException e) {
-				//do nothing
+				isMapProjectSelected = false;
+			} finally {
+				if (selectedMapProject != null)
+					selectedMapProject.dispose();
 			}
 		}
 
-		if (selectedMapProject == null) {
+		if (!isMapProjectSelected) {
 			alwaysPromptButton.setEnabled(true);
 			preferenceStore.setValue(USE_DEFAULT_MAP_PROJECT, false);
 		} else {
@@ -236,20 +252,4 @@
 			}
 		}
 	}
-
-	private boolean isValid(final MapProject mapProject) {
-		//Check if map project is accessible
-		if (mapProject == null || (!mapProject.getProject().isAccessible())) {
-			setErrorMessage(Messages.getString("MapProjectPreferencePage.3")); //$NON-NLS-1$
-			return false;
-		}
-
-		//Check if the map project is shared
-		if (RepositoryProvider.getProvider(mapProject.getProject()) == null) {
-			setErrorMessage(Messages.getString("MapProjectPreferencePage.4") + mapProject.getProject().getName() + Messages.getString("MapProjectPreferencePage.5")); //$NON-NLS-1$ //$NON-NLS-2$
-			return false;
-		}
-		setErrorMessage(null);
-		return true;
-	}
 }