NEW - bug 347872: error while installing hudson connector with discovery

https://bugs.eclipse.org/bugs/show_bug.cgi?id=347872

Change-Id: If3b36e76fe6805f9438c572a67c8c6d364597b96

4 files changed, 15 insertions, 3 deletions

diff --git a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$1.class b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$1.class
index 20b623af..82d9a296 100644
--- a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$1.class
+++ b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$1.class
diff --git a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$2.class b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$2.class
index 0ea8f5cd..61e95655 100644
--- a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$2.class
+++ b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$2.class
diff --git a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class
index aed9bdb3..b826ad43 100644
--- a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class
+++ b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class
diff --git a/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java b/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
index 8c3a09b2..afaa427c 100644
--- a/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
+++ b/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -48,6 +49,10 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
 import org.eclipse.equinox.p2.ui.ProvisioningUI;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDescriptor;
+import org.eclipse.mylyn.internal.discovery.ui.AbstractInstallJob;
+import org.eclipse.mylyn.internal.discovery.ui.DiscoveryUi;
+import org.eclipse.mylyn.internal.discovery.ui.InstalledItem;
+import org.eclipse.mylyn.internal.discovery.ui.UninstallRequest;
 import org.eclipse.mylyn.internal.discovery.ui.util.DiscoveryUiUtil;
 import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages;
 import org.eclipse.osgi.util.NLS;
@@ -360,13 +365,20 @@ class PrepareInstallProfileJob_e_3_6 extends AbstractInstallJob {
 			if (repositoryLocations.add(uri)) {
 				checkCancelled(monitor);
 				repositoryTracker.addRepository(uri, null, session);
-//					ProvisioningUtil.addMetaDataRepository(url.toURI(), true);
-//					ProvisioningUtil.addArtifactRepository(url.toURI(), true);
-//					ProvisioningUtil.setColocatedRepositoryEnablement(url.toURI(), true);
 			}
 			monitor.worked(1);
 		}
 
+		// add selected repositories to resolve dependencies 
+		URI[] knownRepositories = repositoryTracker.getKnownRepositories(session);
+		if (knownRepositories != null) {
+			for (URI uri : knownRepositories) {
+				if (Pattern.matches("http://download.eclipse.org/releases/.*", uri.toString())) {
+					repositoryLocations.add(uri);
+				}
+			}
+		}
+
 		// fetch meta-data for these repositories
 		ArrayList<IMetadataRepository> repositories = new ArrayList<IMetadataRepository>();
 		monitor.setWorkRemaining(repositories.size());