initial move of core to the new container

1 files changed, 182 insertions, 74 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
index 1109d0f0f..88873b419 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
@@ -11,104 +11,212 @@
 
 package org.eclipse.osgi.internal.framework;
 
-import org.eclipse.osgi.framework.internal.core.*;
-import org.eclipse.osgi.framework.internal.core.Constants;
-
-import org.eclipse.osgi.internal.debug.FrameworkDebugOptions;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import org.eclipse.osgi.internal.resolver.StateImpl;
-import org.eclipse.osgi.service.resolver.State;
+import java.util.*;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParserFactory;
+import org.eclipse.osgi.internal.hookregistry.ActivatorHookFactory;
+import org.eclipse.osgi.internal.hookregistry.HookRegistry;
+import org.eclipse.osgi.internal.location.EquinoxLocations;
+import org.eclipse.osgi.internal.permadmin.SecurityAdmin;
+import org.eclipse.osgi.internal.url.EquinoxFactoryManager;
+import org.eclipse.osgi.next.internal.debug.FrameworkDebugOptions;
+import org.eclipse.osgi.service.datalocation.Location;
+import org.eclipse.osgi.service.debug.DebugOptions;
+import org.eclipse.osgi.service.environment.EnvironmentInfo;
+import org.eclipse.osgi.service.localization.BundleLocalization;
+import org.eclipse.osgi.service.urlconversion.URLConverter;
+import org.eclipse.osgi.storage.BundleLocalizationImpl;
+import org.eclipse.osgi.storage.url.BundleResourceHandler;
+import org.eclipse.osgi.storage.url.BundleURLConverter;
 import org.osgi.framework.*;
+import org.osgi.framework.wiring.BundleWiring;
 import org.osgi.service.condpermadmin.ConditionalPermissionAdmin;
