diff options
| author | dj | 2011-11-03 15:24:21 +0000 |
|---|---|---|
| committer | dj | 2011-11-03 15:24:21 +0000 |
| commit | 6dac536bc05f48b1898134f47d1a7290ca283672 (patch) | |
| tree | d163f87e0794f857069aad9e85aa66a639d2051a | |
| parent | 4aac70df6e9a3891927c09ce94ac7f29195f0770 (diff) | |
| download | rt.equinox.p2-6dac536bc05f48b1898134f47d1a7290ca283672.tar.gz rt.equinox.p2-6dac536bc05f48b1898134f47d1a7290ca283672.tar.xz rt.equinox.p2-6dac536bc05f48b1898134f47d1a7290ca283672.zip | |
Added test case for bug 362692.
7 files changed, 893 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AbstractPlannerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AbstractPlannerTest.java index 76819b131..46758010b 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AbstractPlannerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AbstractPlannerTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2011 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 @@ -10,12 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.planner; -import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest; - import java.io.File; import java.lang.reflect.Field; -import java.util.Collection; -import java.util.Iterator; +import java.net.URI; +import java.util.*; +import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest; import org.eclipse.equinox.internal.p2.engine.*; import org.eclipse.equinox.p2.engine.*; import org.eclipse.equinox.p2.metadata.IInstallableUnit; @@ -42,6 +41,41 @@ public abstract class AbstractPlannerTest extends AbstractProvisioningTest { */ protected abstract String getProfileId(); + protected IProfile getProfile() { + return profile; + } + + /* + * Take the given plan and compress additons/removals so they look like updates. + * Good for viewing while debugging. + */ + protected Collection compress(IProvisioningPlan plan) { + Map<String, InstallableUnitOperand> result = new HashMap<String, InstallableUnitOperand>(); + Operand[] operands = ((ProvisioningPlan) plan).getOperands(); + for (int i = 0; i < operands.length; i++) { + if (!(operands[i] instanceof InstallableUnitOperand)) + continue; + InstallableUnitOperand operand = (InstallableUnitOperand) operands[i]; + String id = operand.first() == null ? operand.second().getId() : operand.first().getId(); + InstallableUnitOperand existing = result.get(id); + if (existing == null) { + result.put(id, operand); + } else { + IInstallableUnit first = existing.first() == null ? operand.first() : existing.first(); + IInstallableUnit second = existing.second() == null ? operand.second() : existing.second(); + result.put(id, new InstallableUnitOperand(first, second)); + } + } + return result.values(); + } + + protected ProvisioningContext getContext(Collection<URI> repoLocations) { + ProvisioningContext result = new ProvisioningContext(getAgent()); + result.setMetadataRepositories(repoLocations == null ? new URI[0] : repoLocations.toArray(new URI[repoLocations.size()])); + result.setArtifactRepositories(new URI[0]); + return result; + } + /* (non-Javadoc) * @see org.eclipse.equinox.p2.tests.AbstractProvisioningTest#setUp() */ diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug362692.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug362692.java new file mode 100644 index 000000000..71fe40b99 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug362692.java @@ -0,0 +1,128 @@ +/******************************************************************************* + * Copyright (c) 2011 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.equinox.p2.tests.planner; + +import java.net.URI; +import java.util.*; +import org.eclipse.core.runtime.*; +import org.eclipse.equinox.p2.engine.IProvisioningPlan; +import org.eclipse.equinox.p2.engine.ProvisioningContext; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.metadata.Version; +import org.eclipse.equinox.p2.planner.IPlanner; +import org.eclipse.equinox.p2.planner.IProfileChangeRequest; +import org.eclipse.equinox.p2.query.*; +import org.eclipse.equinox.p2.tests.TestActivator; + +public class Bug362692 extends AbstractPlannerTest { + + // path to our data + protected String getTestDataPath() { + return "testData/bug362692"; + } + + // profile id + protected String getProfileId() { + return "bootProfile"; + } + + public void testInstall() { + IPlanner planner = createPlanner(); + + // this is the set of IUs we expect in the final result - highest version only + Set<IInstallableUnit> expected = new HashSet<IInstallableUnit>(); + IQueryResult queryResult = repo.query(QueryUtil.createIUQuery("PluginA", Version.createOSGi(1, 1, 1, null)), new NullProgressMonitor()); + expected.addAll(queryResult.toSet()); + queryResult = repo.query(QueryUtil.createIUQuery("PluginB", Version.createOSGi(1, 1, 2, null)), new NullProgressMonitor()); + expected.addAll(queryResult.toSet()); + queryResult = repo.query(QueryUtil.createIUQuery("PluginC", Version.createOSGi(1, 1, 3, null)), new NullProgressMonitor()); + expected.addAll(queryResult.toSet()); + queryResult = repo.query(QueryUtil.createIUQuery("PluginD", Version.createOSGi(1, 1, 4, null)), new NullProgressMonitor()); + expected.addAll(queryResult.toSet()); + queryResult = repo.query(QueryUtil.createIUQuery("PluginE", Version.createOSGi(1, 1, 5, null)), new NullProgressMonitor()); + expected.addAll(queryResult.toSet()); + + // create the actual plan - install everything in the repo as optional (mimic the dropins folder) + Set<IInstallableUnit> toAdd = new HashSet<IInstallableUnit>(); + IQueryResult allIUs = repo.query(QueryUtil.createIUAnyQuery(), new NullProgressMonitor()); + // we don't want to re-install units which are already installed in the profile so remove them. (this is what the reconciler does) + for (Iterator<IInstallableUnit> iter = allIUs.iterator(); iter.hasNext();) { + IInstallableUnit iu = iter.next(); + queryResult = getProfile().query(QueryUtil.createIUQuery(iu.getId(), iu.getVersion()), new NullProgressMonitor()); + if (queryResult.isEmpty()) + toAdd.add(iu); + else + System.out.println("Already installed: " + iu.getId() + " " + iu.getVersion()); + } + validate(expected, toAdd); + + // set the metadata repositories on the provisioning context. one for the dropins and one for the shared area + Collection<URI> repoURLs = new ArrayList<URI>(); + repoURLs.add(repo.getLocation()); + repoURLs.add(new Path(getTestDataPath()).append("shared").toFile().toURI()); + ProvisioningContext context = getContext(repoURLs); + context.setExtraInstallableUnits(new ArrayList(toAdd)); + IProfileChangeRequest actualChangeRequest = createProfileChangeRequest(toAdd, null, null); + IProvisioningPlan plan = planner.getProvisioningPlan(actualChangeRequest, context, new NullProgressMonitor()); + Collection compressedPlan = compress(plan); + for (Iterator iter = compressedPlan.iterator(); iter.hasNext();) { + System.out.println("Plan: " + iter.next()); + } + validate(expected, plan); + } + + /* + * All of the expected IUs should either already be installed in the profile (and not be removed) + * or in the list of additions. + */ + private void validate(Collection<IInstallableUnit> expected, Collection<IInstallableUnit> toAdd) { + MultiStatus errors = new MultiStatus(TestActivator.PI_PROV_TESTS, IStatus.OK, "Errors while validating plan.", null); + for (IInstallableUnit unit : expected) { + IQuery query = QueryUtil.createIUQuery(unit.getId(), unit.getVersion()); + // already in the profile? + IQueryResult queryResult = getProfile().query(query, new NullProgressMonitor()); + if (queryResult.isEmpty()) { + // not in the profile, should be an incoming addition then + if (!toAdd.contains(unit)) { + errors.add(new Status(IStatus.ERROR, TestActivator.PI_PROV_TESTS, unit.getId() + " " + unit.getVersion() + " isn't in the profile and isn't an incoming addition.")); + } + } else { + // expected IU is already in the profile + } + } + assertOK("Errors while validating plan.", errors); + } + + /* + * All of the expected IUs should either already be installed in the profile (and not be removed) + * or in the plan as an addition. + */ + private void validate(Collection<IInstallableUnit> expected, IProvisioningPlan plan) { + MultiStatus errors = new MultiStatus(TestActivator.PI_PROV_TESTS, IStatus.OK, "Errors while validating plan.", null); + for (IInstallableUnit unit : expected) { + IQuery query = QueryUtil.createIUQuery(unit.getId(), unit.getVersion()); + // already in the profile? + IQueryResult queryResult = getProfile().query(query, new NullProgressMonitor()); + if (queryResult.isEmpty()) { + // not in the profile, should be an incoming addition then + if (plan.getAdditions().query(query, new NullProgressMonitor()).isEmpty()) { + errors.add(new Status(IStatus.ERROR, TestActivator.PI_PROV_TESTS, unit.getId() + " " + unit.getVersion() + " isn't in the profile and isn't an incoming addition.")); + } + } else { + // IU is in the profile, ensure we aren't removing it + if (!plan.getRemovals().query(query, new NullProgressMonitor()).isEmpty()) { + errors.add(new Status(IStatus.ERROR, TestActivator.PI_PROV_TESTS, unit.getId() + " " + unit.getVersion() + " is in the profile but is being removed.")); + } + } + } + assertOK("Errors while validating plan.", errors); + } +} diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320249157454.profile.gz b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320249157454.profile.gz Binary files differnew file mode 100644 index 000000000..65b983ea5 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320249157454.profile.gz diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320261982041.profile.gz b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320261982041.profile.gz Binary files differnew file mode 100644 index 000000000..f71be1daf --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320261982041.profile.gz diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320270552610.profile.gz b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320270552610.profile.gz Binary files differnew file mode 100644 index 000000000..e849296c9 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1320270552610.profile.gz diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/repo/content.xml b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/repo/content.xml new file mode 100644 index 000000000..538c76d72 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/repo/content.xml @@ -0,0 +1,726 @@ +<?xml version='1.0' encoding='UTF-8'?>
+<?metadataRepository version='1.1.0'?>
+<repository name='dropins metadata repo: file:/C:/Program%20Files%20(x86)/IBM/SDP/dropins/eclipse/' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
+ <properties size='2'>
+ <property name='p2.compressed' value='true'/>
+ <property name='p2.timestamp' value='1320247679237'/>
+ </properties>
+ <units size='25'>
+ <unit id='PluginD' version='1.0.0'>
+ <update id='PluginD' range='[0.0.0,1.0.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginD'/>
+ <property name='file.lastModified' value='1320162368903'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginD_1.0.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginD' version='1.0.0'/>
+ <provided namespace='osgi.bundle' name='PluginD' version='1.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginD' version='1.0.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugind.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginD
Bundle-Version: 1.0.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginD; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginD' version='1.1.0'>
+ <update id='PluginD' range='[0.0.0,1.1.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginD'/>
+ <property name='file.lastModified' value='1320162368918'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginD_1.1.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginD' version='1.1.0'/>
+ <provided namespace='osgi.bundle' name='PluginD' version='1.1.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginD' version='1.1.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugind.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginD
Bundle-Version: 1.1.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginD; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginD' version='1.1.1'>
+ <update id='PluginD' range='[0.0.0,1.1.1)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginD'/>
+ <property name='file.lastModified' value='1320162368934'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginD_1.1.1.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginD' version='1.1.1'/>
+ <provided namespace='osgi.bundle' name='PluginD' version='1.1.1'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginD' version='1.1.1'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugind.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginD
Bundle-Version: 1.1.1
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginD; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginD' version='1.1.2'>
+ <update id='PluginD' range='[0.0.0,1.1.2)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginD'/>
+ <property name='file.lastModified' value='1320162368934'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginD_1.1.2.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginD' version='1.1.2'/>
+ <provided namespace='osgi.bundle' name='PluginD' version='1.1.2'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginD' version='1.1.2'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugind.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginD
Bundle-Version: 1.1.2
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginD; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginD' version='1.1.3'>
+ <update id='PluginD' range='[0.0.0,1.1.3)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginD'/>
+ <property name='file.lastModified' value='1320162368949'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginD_1.1.3.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginD' version='1.1.3'/>
+ <provided namespace='osgi.bundle' name='PluginD' version='1.1.3'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginD' version='1.1.3'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugind.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginD
Bundle-Version: 1.1.3
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginD; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginD' version='1.1.4'>
+ <update id='PluginD' range='[0.0.0,1.1.4)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginD'/>
+ <property name='file.lastModified' value='1320162368949'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginD_1.1.4.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginD' version='1.1.4'/>
+ <provided namespace='osgi.bundle' name='PluginD' version='1.1.4'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginD' version='1.1.4'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugind.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginD
Bundle-Version: 1.1.4
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginD; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginB' version='1.0.0'>
+ <update id='PluginB' range='[0.0.0,1.0.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginB'/>
+ <property name='file.lastModified' value='1320162368840'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginB_1.0.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginB' version='1.0.0'/>
+ <provided namespace='osgi.bundle' name='PluginB' version='1.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginB' version='1.0.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginb.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginB
Bundle-Version: 1.0.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginB; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginB' version='1.1.0'>
+ <update id='PluginB' range='[0.0.0,1.1.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginB'/>
+ <property name='file.lastModified' value='1320162368840'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginB_1.1.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginB' version='1.1.0'/>
+ <provided namespace='osgi.bundle' name='PluginB' version='1.1.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='4'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginC' range='1.1.0'/>
+ <required namespace='osgi.bundle' name='PluginD' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginB' version='1.1.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginb.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginC;bundle-version="1.1.0",PluginD;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginB
Bundle-Version: 1.1.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginB; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginB' version='1.1.1'>
+ <update id='PluginB' range='[0.0.0,1.1.1)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginB'/>
+ <property name='file.lastModified' value='1320162368856'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginB_1.1.1.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginB' version='1.1.1'/>
+ <provided namespace='osgi.bundle' name='PluginB' version='1.1.1'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='4'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginC' range='1.1.0'/>
+ <required namespace='osgi.bundle' name='PluginD' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginB' version='1.1.1'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginb.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginC;bundle-version="1.1.0",PluginD;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginB
Bundle-Version: 1.1.1
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginB; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginB' version='1.1.2'>
+ <update id='PluginB' range='[0.0.0,1.1.2)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginB'/>
+ <property name='file.lastModified' value='1320162368856'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginB_1.1.2.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginB' version='1.1.2'/>
+ <provided namespace='osgi.bundle' name='PluginB' version='1.1.2'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='4'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginC' range='1.1.0'/>
+ <required namespace='osgi.bundle' name='PluginD' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginB' version='1.1.2'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginb.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginC;bundle-version="1.1.0",PluginD;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginB
Bundle-Version: 1.1.2
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginB; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginE' version='1.0.0'>
+ <update id='PluginE' range='[0.0.0,1.0.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginE'/>
+ <property name='file.lastModified' value='1320162368965'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginE_1.0.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginE' version='1.0.0'/>
+ <provided namespace='osgi.bundle' name='PluginE' version='1.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginE' version='1.0.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugine.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginE
Bundle-Version: 1.0.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginE; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginE' version='1.1.0'>
+ <update id='PluginE' range='[0.0.0,1.1.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginE'/>
+ <property name='file.lastModified' value='1320162368965'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginE_1.1.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginE' version='1.1.0'/>
+ <provided namespace='osgi.bundle' name='PluginE' version='1.1.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginE' version='1.1.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugine.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginE
Bundle-Version: 1.1.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginE; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginE' version='1.1.1'>
+ <update id='PluginE' range='[0.0.0,1.1.1)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginE'/>
+ <property name='file.lastModified' value='1320162368981'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginE_1.1.1.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginE' version='1.1.1'/>
+ <provided namespace='osgi.bundle' name='PluginE' version='1.1.1'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginE' version='1.1.1'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugine.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginE
Bundle-Version: 1.1.1
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginE; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginE' version='1.1.2'>
+ <update id='PluginE' range='[0.0.0,1.1.2)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginE'/>
+ <property name='file.lastModified' value='1320162368981'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginE_1.1.2.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginE' version='1.1.2'/>
+ <provided namespace='osgi.bundle' name='PluginE' version='1.1.2'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginE' version='1.1.2'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugine.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginE
Bundle-Version: 1.1.2
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginE; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginE' version='1.1.3'>
+ <update id='PluginE' range='[0.0.0,1.1.3)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginE'/>
+ <property name='file.lastModified' value='1320162368996'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginE_1.1.3.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginE' version='1.1.3'/>
+ <provided namespace='osgi.bundle' name='PluginE' version='1.1.3'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginE' version='1.1.3'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugine.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginE
Bundle-Version: 1.1.3
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginE; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginE' version='1.1.4'>
+ <update id='PluginE' range='[0.0.0,1.1.4)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginE'/>
+ <property name='file.lastModified' value='1320162368996'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginE_1.1.4.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginE' version='1.1.4'/>
+ <provided namespace='osgi.bundle' name='PluginE' version='1.1.4'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginE' version='1.1.4'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugine.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginE
Bundle-Version: 1.1.4
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginE; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginE' version='1.1.5'>
+ <update id='PluginE' range='[0.0.0,1.1.5)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginE'/>
+ <property name='file.lastModified' value='1320162369012'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginE_1.1.5.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginE' version='1.1.5'/>
+ <provided namespace='osgi.bundle' name='PluginE' version='1.1.5'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginE' version='1.1.5'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugine.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginE
Bundle-Version: 1.1.5
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginE; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginC' version='1.0.0'>
+ <update id='PluginC' range='[0.0.0,1.0.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginC'/>
+ <property name='file.lastModified' value='1320162368871'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginC_1.0.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginC' version='1.0.0'/>
+ <provided namespace='osgi.bundle' name='PluginC' version='1.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginC' version='1.0.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginc.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginC
Bundle-Version: 1.0.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginC; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginC' version='1.1.0'>
+ <update id='PluginC' range='[0.0.0,1.1.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginC'/>
+ <property name='file.lastModified' value='1320162368871'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginC_1.1.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginC' version='1.1.0'/>
+ <provided namespace='osgi.bundle' name='PluginC' version='1.1.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='4'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginD' range='1.1.0'/>
+ <required namespace='osgi.bundle' name='PluginE' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginC' version='1.1.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginc.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginD;bundle-version="1.1.0",PluginE;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginC
Bundle-Version: 1.1.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginC; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginC' version='1.1.1'>
+ <update id='PluginC' range='[0.0.0,1.1.1)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginC'/>
+ <property name='file.lastModified' value='1320162368887'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginC_1.1.1.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginC' version='1.1.1'/>
+ <provided namespace='osgi.bundle' name='PluginC' version='1.1.1'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='4'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginD' range='1.1.0'/>
+ <required namespace='osgi.bundle' name='PluginE' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginC' version='1.1.1'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginc.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginD;bundle-version="1.1.0",PluginE;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginC
Bundle-Version: 1.1.1
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginC; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginC' version='1.1.2'>
+ <update id='PluginC' range='[0.0.0,1.1.2)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginC'/>
+ <property name='file.lastModified' value='1320162368887'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginC_1.1.2.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginC' version='1.1.2'/>
+ <provided namespace='osgi.bundle' name='PluginC' version='1.1.2'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='4'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginD' range='1.1.0'/>
+ <required namespace='osgi.bundle' name='PluginE' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginC' version='1.1.2'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginc.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginD;bundle-version="1.1.0",PluginE;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginC
Bundle-Version: 1.1.2
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginC; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginC' version='1.1.3'>
+ <update id='PluginC' range='[0.0.0,1.1.3)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginC'/>
+ <property name='file.lastModified' value='1320162368903'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginC_1.1.3.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginC' version='1.1.3'/>
+ <provided namespace='osgi.bundle' name='PluginC' version='1.1.3'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='4'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginD' range='1.1.0'/>
+ <required namespace='osgi.bundle' name='PluginE' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginC' version='1.1.3'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: pluginc.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginD;bundle-version="1.1.0",PluginE;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginC
Bundle-Version: 1.1.3
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginC; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginA' version='1.0.0'>
+ <update id='PluginA' range='[0.0.0,1.0.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginA'/>
+ <property name='file.lastModified' value='1320162368793'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginA_1.0.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginA' version='1.0.0'/>
+ <provided namespace='osgi.bundle' name='PluginA' version='1.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='2'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginA' version='1.0.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugina.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginA
Bundle-Version: 1.0.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginA; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginA' version='1.1.0'>
+ <update id='PluginA' range='[0.0.0,1.1.0)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginA'/>
+ <property name='file.lastModified' value='1320162368809'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginA_1.1.0.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginA' version='1.1.0'/>
+ <provided namespace='osgi.bundle' name='PluginA' version='1.1.0'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='3'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginB' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginA' version='1.1.0'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugina.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginB;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginA
Bundle-Version: 1.1.0
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginA; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ <unit id='PluginA' version='1.1.1'>
+ <update id='PluginA' range='[0.0.0,1.1.1)' severity='0'/>
+ <properties size='3'>
+ <property name='org.eclipse.equinox.p2.name' value='PluginA'/>
+ <property name='file.lastModified' value='1320162368825'/>
+ <property name='file.name' value='C:\Program Files (x86)\IBM\SDP\dropins\eclipse\plugins\PluginA_1.1.1.jar'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='PluginA' version='1.1.1'/>
+ <provided namespace='osgi.bundle' name='PluginA' version='1.1.1'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+ </provides>
+ <requires size='3'>
+ <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+ <required namespace='osgi.bundle' name='PluginB' range='1.1.0'/>
+ </requires>
+ <artifacts size='1'>
+ <artifact classifier='osgi.bundle' id='PluginA' version='1.1.1'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='manifest'>
+ Bundle-Activator: plugina.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,PluginB;bundle-version="1.1.0"
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Name: PluginA
Bundle-Version: 1.1.1
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-SymbolicName: PluginA; singleton:=true

+ </instruction>
+ </instructions>
+ </touchpointData>
+ </unit>
+ </units>
+</repository>
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/shared/content.jar b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/shared/content.jar Binary files differnew file mode 100644 index 000000000..b9e7d49dd --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/bug362692/shared/content.jar |