### Eclipse Workspace Patch 1.0 #P org.eclipse.equinox.p2.metadata Index: META-INF/MANIFEST.MF =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF,v retrieving revision 1.40 diff -u -r1.40 MANIFEST.MF --- META-INF/MANIFEST.MF 9 Apr 2010 11:00:02 -0000 1.40 +++ META-INF/MANIFEST.MF 2 Dec 2010 22:13:41 -0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.1.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.MetadataActivator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -19,7 +19,8 @@ org.eclipse.equinox.p2.operations, org.eclipse.equinox.p2.publisher, org.eclipse.equinox.p2.ql, - org.eclipse.equinox.p2.ui", + org.eclipse.equinox.p2.ui, + org.eclipse.equinox.p2.touchpoint.eclipse", org.eclipse.equinox.internal.p2.metadata.expression; x-friends:="org.eclipse.equinox.p2.artifact.repository, org.eclipse.equinox.p2.directorywatcher, #P org.eclipse.equinox.p2.tests Index: src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java,v retrieving revision 1.13 diff -u -r1.13 MarkStartedActionTest.java --- src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java 4 Mar 2010 17:13:57 -0000 1.13 +++ src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java 2 Dec 2010 22:13:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2010 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 @@ -75,7 +75,7 @@ Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR); assertNotNull(manipulator); - BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, Util.getManifest(iu.getTouchpointData())); + BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu); manipulator.getConfigData().addBundle(bundleInfo); assertTrue(isMarkedStarted(manipulator, osgiTarget, false)); @@ -121,7 +121,7 @@ Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR); assertNotNull(manipulator); - BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, Util.getManifest(iu.getTouchpointData())); + BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu); manipulator.getConfigData().addBundle(bundleInfo); assertTrue(isMarkedStarted(manipulator, osgiTarget, false)); @@ -170,7 +170,7 @@ Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR); assertNotNull(manipulator); - BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, Util.getManifest(iu.getTouchpointData())); + BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu); manipulator.getConfigData().addBundle(bundleInfo); assertTrue(isMarkedStarted(manipulator, osgiTarget, false)); Index: src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java,v retrieving revision 1.13 diff -u -r1.13 SetStartLevelActionTest.java --- src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java 4 Mar 2010 17:13:57 -0000 1.13 +++ src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java 2 Dec 2010 22:13:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2010 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 @@ -75,7 +75,7 @@ Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR); assertNotNull(manipulator); - BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, Util.getManifest(iu.getTouchpointData())); + BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu); manipulator.getConfigData().addBundle(bundleInfo); assertTrue(isStartLevel(manipulator, osgiTarget, -1)); @@ -121,7 +121,7 @@ Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR); assertNotNull(manipulator); - BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, Util.getManifest(iu.getTouchpointData())); + BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu); manipulator.getConfigData().addBundle(bundleInfo); assertTrue(isStartLevel(manipulator, osgiTarget, -1)); @@ -170,7 +170,7 @@ Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR); assertNotNull(manipulator); - BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, Util.getManifest(iu.getTouchpointData())); + BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu); manipulator.getConfigData().addBundle(bundleInfo); assertTrue(isStartLevel(manipulator, osgiTarget, -1)); Index: src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java,v retrieving revision 1.11 diff -u -r1.11 UninstallBundleActionTest.java --- src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java 4 Mar 2010 17:13:57 -0000 1.11 +++ src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java 2 Dec 2010 22:13:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2010 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 @@ -75,7 +75,7 @@ Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR); assertNotNull(manipulator); - BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, Util.getManifest(iu.getTouchpointData())); + BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu); manipulator.getConfigData().addBundle(bundleInfo); assertTrue(inBundles(manipulator, osgiTarget)); UninstallBundleAction action = new UninstallBundleAction(); Index: src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java,v retrieving revision 1.11 diff -u -r1.11 UtilTest.java --- src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java 8 Mar 2010 18:40:05 -0000 1.11 +++ src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java 2 Dec 2010 22:13:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2010 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 @@ -12,15 +12,12 @@ import java.io.File; import java.net.MalformedURLException; -import java.util.Collections; import java.util.Properties; import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util; import org.eclipse.equinox.p2.core.IAgentLocation; import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.ITouchpointData; -import org.eclipse.equinox.p2.metadata.MetadataFactory; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; /** @@ -54,9 +51,4 @@ IProfile profile = createProfile("test", props); assertEquals(cacheDir.toURL().toExternalForm(), Util.getBundlePoolLocation(getAgent(), profile).toString()); } - - public void testMissingManifest() { - ITouchpointData emptyData = MetadataFactory.createTouchpointData(Collections.EMPTY_MAP); - assertNull(Util.getManifest(Collections.singletonList(emptyData))); - } } #P org.eclipse.equinox.p2.touchpoint.eclipse Index: META-INF/MANIFEST.MF =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF,v retrieving revision 1.50.2.2 diff -u -r1.50.2.2 MANIFEST.MF --- META-INF/MANIFEST.MF 25 Jun 2010 18:43:57 -0000 1.50.2.2 +++ META-INF/MANIFEST.MF 2 Dec 2010 22:13:45 -0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.eclipse;singleton:=true -Bundle-Version: 2.0.2.qualifier +Bundle-Version: 2.0.3.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.eclipse.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -20,6 +20,7 @@ org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.engine, org.eclipse.equinox.internal.p2.garbagecollector, + org.eclipse.equinox.internal.p2.metadata, org.eclipse.equinox.internal.provisional.frameworkadmin, org.eclipse.equinox.internal.provisional.p2.director;resolution:=optional, org.eclipse.equinox.internal.provisional.p2.repository, Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java,v retrieving revision 1.79 diff -u -r1.79 Util.java --- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java 29 Mar 2010 21:10:34 -0000 1.79 +++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java 2 Dec 2010 22:13:45 -0000 @@ -12,12 +12,14 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.touchpoint.eclipse; -import java.io.*; +import java.io.File; +import java.io.IOException; import java.net.*; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.frameworkadmin.BundleInfo; import org.eclipse.equinox.internal.p2.core.helpers.*; +import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability; import org.eclipse.equinox.p2.core.*; import org.eclipse.equinox.p2.engine.IProfile; import org.eclipse.equinox.p2.metadata.*; @@ -25,10 +27,7 @@ import org.eclipse.equinox.p2.repository.artifact.*; import org.eclipse.osgi.service.datalocation.Location; import org.eclipse.osgi.service.environment.EnvironmentInfo; -import org.eclipse.osgi.util.ManifestElement; import org.eclipse.osgi.util.NLS; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; public class Util { @@ -157,43 +156,48 @@ return listProperty; } - public static BundleInfo createBundleInfo(File bundleFile, String manifest) { + public static BundleInfo createBundleInfo(File bundleFile, IInstallableUnit unit) { BundleInfo bundleInfo = new BundleInfo(); if (bundleFile != null) bundleInfo.setLocation(bundleFile.toURI()); - bundleInfo.setManifest(manifest); - try { - @SuppressWarnings("unchecked") - Map headers = ManifestElement.parseBundleManifest(new ByteArrayInputStream(manifest.getBytes("UTF-8")), new HashMap()); //$NON-NLS-1$ - ManifestElement[] element = ManifestElement.parseHeader("bsn", headers.get(Constants.BUNDLE_SYMBOLICNAME)); //$NON-NLS-1$ - if (element == null || element.length == 0) - return null; - bundleInfo.setSymbolicName(element[0].getValue()); - - String version = headers.get(Constants.BUNDLE_VERSION); - if (version == null) - return null; - // convert to a Version object first to ensure we are consistent with our version number w.r.t. - // padding zeros at the end - bundleInfo.setVersion(Version.parseVersion(version).toString()); - - String fragmentHost = headers.get(Constants.FRAGMENT_HOST); - if (fragmentHost != null) - bundleInfo.setFragmentHost(fragmentHost.trim()); - - } catch (BundleException e) { - // unexpected - LogHelper.log(new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e)); - return null; - } catch (IOException e) { - // unexpected - LogHelper.log(new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e)); - return null; + Collection capabilities = unit.getProvidedCapabilities(); + for (IProvidedCapability capability : capabilities) { + String nameSpace = capability.getNamespace(); + if (nameSpace.equals("osgi.bundle")) { //$NON-NLS-1$ + bundleInfo.setSymbolicName(capability.getName()); + bundleInfo.setVersion(capability.getVersion().toString()); + } else if (nameSpace.equals("osgi.fragment")) { //$NON-NLS-1$ + String fragmentName = capability.getName(); + String fragmentHost = getFragmentHost(unit, fragmentName); + // shouldn't happen as long as the metadata is well-formed + if (fragmentHost == null) + LogHelper.log(createError("Unable to find fragment host for IU: " + unit)); //$NON-NLS-1$ + else + bundleInfo.setFragmentHost(fragmentHost); + bundleInfo.setVersion(capability.getVersion().toString()); + } } return bundleInfo; } + private static String getFragmentHost(IInstallableUnit unit, String fragmentName) { + Collection requires = unit.getRequirements(); + for (IRequirement iRequirement : requires) { + if (iRequirement instanceof IRequiredCapability) { + IRequiredCapability requiredCapability = (IRequiredCapability) iRequirement; + if (fragmentName.equals(requiredCapability.getName())) { + String fragmentHost = requiredCapability.getName(); + if (!requiredCapability.getRange().toString().equals("0.0.0")) { //$NON-NLS-1$ + fragmentHost += ";bundle-version=\"" + requiredCapability.getRange() + '"'; //$NON-NLS-1$ + } + return fragmentHost; + } + } + } + return null; + } + public static File getArtifactFile(IProvisioningAgent agent, IArtifactKey artifactKey, IProfile profile) { IFileArtifactRepository aggregatedView = getAggregatedBundleRepository(agent, profile); File bundleJar = aggregatedView.getArtifactFile(artifactKey); @@ -314,18 +318,6 @@ return null; } - public static String getManifest(Collection data) { - for (ITouchpointData td : data) { - ITouchpointInstruction manifestInstruction = td.getInstruction("manifest"); //$NON-NLS-1$ - if (manifestInstruction == null) - return null; - String manifest = manifestInstruction.getBody(); - if (manifest != null && manifest.length() > 0) - return manifest; - } - return null; - } - public static IStatus createError(String message) { return createError(message, null); } Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java,v retrieving revision 1.4 diff -u -r1.4 InstallBundleAction.java --- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java 4 Mar 2010 17:13:55 -0000 1.4 +++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java 2 Dec 2010 22:13:45 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. All rights reserved. This + * Copyright (c) 2008, 2010 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 @@ -69,12 +69,7 @@ if (bundleFile == null || !bundleFile.exists()) return Util.createError(NLS.bind(Messages.artifact_file_not_found, artifactKey)); - //By now we always have the manifest in the touchpoint data - String manifest = Util.getManifest(iu.getTouchpointData()); - if (manifest == null) - return Util.createError(NLS.bind(Messages.missing_manifest, iu)); - - BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest); + BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu); if (bundleInfo == null) return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu)); manipulator.getConfigData().addBundle(bundleInfo); Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java,v retrieving revision 1.7 diff -u -r1.7 MarkStartedAction.java --- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java 4 Mar 2010 17:13:55 -0000 1.7 +++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java 2 Dec 2010 22:13:45 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2010 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 @@ -47,11 +47,7 @@ // the bundleFile might be null here, that's OK. File bundleFile = Util.getArtifactFile(agent, artifactKey, profile); - String manifest = Util.getManifest(iu.getTouchpointData()); - if (manifest == null) - return Util.createError(NLS.bind(Messages.missing_manifest, iu)); - - BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest); + BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu); if (bundleInfo == null) return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu)); @@ -87,11 +83,7 @@ // the bundleFile might be null here, that's OK. File bundleFile = Util.getArtifactFile(agent, artifactKey, profile); - String manifest = Util.getManifest(iu.getTouchpointData()); - if (manifest == null) - return Util.createError(NLS.bind(Messages.missing_manifest, iu)); - - BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest); + BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu); if (bundleInfo == null) return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu)); Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java,v retrieving revision 1.7 diff -u -r1.7 SetStartLevelAction.java --- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java 4 Mar 2010 17:13:55 -0000 1.7 +++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java 2 Dec 2010 22:13:45 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2010 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 @@ -46,11 +46,7 @@ // the bundleFile might be null here, that's OK. File bundleFile = Util.getArtifactFile(agent, artifactKey, profile); - String manifest = Util.getManifest(iu.getTouchpointData()); - if (manifest == null) - return Util.createError(NLS.bind(Messages.missing_manifest, iu)); - - BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest); + BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu); if (bundleInfo == null) return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu)); @@ -90,11 +86,7 @@ // the bundleFile might be null here, that's OK. File bundleFile = Util.getArtifactFile(agent, artifactKey, profile); - String manifest = Util.getManifest(iu.getTouchpointData()); - if (manifest == null) - return Util.createError(NLS.bind(Messages.missing_manifest, iu)); - - BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest); + BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu); if (bundleInfo == null) return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu)); Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java =================================================================== RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java,v retrieving revision 1.4 diff -u -r1.4 UninstallBundleAction.java --- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java 4 Mar 2010 17:13:55 -0000 1.4 +++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java 2 Dec 2010 22:13:45 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. All rights reserved. This + * Copyright (c) 2008, 2010 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 @@ -68,11 +68,7 @@ // the bundleFile might be null here, that's OK. File bundleFile = Util.getArtifactFile(agent, artifactKey, profile); - String manifest = Util.getManifest(iu.getTouchpointData()); - if (manifest == null) - return Util.createError(NLS.bind(Messages.missing_manifest, iu)); - - BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest); + BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu); if (bundleInfo == null) return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu)); manipulator.getConfigData().removeBundle(bundleInfo);