Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 302487 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/wst/server/discovery/internal/ExtensionUtility.java (-4 / +10 lines)
Lines 14-19 Link Here
14 
import java.net.URL;
 14 
import java.net.URL;
15 
import java.util.*;
 15 
import java.util.*;
16 
import org.eclipse.core.runtime.*;
 16 
import org.eclipse.core.runtime.*;
17 
import org.eclipse.equinox.p2.core.IProvisioningAgent;
17 
import org.eclipse.equinox.p2.engine.IProfile;
 18 
import org.eclipse.equinox.p2.engine.IProfile;
18 
import org.eclipse.equinox.p2.engine.IProfileRegistry;
 19 
import org.eclipse.equinox.p2.engine.IProfileRegistry;
19 
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 20 
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
Lines 240-250 Link Here
240 
	public static Object getService(BundleContext context, String name) {
 241 
	public static Object getService(BundleContext context, String name) {
241 
		if (context == null)
 242 
		if (context == null)
242 
			return null;
 243 
			return null;
243 
		ServiceReference reference = context.getServiceReference(name);
 244 
		ServiceReference reference = context.getServiceReference(IProvisioningAgent.SERVICE_NAME);
244 
		if (reference == null)
 245 
		if (reference == null)
245 
			return null;
 246 
			return null;
246 
		Object result = context.getService(reference);
 247 
		IProvisioningAgent result = (IProvisioningAgent) context.getService(reference);
247 
		context.ungetService(reference);
 248 
		if (result == null)
248 
		return result;
 249 
			return null;
250 
		try {
251 
			return result.getService(name);
252 
		} finally {
253 
			context.ungetService(reference);
254 
		}
249 
	}
 255 
	}
250 
}
 256 
}
(-)src/org/eclipse/wst/server/discovery/internal/model/Extension.java (-4 / +4 lines)
Lines 13-22 Link Here
13 
import java.net.URI;
 13 
import java.net.URI;
14 
import org.eclipse.core.runtime.IProgressMonitor;
 14 
import org.eclipse.core.runtime.IProgressMonitor;
15 
import org.eclipse.core.runtime.IStatus;
 15 
import org.eclipse.core.runtime.IStatus;
16 
import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
17 
import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
18 
import org.eclipse.equinox.p2.engine.*;
 16 
import org.eclipse.equinox.p2.engine.*;
19 
import org.eclipse.equinox.p2.metadata.*;
 17 
import org.eclipse.equinox.p2.metadata.*;
18 
import org.eclipse.equinox.p2.planner.IPlanner;
19 
import org.eclipse.equinox.p2.planner.IProfileChangeRequest;
20 
import org.eclipse.swt.graphics.Image;
 20 
import org.eclipse.swt.graphics.Image;
21 
import org.eclipse.wst.server.discovery.internal.Activator;
 21 
import org.eclipse.wst.server.discovery.internal.Activator;
22 
import org.eclipse.wst.server.discovery.internal.ExtensionUtility;
 22 
import org.eclipse.wst.server.discovery.internal.ExtensionUtility;
Lines 92-99 Link Here
92
92
93 
		IProfileRegistry profileRegistry = (IProfileRegistry) ExtensionUtility.getService(bundleContext, IProfileRegistry.SERVICE_NAME);
 93 
		IProfileRegistry profileRegistry = (IProfileRegistry) ExtensionUtility.getService(bundleContext, IProfileRegistry.SERVICE_NAME);
94 
		IProfile profile = profileRegistry.getProfile(IProfileRegistry.SELF);
 94 
		IProfile profile = profileRegistry.getProfile(IProfileRegistry.SELF);
95 
		ProfileChangeRequest pcr = new ProfileChangeRequest(profile);
 95 
		IProfileChangeRequest pcr = planner.createChangeRequest(profile);
96 
		pcr.addInstallableUnits(new IInstallableUnit[] { iu } );
 96 
		pcr.add(iu);
97 
		provContext = new ProvisioningContext(new URI[] { uri });
 97 
		provContext = new ProvisioningContext(new URI[] { uri });
98 
		provContext.setArtifactRepositories(new URI[] { uri });
 98 
		provContext.setArtifactRepositories(new URI[] { uri });
99 
		if (!explain)
 99 
		if (!explain)

Return to bug 302487