Attachment #126496 for bug #239227

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 239227
Collapse All | Expand All

Lines 1-5 Link Here

(-)build.properties (-4 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2005 IBM Corporation and others.	2	# Copyright (c) 2005, 2009 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 11-20 Link Here
11	bin.includes = .options,\	11	bin.includes = .options,\
12	about.html,\	12	about.html,\
13	plugin.properties,\	13	plugin.properties,\
14	plugin.xml,\
15	.,\	14	.,\
16	META-INF/,\	15	META-INF/,\
17	config.ini,\	16	OSGI-INF/
18	META-INF/
19	src.includes = about.html	17	src.includes = about.html
20	source.. = src/	18	source.. = src/

Lines 2-7 Link Here

(-).project (+7 lines)
2	<projectDescription>	2	<projectDescription>
3	<name>org.eclipse.update.configurator</name>	3	<name>org.eclipse.update.configurator</name>
4	<comment></comment>	4	<comment></comment>
		5	<projects>
		6	</projects>
5	<buildSpec>	7	<buildSpec>
6	<buildCommand>	8	<buildCommand>
7	<name>org.eclipse.jdt.core.javabuilder</name>	9	<name>org.eclipse.jdt.core.javabuilder</name>
Lines 18-23 Link Here
18	<arguments>	20	<arguments>
19	</arguments>	21	</arguments>
20	</buildCommand>	22	</buildCommand>
		23	<buildCommand>
		24	<name>org.eclipse.pde.ds.core.builder</name>
		25	<arguments>
		26	</arguments>
		27	</buildCommand>
21	</buildSpec>	28	</buildSpec>
22	<natures>	29	<natures>
23	<nature>org.eclipse.jdt.core.javanature</nature>	30	<nature>org.eclipse.jdt.core.javanature</nature>

(-)component.xml (-1 lines)

Removed Link Here

<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="Platform Install / Update"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.update.configurator" fragment="false"/><plugin id="org.eclipse.update.core" fragment="false"/><plugin id="org.eclipse.update.core.linux" fragment="true"/><plugin id="org.eclipse.update.core.win32" fragment="true"/><plugin id="org.eclipse.update.scheduler" fragment="false"/><plugin id="org.eclipse.update.ui" fragment="false"/><package name="org.eclipse.update.configurator"><type name="ConfiguratorUtils" implement="false" subclass="false" instantiate="false"/><type name="IPlatformConfiguration" instantiate="false"/><type name="IPlatformConfigurationFactory" instantiate="false"/></package><package name="org.eclipse.update.search"><type name="IUpdateSearchSite" instantiate="false"/><type name="UpdateSearchRequest"/><type name="IUpdateSearchFilter" instantiate="false"/><type name="IQueryUpdateSiteAdapter" instantiate="false"/><type name="IUpdateSearchResultCollectorFromMirror" instantiate="false"/><type name="VersionedIdentifiersFilter"/><type name="IUpdateSearchResultCollector" instantiate="false"/><type name="IUpdateSiteAdapter" instantiate="false"/><type name="BaseFilter"/><type name="EnvironmentFilter"/><type name="IUpdateSearchQuery" instantiate="false"/><type name="IUpdateSearchCategory" instantiate="false"/><type name="UpdateSearchScope"/><type name="BackLevelFilter"/></package><package name="org.eclipse.update.operations"><type name="IInstallFeatureOperation" instantiate="false"/><type name="IUninstallFeatureOperation" instantiate="false"/><type name="IConfigFeatureOperation" instantiate="false"/><type name="IToggleSiteOperation" instantiate="false"/><type name="IOperationFactory" instantiate="false"/><type name="OperationsManager" implement="false" subclass="false" instantiate="false"/><type name="IReplaceFeatureVersionOperation" instantiate="false"/><type name="IFeatureOperation" instantiate="false"/><type name="IOperation" instantiate="false"/><type name="IBatchOperation" instantiate="false"/><type name="IOperationListener" instantiate="false"/><type name="IRevertConfigurationOperation" instantiate="false"/><type name="IOperationValidator" instantiate="false"/><type name="IUnconfigFeatureOperation" instantiate="false"/><type name="IUpdateModelChangedListener" instantiate="false"/></package><package name="org.eclipse.update.core"><type name="Verifier"/><type name="IncludedFeatureReference"/><type name="IInstallHandlerEntry" instantiate="false"/><type name="IArchiveReference" instantiate="false"/><type name="INonPluginEntry" instantiate="false"/><type name="IImport" instantiate="false"/><type name="Site"/><type name="IVerificationResult" instantiate="false"/><type name="InstallHandlerEntry"/><type name="ISiteWithMirrors" instantiate="false"/><type name="JarEntryContentReference"/><type name="IUpdateConstants" instantiate="false"/><type name="BaseFeatureFactory" instantiate="false"/><type name="ISiteFactoryExtension" instantiate="false"/><type name="SiteManager" instantiate="false"/><type name="ICategory" instantiate="false"/><type name="ISite" instantiate="false"/><type name="IContentConsumer" instantiate="false"/><type name="ArchiveReference"/><type name="IVerifier" instantiate="false"/><type name="InstallMonitor"/><type name="IVerificationListener" instantiate="false"/><type name="ISiteFactory" instantiate="false"/><type name="JarContentReference"/><type name="Feature"/><type name="IFeatureFactory" instantiate="false"/><type name="IPlatformEnvironment" instantiate="false"/><type name="IInstallHandlerWithFilter" instantiate="false"/><type name="IPluginEntry" instantiate="false"/><type name="ContentReference"/><type name="URLEntry"/><type name="SiteFeatureReference"/><type name="IFeatureContentConsumer" instantiate="false"/><type name="IFeatureReference" instantiate="false"/><type name="Import"/><type name="ISiteContentProvider" instantiate="false"/><type name="IFeature" instantiate="false"/><type name="VersionedIdentifier" subclass="false"/><type name="FeatureReference"/><type name="IFeatureContentProvider" instantiate="false"/><type name="BaseInstallHandler"/><type name="ISiteFeatureReference" instantiate="false"/><type name="FeatureContentProvider"/><type name="SiteContentProvider"/><type name="BaseSiteFactory" instantiate="false"/><type name="IInstallHandler" instantiate="false"/><type name="SiteFeatureReferenceModel"/><type name="IIncludedFeatureReference" subclass="false" instantiate="false"/><type name="IURLEntry" instantiate="false"/><type name="NonPluginEntry"/><type name="Category"/><type name="PluginEntry"/><type name="Utilities" implement="false" subclass="false" instantiate="false"/></package><package name="org.eclipse.update.core.model"><type name="FeatureReferenceModel"/><type name="SiteModel"/><type name="PluginEntryModel"/><type name="ModelObject" instantiate="false"/><type name="SiteModelFactory"/><type name="FeatureModel"/><type name="InstallAbortedException"/><type name="NonPluginEntryModel"/><type name="InstallHandlerEntryModel"/><type name="DefaultSiteParser"/><type name="URLEntryModel"/><type name="FeatureModelFactory"/><type name="ContentEntryModel"/><type name="DefaultFeatureParser"/><type name="CategoryModel"/><type name="ImportModel"/><type name="IncludedFeatureReferenceModel"/><type name="InvalidSiteTypeException"/><type name="ArchiveReferenceModel"/></package><package name="org.eclipse.update.standalone"><type name="StandaloneUpdateApplication"/><type name="ScriptedCommand"/><type name="UpdateCommand"/><type name="UninstallCommand"/><type name="CmdLineArgs"/><type name="SearchCommand"/><type name="EnableCommand"/><type name="AddSiteCommand"/><type name="InstallCommand"/><type name="DisableCommand"/><type name="ListFeaturesCommand"/><type name="RemoveSiteCommand"/></package><package name="org.eclipse.update.configuration"><type name="IVolume" instantiate="false"/><type name="ILocalSystemInfoListener" instantiate="false"/><type name="IActivity" implement="false" subclass="false" instantiate="false"/><type name="IInstallConfigurationChangedListener" instantiate="false"/><type name="ILocalSite" instantiate="false"/><type name="ILocalSiteChangedListener" instantiate="false"/><type name="IConfiguredSite" instantiate="false"/><type name="IInstallDeltaHandler" instantiate="false"/><type name="IProblemHandler" instantiate="false"/><type name="IConfiguredSiteChangedListener" instantiate="false"/><type name="IInstallConfiguration" instantiate="false"/><type name="LocalSystemInfo" implement="false" subclass="false" instantiate="false"/><type name="ISessionDelta" instantiate="false"/></package><package name="org.eclipse.update.ui"><type name="UpdateJob"/><type name="UpdateManagerUI" implement="false" subclass="false" instantiate="false"/></package></component>

Lines 19-21 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
19	org.w3c.dom,	19	org.w3c.dom,
20	org.xml.sax,	20	org.xml.sax,
21	org.xml.sax.helpers	21	org.xml.sax.helpers
		22	Service-Component: OSGI-INF/bundleGroup.xml

Added Link Here

(-)OSGI-INF/bundleGroup.xml (+7 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.eclipse.update.configurator.bundlegroup">
3	<implementation class="org.eclipse.update.internal.configurator.BundleGroupComponent"/>
4	<service>
5	<provide interface="org.eclipse.core.runtime.IBundleGroupProvider"/>
6	</service>
7	</scr:component>




/*******************************************************************************
 * Copyright (c) 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.update.internal.configurator;

import org.eclipse.core.runtime.IBundleGroup;
import org.eclipse.core.runtime.IBundleGroupProvider;

/**
 * Declarative services component that provides an implementation of
 * {@link IBundleGroupProvider}. This allows the bundle group provider to be
 * made available in the service registry before this bundle has started.
 */
public class BundleGroupComponent implements IBundleGroupProvider {

	public IBundleGroup[] getBundleGroups() {
		return ConfigurationActivator.getConfigurator().getBundleGroups();
	}

	public String getName() {
		return ConfigurationActivator.getConfigurator().getName();
	}

}

Return to bug 239227

Added Link Here

(-)src/org/eclipse/update/internal/configurator/BundleGroupComponent.java (+31 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.update.internal.configurator;
12
13	import org.eclipse.core.runtime.IBundleGroup;
14	import org.eclipse.core.runtime.IBundleGroupProvider;
15
16	/**
17	* Declarative services component that provides an implementation of
18	* {@link IBundleGroupProvider}. This allows the bundle group provider to be
19	* made available in the service registry before this bundle has started.
20	*/
21	public class BundleGroupComponent implements IBundleGroupProvider {
22
23	public IBundleGroup[] getBundleGroups() {
24	return ConfigurationActivator.getConfigurator().getBundleGroups();
25	}
26
27	public String getName() {
28	return ConfigurationActivator.getConfigurator().getName();
29	}
30
31	}