Attachment 126565 Details for Bug 262964 – SimpleProfileRegistry patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] SimpleProfileRegistry patch

RepoInProfile.patch (text/plain), 4.02 KB, created by Matthew Piggott

on 2009-02-24 10:42:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Piggott

Created: 2009-02-24 10:42:38 EST

Size: 4.02 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.engine
>Index: src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java,v
>retrieving revision 1.51
>diff -u -r1.51 SimpleProfileRegistry.java
>--- src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java	10 Feb 2009 17:49:30 -0000	1.51
>+++ src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java	24 Feb 2009 15:39:26 -0000
>@@ -10,23 +10,21 @@
> 
> import java.io.*;
> import java.lang.ref.SoftReference;
>-import java.net.*;
>+import java.net.MalformedURLException;
>+import java.net.URL;
> import java.util.*;
> import java.util.Map.Entry;
> import javax.xml.parsers.ParserConfigurationException;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.equinox.internal.p2.core.helpers.*;
>-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> import org.eclipse.equinox.internal.provisional.p2.core.Version;
> import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
> import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
>-import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.engine.*;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.query.Collector;
> import org.eclipse.osgi.service.datalocation.Location;
> import org.eclipse.osgi.util.NLS;
>@@ -236,51 +234,9 @@
> 			//update self profile on first load
> 			updateSelfProfile(result);
> 		}
>-		publishRepositoryReferences(result);
> 		return result;
> 	}
> 
>-	/**
>-	 * Publishes any repository references for the currently running profile in this registry.
>-	 */
>-	private void publishRepositoryReferences(Map profileMap) {
>-		Profile profile = (Profile) profileMap.get(self);
>-		if (profile == null)
>-			return;
>-		String repos = profile.getProperty(IProfile.PROP_METADATA_REPOSITORIES);
>-		if (repos != null) {
>-			IRepositoryManager manager = (IRepositoryManager) ServiceHelper.getService(EngineActivator.getContext(), IMetadataRepositoryManager.SERVICE_NAME);
>-			doPublishRepositories(manager, repos);
>-		}
>-		repos = profile.getProperty(IProfile.PROP_ARTIFACT_REPOSITORIES);
>-		if (repos != null) {
>-			IRepositoryManager manager = (IRepositoryManager) ServiceHelper.getService(EngineActivator.getContext(), IArtifactRepositoryManager.SERVICE_NAME);
>-			doPublishRepositories(manager, repos);
>-		}
>-	}
>-
>-	/**
>-	 * Adds the given list of repositories to the given repository manager.
>-	 */
>-	private void doPublishRepositories(IRepositoryManager manager, String repos) {
>-		StringTokenizer tokens = new StringTokenizer(repos, ","); //$NON-NLS-1$
>-		while (tokens.hasMoreTokens())
>-			manager.addRepository(decodeURI(tokens.nextToken()));
>-	}
>-
>-	/**
>-	 * Decodes a URI that has had literal comma characters encoded.
>-	 */
>-	private URI decodeURI(String locationString) {
>-		//convert escaped commas back to literal commas
>-		int nextComma = locationString.indexOf("${#44}"); //$NON-NLS-1$
>-		while (nextComma > 0) {
>-			locationString = locationString.substring(0, nextComma) + ',' + locationString.substring(nextComma + 6);
>-			nextComma = locationString.indexOf("${#44}");//$NON-NLS-1$
>-		}
>-		return URI.create(locationString);
>-	}
>-
> 	public synchronized void updateProfile(Profile profile) {
> 		String id = profile.getProfileId();
> 		Profile current = internalGetProfile(id);

Actions: View | Diff

Attachments on bug 262964: 126052 | 126054 | 126195 | 126196 | 126198 | 126565