summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-03-16 11:05:42 (EDT)
committerSteffen Pingel2012-03-16 11:05:42 (EDT)
commit81f3e14adea3d49f03b68b56079616a900d23a9c (patch)
tree675db835cdf44c6bbba0f70bb366f867c6c96263
parent5c66c6b1b0296e37f6654cfc83550bdca6136071 (diff)
downloadorg.eclipse.mylyn.commons-81f3e14adea3d49f03b68b56079616a900d23a9c.zip
org.eclipse.mylyn.commons-81f3e14adea3d49f03b68b56079616a900d23a9c.tar.gz
org.eclipse.mylyn.commons-81f3e14adea3d49f03b68b56079616a900d23a9c.tar.bz2
NEW - bug 347872: error while installing hudson connector with discovery
https://bugs.eclipse.org/bugs/show_bug.cgi?id=347872 Change-Id: If3b36e76fe6805f9438c572a67c8c6d364597b96
-rw-r--r--org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$1.classbin1614 -> 1614 bytes
-rw-r--r--org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$2.classbin1579 -> 1579 bytes
-rw-r--r--org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.classbin17124 -> 17404 bytes
-rw-r--r--org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java18
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 20b623a..82d9a29 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
Binary files differ
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 0ea8f5c..61e9565 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
Binary files differ
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 aed9bdb..b826ad4 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
Binary files differ
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 8c3a09b..afaa427 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());