Attachment #183346 for bug #330463

Lines 19-25 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
19	org.eclipse.equinox.p2.operations,	19	org.eclipse.equinox.p2.operations,
20	org.eclipse.equinox.p2.publisher,	20	org.eclipse.equinox.p2.publisher,
21	org.eclipse.equinox.p2.ql,	21	org.eclipse.equinox.p2.ql,
22	org.eclipse.equinox.p2.ui",	22	org.eclipse.equinox.p2.ui,
		23	org.eclipse.equinox.p2.touchpoint.eclipse",
23	org.eclipse.equinox.internal.p2.metadata.expression;	24	org.eclipse.equinox.internal.p2.metadata.expression;
24	x-friends:="org.eclipse.equinox.p2.artifact.repository,	25	x-friends:="org.eclipse.equinox.p2.artifact.repository,
25	org.eclipse.equinox.p2.directorywatcher,	26	org.eclipse.equinox.p2.directorywatcher,

Lines 135-141 Link Here

(-)src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java (-1 / +1 lines)
135	private static IMatchExpression<IInstallableUnit> filter = InstallableUnit.parseFilter("(& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))"); // not really	135	private static IMatchExpression<IInstallableUnit> filter = InstallableUnit.parseFilter("(& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))"); // not really
136	private static String id = "org.eclipse.osgi.services";	136	private static String id = "org.eclipse.osgi.services";
137		137
138	private static String[][] instructions = new String[][] {new String[] {"manifest", "Manifest-Version: 1.0\\Bundle-Vendor: Eclipse.org\\Bundle-ContactAddress: www.eclipse.org\\...a whole bunch of other manifest content..."}, new String[] {"zipped", "true"}, //	138	private static String[][] instructions = new String[][] {new String[] {"zipped", "true"}, //
139	new String[] {"configure", "addProgramArg(programArg:-startup);addProgramArg(programArg:@artifact);"}}; //	139	new String[] {"configure", "addProgramArg(programArg:-startup);addProgramArg(programArg:@artifact);"}}; //
140		140
141	private static String IU_TEST_ELEMENT = "test";	141	private static String IU_TEST_ELEMENT = "test";




		Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
		assertNotNull(manipulator);

		BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu);
		manipulator.getConfigData().addBundle(bundleInfo);
		assertTrue(isMarkedStarted(manipulator, osgiTarget, false));


		Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
		assertNotNull(manipulator);

		BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu);
		manipulator.getConfigData().addBundle(bundleInfo);
		assertTrue(isMarkedStarted(manipulator, osgiTarget, false));


		Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
		assertNotNull(manipulator);

		BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu);
		manipulator.getConfigData().addBundle(bundleInfo);
		assertTrue(isMarkedStarted(manipulator, osgiTarget, false));





		Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
		assertNotNull(manipulator);

		BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu);
		manipulator.getConfigData().addBundle(bundleInfo);
		assertTrue(isStartLevel(manipulator, osgiTarget, -1));


		Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
		assertNotNull(manipulator);

		BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu);
		manipulator.getConfigData().addBundle(bundleInfo);
		assertTrue(isStartLevel(manipulator, osgiTarget, -1));


		Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
		assertNotNull(manipulator);

		BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu);
		manipulator.getConfigData().addBundle(bundleInfo);
		assertTrue(isStartLevel(manipulator, osgiTarget, -1));


Lines 75-81 Link Here

(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java (-1 / +1 lines)
75	Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);	75	Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
76	assertNotNull(manipulator);	76	assertNotNull(manipulator);
77		77
78	BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, Util.getManifest(iu.getTouchpointData()));	78	BundleInfo bundleInfo = Util.createBundleInfo(osgiTarget, iu);
79	manipulator.getConfigData().addBundle(bundleInfo);	79	manipulator.getConfigData().addBundle(bundleInfo);
80	assertTrue(inBundles(manipulator, osgiTarget));	80	assertTrue(inBundles(manipulator, osgiTarget));
81	UninstallBundleAction action = new UninstallBundleAction();	81	UninstallBundleAction action = new UninstallBundleAction();





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;

