Remove unused reference to PlatformAdmin / do not use PackageAdmin

PlatformAdmin + PackageAdmin are part of the old legacy Resolver API and
should not be used anymore.

Author: laeubi

update/org.eclipse.update.configurator/META-INF/MANIFEST.MF

@@ -2,16 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.update.configurator; singleton:=true
-Bundle-Version: 3.5.800.qualifier
+Bundle-Version: 3.5.900.qualifier
 Bundle-Activator: org.eclipse.update.internal.configurator.ConfigurationActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.update.configurator,
  org.eclipse.update.internal.configurator;x-friends:="org.eclipse.update.core",
  org.eclipse.update.internal.configurator.branding;x-friends:="org.eclipse.update.core"
-Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.18.0,4.0.0)",
- org.eclipse.osgi;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="3.29.0"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: javax.xml.parsers,
  org.w3c.dom,

update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureEntry.java

@@ -13,16 +13,22 @@
  *******************************************************************************/
 package org.eclipse.update.internal.configurator;
 
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.internal.configurator.branding.*;
-import org.osgi.framework.*;
-import org.w3c.dom.*;
+import org.eclipse.core.runtime.IBundleGroup;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.update.configurator.IPlatformConfiguration;
+import org.eclipse.update.internal.configurator.branding.AboutInfo;
+import org.eclipse.update.internal.configurator.branding.IBundleGroupConstants;
+import org.eclipse.update.internal.configurator.branding.IProductConstants;
+import org.osgi.framework.Bundle;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 
 /**
@@ -197,7 +203,7 @@ public Bundle[] getBundles() {
 		ArrayList<Bundle> bundles = new ArrayList<>(plugins.size());
 		for (PluginEntry plugin : plugins) {
 			// get the highest version for the plugin
-			Bundle bundle = Utils.getBundle(plugin.getPluginIdentifier());
+			Bundle bundle = Platform.getBundle(plugin.getPluginIdentifier());
 			if (bundle != null) {
 				bundles.add(bundle);
 			}
@@ -357,11 +363,11 @@ private void fullParse() {
 	}
 
 	public Bundle getDefiningBundle() {
-		return Utils.getBundle(getFeaturePluginIdentifier());
+		return Platform.getBundle(getFeaturePluginIdentifier());
 	}
 
 	public boolean hasBranding() {
 		String bundleId = getFeaturePluginIdentifier();
-		return bundleId != null && Utils.getBundle(bundleId) != null;
+		return bundleId != null && Platform.getBundle(bundleId) != null;
 	}
 }

update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java

@@ -26,17 +26,16 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.framework.log.FrameworkLog;
 import org.eclipse.osgi.framework.log.FrameworkLogEntry;
 import org.eclipse.osgi.service.datalocation.Location;
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
-import org.eclipse.osgi.service.resolver.PlatformAdmin;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -144,7 +143,7 @@ public static void log(IStatus status) {
 	 * platform to be running.
 	 */
 	public static boolean isRunning() {
-		Bundle bundle = getBundle(PI_OSGI);
+		Bundle bundle = Platform.getBundle(PI_OSGI);
 		return  bundle == null ? false : (bundle.getState() & (Bundle.ACTIVE | Bundle.STARTING)) != 0;
 	}
 
@@ -200,49 +199,6 @@ public static String getNL() {
 		return getContext().getProperty(PROP_NL);
 	}
 
-	/**
-	 * Returns a number that changes whenever the set of installed plug-ins
-	 * changes. This can be used for invalidating caches that are based on
-	 * the set of currently installed plug-ins. (e.g. extensions)
-	 *
-	 * @see PlatformAdmin#getState()
-	 * @see org.eclipse.osgi.service.resolver.State#getTimeStamp()
-	 */
-	public static long getStateStamp() {
-		ServiceReference<PlatformAdmin> platformAdminReference = getContext().getServiceReference(PlatformAdmin.class);
-		if (platformAdminReference == null) {
-			return -1;
-		}
-		PlatformAdmin admin = getContext().getService(platformAdminReference);
-		return admin == null ? -1 : admin.getState(false).getTimeStamp();
-	}
-
-	/**
-	 * Return the resolved bundle with the specified symbolic name.
-	 *
-	 * @see PackageAdmin#getBundles(String, String)
-	 */
-	public static synchronized Bundle getBundle(String symbolicName) {
-		if (bundleTracker == null) {
-			bundleTracker = new ServiceTracker<>(getContext(), PackageAdmin.class, null);
-			bundleTracker.open();
-		}
-		PackageAdmin admin = bundleTracker.getService();
-		if (admin == null) {
-			return null;
-		}
-		Bundle[] bundles = admin.getBundles(symbolicName, null);
-		if (bundles == null) {
-			return null;
-		}
-		//Return the first bundle that is not installed or uninstalled
-		for (Bundle bundle : bundles) {
-			if ((bundle.getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-				return bundle;
-			}
-		}
-		return null;
-	}
 
 	/*
 	 * Return the bundle context for this bundle.

update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IniFileReader.java

@@ -28,10 +28,10 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.update.internal.configurator.Messages;
-import org.eclipse.update.internal.configurator.Utils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 
@@ -95,7 +95,7 @@ public IStatus load() {
 		}
 
 		// attempt to locate the corresponding plugin
-		bundle = Utils.getBundle(pluginId);
+		bundle = Platform.getBundle(pluginId);
 		if (bundle == null || bundle.getState() == Bundle.UNINSTALLED || bundle.getState() == Bundle.INSTALLED) {
 			bundle = null; // make it null for other test down the road
 			String message = NLS.bind(Messages.IniFileReader_MissingDesc, featureId);