+import org.osgi.service.packageadmin.PackageAdmin;
+import org.osgi.service.permissionadmin.PermissionAdmin;
+import org.osgi.service.startlevel.StartLevel;
 
 /**
  * This class activates the System Bundle.
  */
 
 public class SystemBundleActivator implements BundleActivator {
-	private BundleContext context;
-	private InternalSystemBundle bundle;
-	private Framework framework;
-	private ServiceRegistration<?> packageAdmin;
-	private ServiceRegistration<?> securityAdmin;
-	private ServiceRegistration<?> startLevel;
-	private ServiceRegistration<?> debugOptions;
-	private ServiceRegistration<?> contextFinder;
+	private EquinoxFactoryManager urlFactoryManager;
+	private List<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(10);
+	private List<BundleActivator> hookActivators;
 
+	@SuppressWarnings("deprecation")
 	public void start(BundleContext bc) throws Exception {
-		this.context = bc;
-		bundle = (InternalSystemBundle) bc.getBundle();
-		framework = bundle.framework;
-
-		if (framework.packageAdmin != null)
-			packageAdmin = register(new String[] {Constants.OSGI_PACKAGEADMIN_NAME}, framework.packageAdmin, null);
-		if (framework.securityAdmin != null)
-			securityAdmin = register(new String[] {Constants.OSGI_PERMISSIONADMIN_NAME, ConditionalPermissionAdmin.class.getName()}, framework.securityAdmin, null);
-		if (framework.startLevelManager != null)
-			startLevel = register(new String[] {Constants.OSGI_STARTLEVEL_NAME}, framework.startLevelManager, null);
-		FrameworkDebugOptions dbgOptions = null;
-		if ((dbgOptions = FrameworkDebugOptions.getDefault()) != null) {
-			dbgOptions.start(bc);
-			debugOptions = register(new String[] {org.eclipse.osgi.service.debug.DebugOptions.class.getName()}, dbgOptions, null);
-		}
-		ClassLoader tccl = framework.getContextFinder();
+		registrations.clear();
+		EquinoxBundle bundle = (EquinoxBundle) bc.getBundle();
+
+		bundle.getEquinoxContainer().getLogServices().start(bc);
+
+		urlFactoryManager = new EquinoxFactoryManager(bundle.getEquinoxContainer());
+		urlFactoryManager.installHandlerFactories(bc);
+
+		FrameworkDebugOptions dbgOptions = (FrameworkDebugOptions) bundle.getEquinoxContainer().getConfiguration().getDebugOptions();
+		dbgOptions.start(bc);
+
+		SecurityAdmin sa = bundle.getEquinoxContainer().getStorage().getSecurityAdmin();
+		ClassLoader tccl = bundle.getEquinoxContainer().getContextFinder();
+
+		registerLocations(bc, bundle.getEquinoxContainer().getLocations());
+		register(bc, EnvironmentInfo.class, bundle.getEquinoxContainer().getConfiguration(), null);
+		register(bc, PackageAdmin.class, bundle.getEquinoxContainer().getPackageAdmin(), null);
+		register(bc, StartLevel.class, bundle.getEquinoxContainer().getStartLevel(), null);
+
+		register(bc, PermissionAdmin.class, sa, null);
+		register(bc, ConditionalPermissionAdmin.class, sa, null);
+
+		register(bc, DebugOptions.class, dbgOptions, null);
+
+		Hashtable<String, Object> props = new Hashtable<String, Object>(7);
 		if (tccl != null) {
-			Dictionary<String, Object> props = new Hashtable<String, Object>(7);
+			props.clear();
 			props.put("equinox.classloader.type", "contextClassLoader"); //$NON-NLS-1$ //$NON-NLS-2$
-			contextFinder = register(new String[] {ClassLoader.class.getName()}, tccl, props);
+			register(bc, ClassLoader.class, tccl, props);
+		}
+
+		props.clear();
+		props.put("protocol", new String[] {BundleResourceHandler.OSGI_ENTRY_URL_PROTOCOL, BundleResourceHandler.OSGI_RESOURCE_URL_PROTOCOL}); //$NON-NLS-1$
+		register(bc, URLConverter.class, new BundleURLConverter(), props);
+
+		register(bc, BundleLocalization.class, new BundleLocalizationImpl(), null);
+
+		boolean setTccl = "true".equals(bundle.getEquinoxContainer().getConfiguration().getConfiguration("eclipse.parsers.setTCCL", "true")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		register(bc, SAXParserFactory.class, new ParsingService(true, setTccl), false, null);
+		register(bc, DocumentBuilderFactory.class, new ParsingService(false, setTccl), false, null);
+
+		startHookActivators(bundle.getEquinoxContainer(), bc);
+	}
+
+	private void registerLocations(BundleContext bc, EquinoxLocations equinoxLocations) {
+		Dictionary<String, Object> locationProperties = new Hashtable<String, Object>(1);
+		Location location = equinoxLocations.getUserLocation();
+		if (location != null) {
+			locationProperties.put("type", EquinoxLocations.PROP_USER_AREA); //$NON-NLS-1$
+			register(bc, Location.class, location, locationProperties);
+		}
+		location = equinoxLocations.getInstanceLocation();
+		if (location != null) {
+			locationProperties.put("type", EquinoxLocations.PROP_INSTANCE_AREA); //$NON-NLS-1$
+			register(bc, Location.class, location, locationProperties);
+		}
+		location = equinoxLocations.getConfigurationLocation();
+		if (location != null) {
+			locationProperties.put("type", EquinoxLocations.PROP_CONFIG_AREA); //$NON-NLS-1$
+			register(bc, Location.class, location, locationProperties);
+		}
+		location = equinoxLocations.getInstallLocation();
+		if (location != null) {
+			locationProperties.put("type", EquinoxLocations.PROP_INSTALL_AREA); //$NON-NLS-1$
+			register(bc, Location.class, location, locationProperties);
 		}
 
-		// Always call the adaptor.frameworkStart() at the end of this method.
-		framework.adaptor.frameworkStart(bc);
-		State state = framework.adaptor.getState();
-		if (state instanceof StateImpl)
-			((StateImpl) state).setResolverHookFactory(new CoreResolverHookFactory((BundleContextImpl) context, framework.getServiceRegistry()));
-		// attempt to resolve all bundles
-		// this is done after the adaptor.frameworkStart has been called
-		// this should be the first time the resolver State is accessed
-		framework.packageAdmin.setResolvedBundles(bundle);
-		// reinitialize the system bundles localization to take into account system bundle fragments
-		framework.systemBundle.manifestLocalization = null;
+		location = equinoxLocations.getEclipseHomeLocation();
+		if (location != null) {
+			locationProperties.put("type", EquinoxLocations.PROP_HOME_LOCATION_AREA); //$NON-NLS-1$
+			register(bc, Location.class, location, locationProperties);
+		}
+	}
+
+	private void startHookActivators(EquinoxContainer container, BundleContext context) throws Exception {
+		HookRegistry hookRegistry = container.getConfiguration().getHookRegistry();
+		List<ActivatorHookFactory> activatorHookFactories = hookRegistry.getActivatorHookFactories();
+		hookActivators = new ArrayList<BundleActivator>(activatorHookFactories.size());
+		for (ActivatorHookFactory activatorFactory : activatorHookFactories) {
+			BundleActivator activatorHook = activatorFactory.createActivator();
+			activatorHook.start(context);
+			hookActivators.add(activatorHook);
+		}
 	}
 
 	public void stop(BundleContext bc) throws Exception {
-		// Always call the adaptor.frameworkStop() at the begining of this method.
-		framework.adaptor.frameworkStop(bc);
-
-		if (packageAdmin != null)
-			packageAdmin.unregister();
-		if (securityAdmin != null)
-			securityAdmin.unregister();
-		if (startLevel != null)
-			startLevel.unregister();
-		if (debugOptions != null) {
-			FrameworkDebugOptions dbgOptions = FrameworkDebugOptions.getDefault();
-			if (dbgOptions != null)
-				dbgOptions.stop(bc);
-			debugOptions.unregister();
+		EquinoxBundle bundle = (EquinoxBundle) bc.getBundle();
+
+		stopHookActivators(bc);
+
+		FrameworkDebugOptions dbgOptions = (FrameworkDebugOptions) bundle.getEquinoxContainer().getConfiguration().getDebugOptions();
+		dbgOptions.stop(bc);
+
+		urlFactoryManager.uninstallHandlerFactories();
+
+		// unregister services
+		for (ServiceRegistration<?> registration : registrations)
+			registration.unregister();
+		registrations.clear();
+		bundle.getEquinoxContainer().getLogServices().stop(bc);
+	}
+
+	private void stopHookActivators(BundleContext context) throws Exception {
+		if (hookActivators != null) {
+			for (BundleActivator activatorHook : hookActivators) {
+				activatorHook.stop(context);
+			}
+			hookActivators.clear();
 		}
-		if (contextFinder != null)
-			contextFinder.unregister();
+	}
 
-		framework = null;
-		bundle = null;
-		this.context = null;
+	private void register(BundleContext context, Class<?> serviceClass, Object service, Dictionary<String, Object> properties) {
+		register(context, serviceClass, service, true, properties);
 	}
 
-	/**
-	 * Register a service object.
-	 *
-	 */
-	private ServiceRegistration<?> register(String[] names, Object service, Dictionary<String, Object> properties) {
+	@SuppressWarnings("unchecked")
+	private void register(BundleContext context, Class<?> serviceClass, Object service, boolean setRanking, Dictionary<String, Object> properties) {
 		if (properties == null)
 			properties = new Hashtable<String, Object>(7);
-		Dictionary<String, String> headers = bundle.getHeaders();
+		Dictionary<String, String> headers = context.getBundle().getHeaders();
 		properties.put(Constants.SERVICE_VENDOR, headers.get(Constants.BUNDLE_VENDOR));
-		properties.put(Constants.SERVICE_RANKING, new Integer(Integer.MAX_VALUE));
-		properties.put(Constants.SERVICE_PID, bundle.getBundleId() + "." + service.getClass().getName()); //$NON-NLS-1$
-		return context.registerService(names, service, properties);
+		if (setRanking) {
+			properties.put(Constants.SERVICE_RANKING, new Integer(Integer.MAX_VALUE));
+		}
+		properties.put(Constants.SERVICE_PID, context.getBundle().getBundleId() + "." + service.getClass().getName()); //$NON-NLS-1$
+		registrations.add(context.registerService((Class<Object>) serviceClass, service, properties));
 	}
 
+	private static class ParsingService implements ServiceFactory<Object> {
+		private final boolean isSax;
+		private final boolean setTccl;
+
+		public ParsingService(boolean isSax, boolean setTccl) {
+			this.isSax = isSax;
+			this.setTccl = setTccl;
+		}
+
+		public Object getService(Bundle bundle, ServiceRegistration<Object> registration) {
+			if (!setTccl || bundle == null)
+				return createService();
+			/*
+			 * Set the TCCL while creating jaxp factory instances to the
+			 * requesting bundles class loader.  This is needed to 
+			 * work around bug 285505.  There are issues if multiple 
+			 * xerces implementations are available on the bundles class path
+			 * 
+			 * The real issue is that the ContextFinder will only delegate
+			 * to the framework class loader in this case.  This class
+			 * loader forces the requesting bundle to be delegated to for
+			 * TCCL loads.
+			 */
+			final ClassLoader savedClassLoader = Thread.currentThread().getContextClassLoader();
+			try {
+				BundleWiring wiring = bundle.adapt(BundleWiring.class);
+				ClassLoader cl = wiring == null ? null : wiring.getClassLoader();
+				if (cl != null)
+					Thread.currentThread().setContextClassLoader(cl);
+				return createService();
+			} finally {
+				Thread.currentThread().setContextClassLoader(savedClassLoader);
+			}
+		}
+
+		private Object createService() {
+			if (isSax)
+				return SAXParserFactory.newInstance();
+			return DocumentBuilderFactory.newInstance();
+		}
+
+		public void ungetService(Bundle bundle, ServiceRegistration<Object> registration, Object service) {
+			// Do nothing.
+		}
+	}
 }