/**

		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)));
	}
}

Lines 20-25 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
20	org.eclipse.equinox.internal.p2.core.helpers,	20	org.eclipse.equinox.internal.p2.core.helpers,
21	org.eclipse.equinox.internal.p2.engine,	21	org.eclipse.equinox.internal.p2.engine,
22	org.eclipse.equinox.internal.p2.garbagecollector,	22	org.eclipse.equinox.internal.p2.garbagecollector,
		23	org.eclipse.equinox.internal.p2.metadata,
23	org.eclipse.equinox.internal.provisional.frameworkadmin,	24	org.eclipse.equinox.internal.provisional.frameworkadmin,
24	org.eclipse.equinox.internal.provisional.p2.repository,	25	org.eclipse.equinox.internal.provisional.p2.repository,
25	org.eclipse.equinox.internal.simpleconfigurator.manipulator,	26	org.eclipse.equinox.internal.simpleconfigurator.manipulator,




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

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.*;

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 {


		return listProperty;
	}

	public static BundleInfo createBundleInfo(File bundleFile, IInstallableUnit unit) {
		BundleInfo bundleInfo = new BundleInfo();
		if (bundleFile != null)
			bundleInfo.setLocation(bundleFile.toURI());

		Collection<IProvidedCapability> capabilities = unit.getProvidedCapabilities();
		for (IProvidedCapability capability : capabilities) {
			String nameSpace = capability.getNamespace();
			if (nameSpace.equals("osgi.bundle")) { //$NON-NLS-1$
				bundleInfo.setSymbolicName(capability.getName());
			} else if (nameSpace.equals("osgi.fragment")) { //$NON-NLS-1$
				String fragmentName = capability.getName();
				bundleInfo.setFragmentHost(getFragmentHost(unit, fragmentName));
			}
			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;
		}

		bundleInfo.setVersion(unit.getVersion().toString());

		return bundleInfo;
	}

	private static String getFragmentHost(IInstallableUnit unit, String fragmentName) {
		Collection<IRequirement> 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);

		return null;
	}

	public static String getManifest(Collection<ITouchpointData> 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);
	}




		if (bundleFile == null || !bundleFile.exists())
			return Util.createError(NLS.bind(Messages.artifact_file_not_found, artifactKey));

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
		String manifest = Util.getManifest(iu.getTouchpointData());
		if (manifest == null)
			return Util.createError(NLS.bind(Messages.missing_manifest, iu));

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
		if (bundleInfo == null)
			return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
		manipulator.getConfigData().addBundle(bundleInfo);




		// the bundleFile might be null here, that's OK.
		File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
		if (manifest == null)
			return Util.createError(NLS.bind(Messages.missing_manifest, iu));

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
		if (bundleInfo == null)
			return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));


		// the bundleFile might be null here, that's OK.
		File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
		if (manifest == null)
			return Util.createError(NLS.bind(Messages.missing_manifest, iu));

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
		if (bundleInfo == null)
			return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));





		// the bundleFile might be null here, that's OK.
		File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
		if (manifest == null)
			return Util.createError(NLS.bind(Messages.missing_manifest, iu));

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
		if (bundleInfo == null)
			return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));


		// the bundleFile might be null here, that's OK.
		File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
		if (manifest == null)
			return Util.createError(NLS.bind(Messages.missing_manifest, iu));

		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
		if (bundleInfo == null)
			return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));


Lines 68-78 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java (-5 / +1 lines)
68	// the bundleFile might be null here, that's OK.	68	// the bundleFile might be null here, that's OK.
69	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);	69	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
70		70
71	String manifest = Util.getManifest(iu.getTouchpointData());	71	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
72	if (manifest == null)
73	return Util.createError(NLS.bind(Messages.missing_manifest, iu));
74
75	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
76	if (bundleInfo == null)	72	if (bundleInfo == null)
77	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));	73	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
78	manipulator.getConfigData().removeBundle(bundleInfo);	74	manipulator.getConfigData().removeBundle(bundleInfo);

Return to bug 330463

Lines 47-57 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java (-10 / +2 lines)
47	// the bundleFile might be null here, that's OK.	47	// the bundleFile might be null here, that's OK.
48	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);	48	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
49		49
50	String manifest = Util.getManifest(iu.getTouchpointData());	50	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
51	if (manifest == null)
52	return Util.createError(NLS.bind(Messages.missing_manifest, iu));
53
54	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
55	if (bundleInfo == null)	51	if (bundleInfo == null)
56	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));	52	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
57		53
Lines 87-97 Link Here
87	// the bundleFile might be null here, that's OK.	83	// the bundleFile might be null here, that's OK.
88	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);	84	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
89		85
90	String manifest = Util.getManifest(iu.getTouchpointData());	86	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
91	if (manifest == null)
92	return Util.createError(NLS.bind(Messages.missing_manifest, iu));
93
94	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
95	if (bundleInfo == null)	87	if (bundleInfo == null)
96	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));	88	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
97		89

Lines 46-56 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java (-10 / +2 lines)
46	// the bundleFile might be null here, that's OK.	46	// the bundleFile might be null here, that's OK.
47	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);	47	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
48		48
49	String manifest = Util.getManifest(iu.getTouchpointData());	49	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
50	if (manifest == null)
51	return Util.createError(NLS.bind(Messages.missing_manifest, iu));
52
53	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
54	if (bundleInfo == null)	50	if (bundleInfo == null)
55	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));	51	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
56		52
Lines 90-100 Link Here
90	// the bundleFile might be null here, that's OK.	86	// the bundleFile might be null here, that's OK.
91	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);	87	File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
92		88
93	String manifest = Util.getManifest(iu.getTouchpointData());	89	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
94	if (manifest == null)
95	return Util.createError(NLS.bind(Messages.missing_manifest, iu));
96
97	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
98	if (bundleInfo == null)	90	if (bundleInfo == null)
99	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));	91	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
100		92

Lines 11-21 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java (-6 / +3 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.metadata.repository;	12	package org.eclipse.equinox.internal.p2.metadata.repository;
13		13
14	import org.eclipse.equinox.p2.repository.IRepositoryReference;
15
16	import org.eclipse.equinox.p2.query.QueryUtil;
17
18
19	import java.io.*;	14	import java.io.*;
20	import java.lang.reflect.Constructor;	15	import java.lang.reflect.Constructor;
21	import java.net.MalformedURLException;	16	import java.net.MalformedURLException;
Lines 32-37 Link Here
32	import org.eclipse.equinox.p2.core.IProvisioningAgent;	27	import org.eclipse.equinox.p2.core.IProvisioningAgent;
33	import org.eclipse.equinox.p2.core.ProvisionException;	28	import org.eclipse.equinox.p2.core.ProvisionException;
34	import org.eclipse.equinox.p2.metadata.*;	29	import org.eclipse.equinox.p2.metadata.*;
		30	import org.eclipse.equinox.p2.query.QueryUtil;
		31	import org.eclipse.equinox.p2.repository.IRepositoryReference;
35	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;	32	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
36	import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository;	33	import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository;
37	import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository.RepositoryState;	34	import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository.RepositoryState;
Lines 107-113 Link Here
107	// A format version number for metadata repository XML.	104	// A format version number for metadata repository XML.
108	public static final Version COMPATIBLE_VERSION = Version.createOSGi(1, 0, 0);	105	public static final Version COMPATIBLE_VERSION = Version.createOSGi(1, 0, 0);
109	public static final Version CURRENT_VERSION = Version.createOSGi(1, 1, 0);	106	public static final Version CURRENT_VERSION = Version.createOSGi(1, 1, 0);
110	public static final VersionRange XML_TOLERANCE = new VersionRange(COMPATIBLE_VERSION, true, Version.createOSGi(2, 0, 0), false);	107	public static final VersionRange XML_TOLERANCE = new VersionRange(COMPATIBLE_VERSION, true, Version.createOSGi(3, 0, 0), false);
111		108
112	// Constants for processing Instructions	109	// Constants for processing Instructions
113	public static final String PI_REPOSITORY_TARGET = "metadataRepository"; //$NON-NLS-1$	110	public static final String PI_REPOSITORY_TARGET = "metadataRepository"; //$NON-NLS-1$

Lines 12-26 Link Here

(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java (-8 lines)
12		12
13	import java.io.File;	13	import java.io.File;
14	import java.net.MalformedURLException;	14	import java.net.MalformedURLException;
15	import java.util.Collections;
16	import java.util.Properties;	15	import java.util.Properties;
17	import junit.framework.Test;	16	import junit.framework.Test;
18	import junit.framework.TestSuite;	17	import junit.framework.TestSuite;
19	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;	18	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
20	import org.eclipse.equinox.p2.core.IAgentLocation;	19	import org.eclipse.equinox.p2.core.IAgentLocation;
21	import org.eclipse.equinox.p2.engine.IProfile;	20	import org.eclipse.equinox.p2.engine.IProfile;
22	import org.eclipse.equinox.p2.metadata.ITouchpointData;
23	import org.eclipse.equinox.p2.metadata.MetadataFactory;
24	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	21	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
25		22
26	/**	23	/**
Lines 54-62 Link Here
54	IProfile profile = createProfile("test", props);	51	IProfile profile = createProfile("test", props);
55	assertEquals(cacheDir.toURL().toExternalForm(), Util.getBundlePoolLocation(getAgent(), profile).toString());	52	assertEquals(cacheDir.toURL().toExternalForm(), Util.getBundlePoolLocation(getAgent(), profile).toString());
56	}	53	}
57
58	public void testMissingManifest() {
59	ITouchpointData emptyData = MetadataFactory.createTouchpointData(Collections.EMPTY_MAP);
60	assertNull(Util.getManifest(Collections.singletonList(emptyData)));
61	}
62	}	54	}

Lines 69-80 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java (-6 / +1 lines)
69	if (bundleFile == null \|\| !bundleFile.exists())	69	if (bundleFile == null \|\| !bundleFile.exists())
70	return Util.createError(NLS.bind(Messages.artifact_file_not_found, artifactKey));	70	return Util.createError(NLS.bind(Messages.artifact_file_not_found, artifactKey));
71		71
72	//By now we always have the manifest in the touchpoint data	72	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
73	String manifest = Util.getManifest(iu.getTouchpointData());
74	if (manifest == null)
75	return Util.createError(NLS.bind(Messages.missing_manifest, iu));
76
77	BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
78	if (bundleInfo == null)	73	if (bundleInfo == null)
79	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));	74	return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
80	manipulator.getConfigData().addBundle(bundleInfo);	75	manipulator.getConfigData().addBundle(bundleInfo);