Attachment #160555 for bug #269496




Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Import-Package: org.eclipse.osgi.service.pluginconversion;version="1.0.0",
 org.eclipse.osgi.util;version="1.1.0",
 org.osgi.framework;version="1.3.0"
Export-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
 org.eclipse.equinox.internal.frameworkadmin.utils;
  x-friends:="org.eclipse.equinox.frameworkadmin.equinox,
   org.eclipse.equinox.p2.metadata.generator,
   org.eclipse.equinox.p2.publisher,




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

import java.net.URI;
import org.eclipse.core.runtime.URIUtil;

/**
 * This object represents information of a bundle. This class is a copy of the BundleInfo
 * class in org.eclipse.equinox.simpleconfigurator
 * @since 2.0
 */
public class BundleInfo {
	public static final int NO_LEVEL = -1;
	public static final int NO_BUNDLEID = -1;

	private String symbolicName = null;
	private String version = null;
	private URI baseLocation;
	private URI location;
	private long bundleId = NO_BUNDLEID;

	private boolean markedAsStarted = false;
	private int startLevel = NO_LEVEL;
	private boolean resolved = false;

	private String manifest;
	private String fragmentHost;

	public BundleInfo() {
	}

	public BundleInfo(URI location) {
		this.location = location;
	}

	public BundleInfo(URI location, int startLevel, boolean started) {
		this.location = location;
		this.startLevel = startLevel;
		this.markedAsStarted = started;
	}

	public BundleInfo(URI location, int startLevel, boolean started, long bundleId) {
		this.location = location;
		this.startLevel = startLevel;
		this.markedAsStarted = started;
		this.bundleId = bundleId;
	}

	public BundleInfo(String symbolic, String version, URI location, int startLevel, boolean started) {
		this.symbolicName = symbolic;
		this.version = version;
		this.location = location;
		this.markedAsStarted = started;
		this.startLevel = startLevel;
	}

	public long getBundleId() {
		return bundleId;
	}

	public URI getBaseLocation() {
		return baseLocation;
	}

	public URI getLocation() {
		return location;
	}

	public String getManifest() {
		return manifest;
	}

	public int getStartLevel() {
		return startLevel;
	}

	public String getSymbolicName() {
		return symbolicName;
	}

	public String getVersion() {
		return version;
	}

	public String getFragmentHost() {
		return fragmentHost;
	}

	public boolean isMarkedAsStarted() {
		return markedAsStarted;
	}

	public boolean isResolved() {
		return resolved;
	}

	public void setBundleId(long bundleId) {
		this.bundleId = bundleId;
	}

	public void setBaseLocation(URI baseLocation) {
		this.baseLocation = baseLocation;
	}

	public void setLocation(URI location) {
		this.location = location;
	}

	public void setManifest(String manifest) {
		this.manifest = manifest;
	}

	public void setMarkedAsStarted(boolean markedAsStarted) {
		this.markedAsStarted = markedAsStarted;
	}

	public void setResolved(boolean resolved) {
		this.resolved = resolved;
	}

	public void setStartLevel(int level) {
		this.startLevel = level;
	}

	public void setSymbolicName(String symbolicName) {
		this.symbolicName = symbolicName;
	}

	public void setVersion(String value) {
		this.version = value;
	}

	public void setFragmentHost(String fragmentHost) {
		this.fragmentHost = fragmentHost;
	}

	/* (non-Javadoc)
	 * @see java.lang.Object#toString()
	 */
	public String toString() {
		StringBuffer buffer = new StringBuffer();
		buffer.append("BundleInfo("); //$NON-NLS-1$
		if (symbolicName != null)
			buffer.append(symbolicName);
		buffer.append(", "); //$NON-NLS-1$
		if (version != null)
			buffer.append(version);

		if (fragmentHost != null) {
			buffer.append(", fragmentHost="); //$NON-NLA-1$
			buffer.append(fragmentHost);
		}

		if (baseLocation != null) {
			buffer.append(", baseLocation="); //$NON-NLS-1$
			buffer.append(baseLocation);
		}
		buffer.append(", location="); //$NON-NLS-1$
		buffer.append(location);
		buffer.append(", startLevel="); //$NON-NLS-1$
		buffer.append(startLevel);
		buffer.append(", toBeStarted="); //$NON-NLS-1$
		buffer.append(markedAsStarted);
		buffer.append(", resolved="); //$NON-NLS-1$
		buffer.append(resolved);
		buffer.append(", id="); //$NON-NLS-1$
		buffer.append(this.bundleId);//		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available");
		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available"); //$NON-NLS-1$ //$NON-NLS-2$
		buffer.append(')');
		return buffer.toString();
	}

	public int hashCode() {
		final int prime = 31;
		int result = 1;
		result = prime * result + ((symbolicName == null) ? 0 : symbolicName.hashCode());
		result = prime * result + ((version == null) ? 0 : version.hashCode());
		return result;
	}

	public boolean equals(Object obj) {
		if (this == obj)
			return true;

		if (obj == null)
			return false;

		if (getClass() != obj.getClass())
			return false;

		BundleInfo other = (BundleInfo) obj;
		if (symbolicName == null) {
			if (other.symbolicName != null)
				return false;
		} else if (!symbolicName.equals(other.symbolicName))
			return false;

		if (version == null) {
			if (other.version != null)
				return false;
		} else if (!version.equals(other.version))
			return false;

		if (location == null || other.location == null)
			return true;

		//compare absolute location URIs
		URI absoluteLocation = baseLocation == null ? location : URIUtil.append(baseLocation, location.toString());
		URI otherAbsoluteLocation = other.baseLocation == null ? other.location : URIUtil.append(other.baseLocation, other.location.toString());
		return URIUtil.sameURI(absoluteLocation, otherAbsoluteLocation);
	}
}

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java (+2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.frameworkadmin.utils;	11	package org.eclipse.equinox.internal.frameworkadmin.utils;
12		12
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.io.IOException;	16	import java.io.IOException;
15	import java.net.URI;	17	import java.net.URI;

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.frameworkadmin.utils;	11	package org.eclipse.equinox.internal.frameworkadmin.utils;
12		12
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		14
13	import java.io.*;	15	import java.io.*;
14	import java.net.*;	16	import java.net.*;
15	import java.text.SimpleDateFormat;	17	import java.text.SimpleDateFormat;
Lines 18-24 Link Here
18	import java.util.zip.ZipEntry;	20	import java.util.zip.ZipEntry;
19	import java.util.zip.ZipFile;	21	import java.util.zip.ZipFile;
20	import org.eclipse.core.runtime.*;	22	import org.eclipse.core.runtime.*;
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
22	import org.eclipse.osgi.service.pluginconversion.PluginConversionException;	23	import org.eclipse.osgi.service.pluginconversion.PluginConversionException;
23	import org.eclipse.osgi.service.pluginconversion.PluginConverter;	24	import org.eclipse.osgi.service.pluginconversion.PluginConverter;
24	import org.eclipse.osgi.util.ManifestElement;	25	import org.eclipse.osgi.util.ManifestElement;

Lines 12-18 Link Here

(-)src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ConfiguratorManipulator.java (-1 / +3 lines)
12		12
13	import java.io.File;	13	import java.io.File;
14	import java.io.IOException;	14	import java.io.IOException;
15	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		16	import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin;
		17	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
16		18
17	/**	19	/**
18	*	20	*




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

import java.net.URI;
import org.eclipse.core.runtime.URIUtil;

/**
 * This object represents information of a bundle. This class is a copy of the BundleInfo
 * class in org.eclipse.equinox.simpleconfigurator
 *
 */
public class BundleInfo {
	public static final int NO_LEVEL = -1;
	public static final int NO_BUNDLEID = -1;

	private String symbolicName = null;
	private String version = null;
	private URI baseLocation;
	private URI location;
	private long bundleId = NO_BUNDLEID;

	private boolean markedAsStarted = false;
	private int startLevel = NO_LEVEL;
	private boolean resolved = false;

	private String manifest;
	private String fragmentHost;

	public BundleInfo() {
	}

	public BundleInfo(URI location) {
		this.location = location;
	}

	public BundleInfo(URI location, boolean started) {
		this.location = location;
		this.markedAsStarted = started;
	}

	public BundleInfo(URI location, int startLevel) {
		this.location = location;
		this.startLevel = startLevel;
	}

	public BundleInfo(URI location, int startLevel, boolean started) {
		this.location = location;
		this.startLevel = startLevel;
		this.markedAsStarted = started;
	}

	public BundleInfo(URI location, int startLevel, boolean started, long bundleId) {
		this.location = location;
		this.startLevel = startLevel;
		this.markedAsStarted = started;
		this.bundleId = bundleId;
	}

	public BundleInfo(String symbolic, String version, URI location, int startLevel, boolean started) {
		this.symbolicName = symbolic;
		this.version = version;
		this.location = location;
		this.markedAsStarted = started;
		this.startLevel = startLevel;
	}

	public long getBundleId() {
		return bundleId;
	}

	public URI getBaseLocation() {
		return baseLocation;
	}

	public URI getLocation() {
		return location;
	}

	public String getManifest() {
		return manifest;
	}

	public int getStartLevel() {
		return startLevel;
	}

	public String getSymbolicName() {
		return symbolicName;
	}

	public String getVersion() {
		return version;
	}

	public String getFragmentHost() {
		return fragmentHost;
	}

	public boolean isMarkedAsStarted() {
		return markedAsStarted;
	}

	public boolean isResolved() {
		return resolved;
	}

	public void setBundleId(long bundleId) {
		this.bundleId = bundleId;
	}

	public void setBaseLocation(URI baseLocation) {
		this.baseLocation = baseLocation;
	}

	public void setLocation(URI location) {
		this.location = location;
	}

	public void setManifest(String manifest) {
		this.manifest = manifest;
	}

	public void setMarkedAsStarted(boolean markedAsStarted) {
		this.markedAsStarted = markedAsStarted;
	}

	public void setResolved(boolean resolved) {
		this.resolved = resolved;
	}

	public void setStartLevel(int level) {
		this.startLevel = level;
	}

	public void setSymbolicName(String symbolicName) {
		this.symbolicName = symbolicName;
	}

	public void setVersion(String value) {
		this.version = value;
	}

	public void setFragmentHost(String fragmentHost) {
		this.fragmentHost = fragmentHost;
	}

	/* (non-Javadoc)
	 * @see java.lang.Object#toString()
	 */
	public String toString() {
		StringBuffer buffer = new StringBuffer();
		buffer.append("BundleInfo("); //$NON-NLS-1$
		if (symbolicName != null)
			buffer.append(symbolicName);
		buffer.append(", "); //$NON-NLS-1$
		if (version != null)
			buffer.append(version);

		if (fragmentHost != null) {
			buffer.append(", fragmentHost="); //$NON-NLA-1$
			buffer.append(fragmentHost);
		}

		if (baseLocation != null) {
			buffer.append(", baseLocation="); //$NON-NLS-1$
			buffer.append(baseLocation);
		}
		buffer.append(", location="); //$NON-NLS-1$
		buffer.append(location);
		buffer.append(", startLevel="); //$NON-NLS-1$
		buffer.append(startLevel);
		buffer.append(", toBeStarted="); //$NON-NLS-1$
		buffer.append(markedAsStarted);
		buffer.append(", resolved="); //$NON-NLS-1$
		buffer.append(resolved);
		buffer.append(", id="); //$NON-NLS-1$
		buffer.append(this.bundleId);//		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available");
		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available"); //$NON-NLS-1$ //$NON-NLS-2$
		buffer.append(')');
		return buffer.toString();
	}

	public int hashCode() {
		final int prime = 31;
		int result = 1;
		result = prime * result + ((symbolicName == null) ? 0 : symbolicName.hashCode());
		result = prime * result + ((version == null) ? 0 : version.hashCode());
		return result;
	}

	public boolean equals(Object obj) {
		if (this == obj)
			return true;

		if (obj == null)
			return false;

		if (getClass() != obj.getClass())
			return false;

		BundleInfo other = (BundleInfo) obj;
		if (symbolicName == null) {
			if (other.symbolicName != null)
				return false;
		} else if (!symbolicName.equals(other.symbolicName))
			return false;

		if (version == null) {
			if (other.version != null)
				return false;
		} else if (!version.equals(other.version))
			return false;

		if (location == null || other.location == null)
			return true;

		//compare absolute location URIs
		URI absoluteLocation = baseLocation == null ? location : URIUtil.append(baseLocation, location.toString());
		URI otherAbsoluteLocation = other.baseLocation == null ? other.location : URIUtil.append(other.baseLocation, other.location.toString());
		return URIUtil.sameURI(absoluteLocation, otherAbsoluteLocation);
	}
}

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundlesState.java (+2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.frameworkadmin;	11	package org.eclipse.equinox.internal.provisional.frameworkadmin;
12		12
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		14
13	/**	15	/**
14	* This API is used for expecting bundles state virtually.	16	* This API is used for expecting bundles state virtually.
15	*	17	*

Lines 12-17 Link Here

(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/ConfigData.java (+1 lines)
12	package org.eclipse.equinox.internal.provisional.frameworkadmin;	12	package org.eclipse.equinox.internal.provisional.frameworkadmin;
13		13
14	import java.util.*;	14	import java.util.*;
		15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
15		16
16	/**	17	/**
17	* This object is instantiated by {@link Manipulator#getConfigData()};	18	* This object is instantiated by {@link Manipulator#getConfigData()};

Lines 12-17 Link Here

(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/Manipulator.java (+1 lines)
12		12
13	import java.io.File;	13	import java.io.File;
14	import java.io.IOException;	14	import java.io.IOException;
		15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
15	import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;	16	import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;
16		17
17	/**	18	/**

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java (+1 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import java.util.*;	16	import java.util.*;
17	import org.eclipse.core.runtime.internal.adaptor.EclipseEnvironmentInfo;	17	import org.eclipse.core.runtime.internal.adaptor.EclipseEnvironmentInfo;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;	19	import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;
19	import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;	20	import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;
20	import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;	21	import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

Lines 14-19 Link Here

(-)src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java (+1 lines)
14	import java.net.*;	14	import java.net.*;
15	import java.util.*;	15	import java.util.*;
16	import org.eclipse.core.runtime.URIUtil;	16	import org.eclipse.core.runtime.URIUtil;
		17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;	18	import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;
18	import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;	19	import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	20	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java (+1 lines)
15	import java.net.*;	15	import java.net.*;
16	import java.util.*;	16	import java.util.*;
17	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;	19	import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;
19	import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;	20	import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
20	import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;	21	import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;

Lines 17-22 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/AbstractFwkAdminTest.java (+1 lines)
17	import java.util.Properties;	17	import java.util.Properties;
18	import junit.framework.TestCase;	18	import junit.framework.TestCase;
19	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
		20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
20	import org.eclipse.equinox.internal.frameworkadmin.equinox.ParserUtils;	21	import org.eclipse.equinox.internal.frameworkadmin.equinox.ParserUtils;
21	import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;	22	import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;
22	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	23	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/Bug196525.java (+1 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
20		21

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/Bug258370.java (+1 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
20		21

Lines 15-21 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/CleanupTest.java (-2 / +2 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
20		20
21	public class CleanupTest extends FwkAdminAndSimpleConfiguratorTest {	21	public class CleanupTest extends FwkAdminAndSimpleConfiguratorTest {
Lines 90-96 Link Here
90	}	90	}
91		91
92	public void testWithMutipleBundles() throws IOException, URISyntaxException {	92	public void testWithMutipleBundles() throws IOException, URISyntaxException {
93	BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2);	93	BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2, false);
94	m.getConfigData().addBundle(bi);	94	m.getConfigData().addBundle(bi);
95	m.save(false);	95	m.save(false);
96		96

Lines 12-18 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/FrameworkExtensionTest.java (-1 / +1 lines)
12		12
13	import org.eclipse.core.runtime.FileLocator;	13	import org.eclipse.core.runtime.FileLocator;
14	import org.eclipse.core.runtime.URIUtil;	14	import org.eclipse.core.runtime.URIUtil;
15	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;	16	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
17	import org.osgi.framework.Constants;	17	import org.osgi.framework.Constants;
18		18

Lines 14-19 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/FwkAdminAndSimpleConfiguratorTest.java (+1 lines)
14	import java.io.IOException;	14	import java.io.IOException;
15	import org.eclipse.core.runtime.FileLocator;	15	import org.eclipse.core.runtime.FileLocator;
16	import org.eclipse.core.runtime.URIUtil;	16	import org.eclipse.core.runtime.URIUtil;
		17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
18	import org.osgi.framework.BundleException;	19	import org.osgi.framework.BundleException;
19		20

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/LauncherConfigLocationTest.java (+1 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
20		21

Lines 12-17 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/MacOSLikeSetup.java (+1 lines)
12	import java.io.IOException;	12	import java.io.IOException;
13	import java.net.URISyntaxException;	13	import java.net.URISyntaxException;
14	import org.eclipse.core.runtime.FileLocator;	14	import org.eclipse.core.runtime.FileLocator;
		15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
15	import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxConstants;	16	import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxConstants;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	17	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
17	import org.eclipse.osgi.service.environment.Constants;	18	import org.eclipse.osgi.service.environment.Constants;

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/ManipulatorTests.java (+1 lines)
15	import java.util.Properties;	15	import java.util.Properties;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19		20
20	public class ManipulatorTests extends AbstractFwkAdminTest {	21	public class ManipulatorTests extends AbstractFwkAdminTest {

Lines 13-18 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/NoConfigurationValueInEclipseIni.java (+1 lines)
13	import java.net.URISyntaxException;	13	import java.net.URISyntaxException;
14	import org.eclipse.core.runtime.FileLocator;	14	import org.eclipse.core.runtime.FileLocator;
15	import org.eclipse.core.runtime.URIUtil;	15	import org.eclipse.core.runtime.URIUtil;
		16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	17	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
17	import org.osgi.framework.BundleException;	18	import org.osgi.framework.BundleException;
18		19

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/NoRenamingLauncherIni.java (+1 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
20		21

Lines 14-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/OSGiVersionChange.java (-1 / +3 lines)
14	import java.net.URISyntaxException;	14	import java.net.URISyntaxException;
15	import org.eclipse.core.runtime.FileLocator;	15	import org.eclipse.core.runtime.FileLocator;
16	import org.eclipse.core.runtime.URIUtil;	16	import org.eclipse.core.runtime.URIUtil;
17	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		18	import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdminRuntimeException;
		19	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
18	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
19		21
20	public class OSGiVersionChange extends FwkAdminAndSimpleConfiguratorTest {	22	public class OSGiVersionChange extends FwkAdminAndSimpleConfiguratorTest {

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/RelativePathTest.java (-1 / +2 lines)
15	import java.net.URL;	15	import java.net.URL;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;	19	import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	20	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
20		21
Lines 72-78 Link Here
72	assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), "file:plugins/org.eclipse.equinox.simpleconfigurator.jar");	73	assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), "file:plugins/org.eclipse.equinox.simpleconfigurator.jar");
73	assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), "file:plugins/org.eclipse.osgi.jar");	74	assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), "file:plugins/org.eclipse.osgi.jar");
74		75
75	BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2);	76	BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2, false);
76	manipulator.getConfigData().addBundle(bi);	77	manipulator.getConfigData().addBundle(bi);
77	manipulator.save(false);	78	manipulator.save(false);
78	// assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1")).toExternalForm());	79	// assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1")).toExternalForm());

Lines 14-19 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/RemovingABundle.java (+1 lines)
14	import java.io.IOException;	14	import java.io.IOException;
15	import org.eclipse.core.runtime.FileLocator;	15	import org.eclipse.core.runtime.FileLocator;
16	import org.eclipse.core.runtime.URIUtil;	16	import org.eclipse.core.runtime.URIUtil;
		17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
18	import org.osgi.framework.BundleException;	19	import org.osgi.framework.BundleException;
19		20

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/RemovingAllBundles.java (+1 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
20		21

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/RenamingLauncherIni.java (+1 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
20		21

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/SimpleConfiguratorComingAndGoing.java (-1 / +2 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
20		21
Lines 31-37 Link Here
31	}	32	}
32		33
33	public void testWithMutipleBundles() throws IOException, BundleException, URISyntaxException {	34	public void testWithMutipleBundles() throws IOException, BundleException, URISyntaxException {
34	BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2);	35	BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2, false);
35	m.getConfigData().addBundle(bi);	36	m.getConfigData().addBundle(bi);
36	m.save(false);	37	m.save(false);
37		38

Lines 15-20 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/SimpleConfiguratorTest.java (+1 lines)
15	import java.net.URISyntaxException;	15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.FileLocator;	16	import org.eclipse.core.runtime.FileLocator;
17	import org.eclipse.core.runtime.URIUtil;	17	import org.eclipse.core.runtime.URIUtil;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	19	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
19	import org.osgi.framework.BundleException;	20	import org.osgi.framework.BundleException;
20		21

Lines 11-17 Link Here

(-)src/org/eclipse/equinox/frameworkadmin/tests/TestRunningInstance.java (-1 / +3 lines)
11	package org.eclipse.equinox.frameworkadmin.tests;	11	package org.eclipse.equinox.frameworkadmin.tests;
12		12
13	import org.eclipse.core.runtime.Platform;	13	import org.eclipse.core.runtime.Platform;
14	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	14	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		15	import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin;
		16	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
15	import org.osgi.framework.*;	17	import org.osgi.framework.*;
16		18
17	public class TestRunningInstance extends AbstractFwkAdminTest {	19	public class TestRunningInstance extends AbstractFwkAdminTest {




Bundle-ActivationPolicy: lazy
Import-Package: javax.xml.parsers,
 org.eclipse.equinox.app;version="1.0.0",
 org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.internal.frameworkadmin.equinox,
 org.eclipse.equinox.internal.frameworkadmin.utils,
 org.eclipse.equinox.internal.p2.metadata,

 org.eclipse.equinox.internal.provisional.frameworkadmin,
 org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
 org.eclipse.equinox.internal.provisional.p2.metadata,
 org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,
 org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.metadata.expression;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.query;version="[2.0.0,3.0.0)",

 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)",
 org.w3c.dom,
 org.xml.sax,
 org.xml.sax.helpers




import java.io.IOException;
import java.net.*;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser;
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.metadata.generator.Activator;
import org.eclipse.equinox.internal.p2.metadata.generator.Messages;
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.*;

			try {
				//config.ini uses simpleconfigurator, read the bundles.info and replace the bundle infos
				SimpleConfiguratorManipulator simpleManipulator = (SimpleConfiguratorManipulator) ServiceHelper.getService(Activator.getContext(), SimpleConfiguratorManipulator.class.getName());
				BundleInfo[] bundleInfos = simpleManipulator.loadConfiguration(new URL(value).openStream(), null);
				data.setBundles(bundleInfos);
			} catch (MalformedURLException e1) {
				// ignore




 *******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata.generator;

import org.eclipse.equinox.internal.p2.core.helpers.FileUtils.IPathComputer;

import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription;

import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;

import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
import java.util.Map.Entry;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxConstants;
import org.eclipse.equinox.internal.p2.core.helpers.*;
import org.eclipse.equinox.internal.p2.core.helpers.FileUtils.IPathComputer;
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
import org.eclipse.equinox.internal.p2.metadata.generator.*;
import org.eclipse.equinox.internal.p2.metadata.generator.Messages;
import org.eclipse.equinox.internal.p2.metadata.generator.features.*;
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;
import org.eclipse.equinox.internal.provisional.frameworkadmin.LauncherData;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.equinox.p2.metadata.VersionRange;

		String configurationData = ""; //$NON-NLS-1$
		String unconfigurationData = ""; //$NON-NLS-1$
		for (Iterator iterator = configData.getProperties().entrySet().iterator(); iterator.hasNext();) {
			Map.Entry aProperty = (Map.Entry) iterator.next();
			String key = ((String) aProperty.getKey());
			if (key.equals("osgi.frameworkClassPath") || key.equals("osgi.framework") || key.equals("osgi.bundles") || key.equals("eof")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
				continue;

			unconfigurationData += "setProgramProperty(propName:" + key + ", propValue:);"; //$NON-NLS-1$ //$NON-NLS-2$
		}
		for (Iterator iterator = configData.getProperties().entrySet().iterator(); iterator.hasNext();) {
			Map.Entry aProperty = (Map.Entry) iterator.next();
			String key = ((String) aProperty.getKey());
			if (key.equals("osgi.frameworkClassPath") || key.equals("osgi.framework") || key.equals("osgi.bundles") || key.equals("eof")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
				continue;

Lines 10-16 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/GeneratorBundleInfo.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.metadata.generator;	11	package org.eclipse.equinox.internal.provisional.p2.metadata.generator;
12		12
13	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
14		14
15	public class GeneratorBundleInfo extends BundleInfo {	15	public class GeneratorBundleInfo extends BundleInfo {
16	// public static final int NO_LEVEL = -1;	16	// public static final int NO_LEVEL = -1;




import java.util.zip.ZipFile;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
import org.eclipse.equinox.internal.p2.metadata.generator.Activator;
import org.eclipse.equinox.internal.p2.metadata.generator.LocalizationHelper;
import org.eclipse.equinox.internal.p2.metadata.generator.features.SiteCategory;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.*;
import org.eclipse.equinox.p2.metadata.*;




Bundle-ActivationPolicy: lazy
Import-Package: javax.xml.parsers,
 org.eclipse.equinox.app;version="1.0.0";resolution:=optional,
 org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.internal.frameworkadmin.equinox,
 org.eclipse.equinox.internal.frameworkadmin.utils,
 org.eclipse.equinox.internal.p2.artifact.repository,

 org.eclipse.equinox.internal.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.frameworkadmin,
 org.eclipse.equinox.internal.provisional.p2.metadata,
 org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,
 org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.metadata.expression;version="[2.0.0,3.0.0)",

 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)",
 org.eclipse.osgi.service.datalocation;version="1.2.0",
 org.eclipse.osgi.service.environment;version="1.1.0",
 org.eclipse.osgi.service.pluginconversion;version="1.0.0",




import java.net.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser;
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.publisher.Activator;
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.osgi.framework.Constants;

public class DataLoader {

			try {
				//config.ini uses simpleconfigurator, read the bundles.info and replace the bundle infos
				SimpleConfiguratorManipulator simpleManipulator = (SimpleConfiguratorManipulator) ServiceHelper.getService(Activator.getContext(), SimpleConfiguratorManipulator.class.getName());
				//input stream will be buffered and closed for us
				BundleInfo[] bundleInfos = simpleManipulator.loadConfiguration(new URL(value).openStream(), null);
				data.setBundles(bundleInfos);
			} catch (MalformedURLException e1) {
				// ignore

Lines 10-16 Link Here

(-)src/org/eclipse/equinox/internal/p2/publisher/eclipse/GeneratorBundleInfo.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.publisher.eclipse;	11	package org.eclipse.equinox.internal.p2.publisher.eclipse;
12		12
13	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
14	import org.eclipse.equinox.p2.metadata.IInstallableUnit;	14	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
15		15
16	public class GeneratorBundleInfo extends BundleInfo {	16	public class GeneratorBundleInfo extends BundleInfo {

Lines 13-19 Link Here

(-)src/org/eclipse/equinox/internal/p2/publisher/eclipse/IProductDescriptor.java (-1 / +1 lines)
13	import java.io.File;	13	import java.io.File;
14	import java.util.List;	14	import java.util.List;
15	import java.util.Map;	15	import java.util.Map;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.equinox.p2.metadata.IVersionedId;	17	import org.eclipse.equinox.p2.metadata.IVersionedId;
18		18
19	/**	19	/**

Lines 17-26 Link Here

(-)src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java (-1 / +1 lines)
17	import java.util.*;	17	import java.util.*;
18	import javax.xml.parsers.SAXParser;	18	import javax.xml.parsers.SAXParser;
19	import javax.xml.parsers.SAXParserFactory;	19	import javax.xml.parsers.SAXParserFactory;
		20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
20	import org.eclipse.equinox.internal.p2.core.helpers.*;	21	import org.eclipse.equinox.internal.p2.core.helpers.*;
21	import org.eclipse.equinox.internal.p2.metadata.VersionedId;	22	import org.eclipse.equinox.internal.p2.metadata.VersionedId;
22	import org.eclipse.equinox.internal.p2.publisher.Activator;	23	import org.eclipse.equinox.internal.p2.publisher.Activator;
23	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
24	import org.eclipse.equinox.p2.metadata.IVersionedId;	24	import org.eclipse.equinox.p2.metadata.IVersionedId;
25	import org.eclipse.osgi.service.datalocation.Location;	25	import org.eclipse.osgi.service.datalocation.Location;
26	import org.xml.sax.Attributes;	26	import org.xml.sax.Attributes;




 ******************************************************************************/
package org.eclipse.equinox.p2.publisher.eclipse;

import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription;

import java.io.*;
import java.util.*;
import java.util.Map.Entry;

import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
import org.eclipse.equinox.internal.p2.publisher.Activator;
import org.eclipse.equinox.internal.p2.publisher.Messages;
import org.eclipse.equinox.internal.p2.publisher.eclipse.GeneratorBundleInfo;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription;
import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.equinox.p2.metadata.Version;
import org.eclipse.equinox.p2.metadata.VersionRange;

Lines 10-17 Link Here

(-)src/org/eclipse/equinox/p2/publisher/eclipse/ConfigAdvice.java (-1 / +1 lines)
10	package org.eclipse.equinox.p2.publisher.eclipse;	10	package org.eclipse.equinox.p2.publisher.eclipse;
11		11
12	import java.util.Map;	12	import java.util.Map;
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
13	import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;	14	import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
14	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
15	import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;	15	import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;
16	import org.eclipse.equinox.p2.publisher.AbstractAdvice;	16	import org.eclipse.equinox.p2.publisher.AbstractAdvice;
17		17





import java.io.File;
import java.util.*;
import java.util.Map.Entry;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.publisher.eclipse.GeneratorBundleInfo;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.p2.metadata.*;

		String unconfigurationData = ""; //$NON-NLS-1$
		Set<String> properties = new HashSet<String>();
		for (IConfigAdvice advice : configAdvice) {
			for (Map.Entry<String, String> aProperty : advice.getProperties().entrySet()) {
				String key = aProperty.getKey();
				if (shouldPublishProperty(key) && !properties.contains(key)) {
					properties.add(key);

Lines 10-16 Link Here

(-)src/org/eclipse/equinox/p2/publisher/eclipse/IConfigAdvice.java (-1 / +1 lines)
10	package org.eclipse.equinox.p2.publisher.eclipse;	10	package org.eclipse.equinox.p2.publisher.eclipse;
11		11
12	import java.util.Map;	12	import java.util.Map;
13	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
14	import org.eclipse.equinox.p2.publisher.IPublisherAdvice;	14	import org.eclipse.equinox.p2.publisher.IPublisherAdvice;
15		15
16	public interface IConfigAdvice extends IPublisherAdvice {	16	public interface IConfigAdvice extends IPublisherAdvice {

Lines 13-22 Link Here

(-)src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java (-1 / +1 lines)
13		13
14	import java.io.File;	14	import java.io.File;
15	import java.util.*;	15	import java.util.*;
		16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
16	import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;	17	import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
17	import org.eclipse.equinox.internal.p2.publisher.eclipse.DataLoader;	18	import org.eclipse.equinox.internal.p2.publisher.eclipse.DataLoader;
18	import org.eclipse.equinox.internal.p2.publisher.eclipse.IProductDescriptor;	19	import org.eclipse.equinox.internal.p2.publisher.eclipse.IProductDescriptor;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;	20	import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;
21	import org.eclipse.equinox.p2.metadata.IVersionedId;	21	import org.eclipse.equinox.p2.metadata.IVersionedId;
22	import org.eclipse.equinox.p2.metadata.Version;	22	import org.eclipse.equinox.p2.metadata.Version;




<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>

<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/IBM-1.6.0-20090519-SR5"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/dev/platform/zips/eclipse-platform-I20100119-0800-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=c:/dev/platform/zips/eclipse-platform-3.5-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.repository&#13;&#10;-Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/&#13;&#13;&#10;-Xmx512m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>

Lines 35-41 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
35	org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",	35	org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",
36	org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",	36	org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",
37	org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",	37	org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",
38	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="1.0.100",	38	org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)",
39	org.eclipse.equinox.p2.repository;bundle-version="1.0.0",	39	org.eclipse.equinox.p2.repository;bundle-version="1.0.0",
40	org.eclipse.equinox.p2.tests.verifier;bundle-version="1.0.0",	40	org.eclipse.equinox.p2.tests.verifier;bundle-version="1.0.0",
41	org.eclipse.equinox.security;bundle-version="1.0.0",	41	org.eclipse.equinox.security;bundle-version="1.0.0",

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/publisher/actions/AccumulateConfigDataActionTest.java (-1 / +2 lines)
10	******************************************************************************/	10	******************************************************************************/
11	package org.eclipse.equinox.p2.tests.publisher.actions;	11	package org.eclipse.equinox.p2.tests.publisher.actions;
12		12
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.net.URI;	16	import java.net.URI;
15	import java.net.URISyntaxException;	17	import java.net.URISyntaxException;
Lines 19-25 Link Here
19	import org.easymock.EasyMock;	21	import org.easymock.EasyMock;
20	import org.eclipse.core.runtime.NullProgressMonitor;	22	import org.eclipse.core.runtime.NullProgressMonitor;
21	import org.eclipse.core.runtime.Path;	23	import org.eclipse.core.runtime.Path;
22	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
23	import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;	24	import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;
24	import org.eclipse.equinox.p2.publisher.eclipse.*;	25	import org.eclipse.equinox.p2.publisher.eclipse.*;
25	import org.eclipse.equinox.p2.tests.TestActivator;	26	import org.eclipse.equinox.p2.tests.TestActivator;

Lines 12-17 Link Here

(-)src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java (-1 / +2 lines)
12		12
13	import static org.easymock.EasyMock.*;	13	import static org.easymock.EasyMock.*;
14		14
		15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		16
15	import java.io.File;	17	import java.io.File;
16	import java.io.IOException;	18	import java.io.IOException;
17	import java.util.Collection;	19	import java.util.Collection;
Lines 21-27 Link Here
21	import org.eclipse.core.runtime.NullProgressMonitor;	23	import org.eclipse.core.runtime.NullProgressMonitor;
22	import org.eclipse.equinox.internal.p2.metadata.RequiredCapability;	24	import org.eclipse.equinox.internal.p2.metadata.RequiredCapability;
23	import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;	25	import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;
24	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
27	import org.eclipse.equinox.p2.metadata.*;	28	import org.eclipse.equinox.p2.metadata.*;

Lines 10-20 Link Here

(-)src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java (-1 / +2 lines)
10	******************************************************************************/	10	******************************************************************************/
11	package org.eclipse.equinox.p2.tests.publisher.actions;	11	package org.eclipse.equinox.p2.tests.publisher.actions;
12		12
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.util.Map;	16	import java.util.Map;
15	import java.util.Properties;	17	import java.util.Properties;
16	import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;	18	import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;
17	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.p2.publisher.eclipse.ProductFileAdvice;	19	import org.eclipse.equinox.p2.publisher.eclipse.ProductFileAdvice;
19	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	20	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
20	import org.eclipse.equinox.p2.tests.TestData;	21	import org.eclipse.equinox.p2.tests.TestData;

Lines 12-19 Link Here

(-)src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java (-1 / +1 lines)
12	import java.util.List;	12	import java.util.List;
13	import java.util.Map;	13	import java.util.Map;
14	import junit.framework.TestCase;	14	import junit.framework.TestCase;
		15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
15	import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;	16	import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
17	import org.eclipse.equinox.p2.metadata.IVersionedId;	17	import org.eclipse.equinox.p2.metadata.IVersionedId;
18	import org.eclipse.equinox.p2.metadata.Version;	18	import org.eclipse.equinox.p2.metadata.Version;
19	import org.eclipse.equinox.p2.tests.TestData;	19	import org.eclipse.equinox.p2.tests.TestData;




package org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator;

import java.io.File;
import java.io.FileInputStream;
import java.net.URI;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;
import org.eclipse.equinox.internal.simpleconfigurator.utils.URIUtil;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

public class SimpleConfiguratorManipulatorTests extends AbstractProvisioningTest {


		File folder = getTestFolder("saveConfiguration");
		File infoFile = new File(folder, "bundle.info");

		URI baseFile = getTempFolder().toURI();

		//absolute location written with base
		BundleInfo[] bundles = new BundleInfo[] {new BundleInfo("a", "1.0.0", new File(folder, "plugins/a_1.0.0.jar").toURI(), BundleInfo.NO_LEVEL, false)};
		SimpleConfiguratorManipulator manipulator = new SimpleConfiguratorManipulatorImpl();
		manipulator.saveConfiguration(bundles, infoFile, folder.toURI());
		bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);
		assertEquals(bundles[0].getLocation(), URIUtil.append(baseFile, "plugins/a_1.0.0.jar"));

		//relative location written with null base
		bundles = new BundleInfo[] {new BundleInfo("b", "1.0.0", new URI("plugins/b_1.0.0.jar"), BundleInfo.NO_LEVEL, false)};
		manipulator.saveConfiguration(bundles, infoFile, null);
		bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);
		assertEquals(bundles[0].getLocation(), URIUtil.append(baseFile, "plugins/b_1.0.0.jar"));

		//absolute location written with null base
		URI absolute = new File(folder, "plugins/c_1.0.0.jar").toURI();
		bundles = new BundleInfo[] {new BundleInfo("c", "1.0.0", absolute, BundleInfo.NO_LEVEL, false)};
		manipulator.saveConfiguration(bundles, infoFile, null);
		bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);
		assertEquals(bundles[0].getLocation(), absolute);
	}
}




import java.io.IOException;
import java.net.URI;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.AddSourceBundleAction;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;




import java.io.File;
import java.net.URI;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.InstallBundleAction;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.IArtifactKey;




import java.io.File;
import java.net.URI;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.MarkStartedAction;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.IArtifactKey;




import java.io.IOException;
import java.net.URI;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.RemoveSourceBundleAction;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;





import java.io.File;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.SetLauncherNameAction;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;




import java.io.File;
import java.net.URI;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.SetStartLevelAction;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.IArtifactKey;




import java.io.File;
import java.net.URI;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.UninstallBundleAction;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.IArtifactKey;

Lines 17-22 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
17	Bundle-ActivationPolicy: lazy	17	Bundle-ActivationPolicy: lazy
18	Import-Package: javax.xml.parsers,	18	Import-Package: javax.xml.parsers,
19	org.eclipse.core.runtime.preferences;version="3.2.0",	19	org.eclipse.core.runtime.preferences;version="3.2.0",
		20	org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
20	org.eclipse.equinox.internal.p2.core.helpers,	21	org.eclipse.equinox.internal.p2.core.helpers,
21	org.eclipse.equinox.internal.p2.engine,	22	org.eclipse.equinox.internal.p2.engine,
22	org.eclipse.equinox.internal.p2.garbagecollector,	23	org.eclipse.equinox.internal.p2.garbagecollector,




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

import org.eclipse.equinox.p2.query.QueryUtil;

import java.io.File;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
import org.eclipse.equinox.internal.p2.garbagecollector.MarkSet;
import org.eclipse.equinox.internal.p2.garbagecollector.MarkSetProvider;
import org.eclipse.equinox.internal.p2.update.*;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.engine.IProfileRegistry;
import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.equinox.p2.query.IQueryResult;
import org.eclipse.equinox.p2.query.QueryUtil;
import org.eclipse.equinox.p2.repository.artifact.ArtifactKeyQuery;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;


Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java (+1 lines)
11	package org.eclipse.equinox.internal.p2.touchpoint.eclipse;	11	package org.eclipse.equinox.internal.p2.touchpoint.eclipse;
12		12
13	import java.io.IOException;	13	import java.io.IOException;
		14	import org.eclipse.equinox.frameworkadmin.BundleInfo;
14	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;	15	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
15	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	16	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
16	import org.eclipse.equinox.p2.core.IProvisioningAgent;	17	import org.eclipse.equinox.p2.core.IProvisioningAgent;

Lines 14-22 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java (-1 / +1 lines)
14	import java.net.*;	14	import java.net.*;
15	import java.util.List;	15	import java.util.List;
16	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
		17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;	18	import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
18	import org.eclipse.equinox.internal.p2.update.*;	19	import org.eclipse.equinox.internal.p2.update.*;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;	20	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
21	import org.eclipse.equinox.p2.core.ProvisionException;	21	import org.eclipse.equinox.p2.core.ProvisionException;
22	import org.eclipse.osgi.util.NLS;	22	import org.eclipse.osgi.util.NLS;




/*******************************************************************************
 * 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

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

import java.io.*;
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.Version;


	public void save() throws IOException {
		if (sourceBundles != null)
			manipulator.saveConfiguration(sourceBundles.toArray(new BundleInfo[sourceBundles.size()]), getFileLocation(), getLauncherLocation().toURI());
	}

	private void load() throws MalformedURLException, IOException {
		if (getFileLocation().exists())
			//input stream is bufferd and closed for us
			sourceBundles = new ArrayList<BundleInfo>(Arrays.asList(manipulator.loadConfiguration(new FileInputStream(getFileLocation()), getLauncherLocation().toURI())));
		else
			sourceBundles = new ArrayList<BundleInfo>();
	}

Lines 16-23 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java (-1 / +1 lines)
16	import java.net.*;	16	import java.net.*;
17	import java.util.*;	17	import java.util.*;
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
		19	import org.eclipse.equinox.frameworkadmin.BundleInfo;
19	import org.eclipse.equinox.internal.p2.core.helpers.*;	20	import org.eclipse.equinox.internal.p2.core.helpers.*;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
21	import org.eclipse.equinox.p2.core.*;	21	import org.eclipse.equinox.p2.core.*;
22	import org.eclipse.equinox.p2.engine.IProfile;	22	import org.eclipse.equinox.p2.engine.IProfile;
23	import org.eclipse.equinox.p2.metadata.*;	23	import org.eclipse.equinox.p2.metadata.*;

Lines 8-14 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/WhatIsRunning.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.internal.p2.touchpoint.eclipse;	9	package org.eclipse.equinox.internal.p2.touchpoint.eclipse;
10		10
11	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	11	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		12	import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin;
		13	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
12		14
13	public class WhatIsRunning {	15	public class WhatIsRunning {
14	public BundleInfo[] getBundlesBeingRun() {	16	public BundleInfo[] getBundlesBeingRun() {




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

import org.eclipse.equinox.p2.query.QueryUtil;

import java.io.File;
import java.util.Collection;
import java.util.Map;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.query.QueryUtil;
import org.eclipse.osgi.util.NLS;

public class InstallBundleAction extends ProvisioningAction {

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;	11	package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;
12		12
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.util.Collection;	16	import java.util.Collection;
15	import java.util.Map;	17	import java.util.Map;
Lines 17-23 Link Here
17	import org.eclipse.core.runtime.Status;	19	import org.eclipse.core.runtime.Status;
18	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;	20	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
19	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;	21	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;	22	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
22	import org.eclipse.equinox.p2.core.IProvisioningAgent;	23	import org.eclipse.equinox.p2.core.IProvisioningAgent;
23	import org.eclipse.equinox.p2.engine.IProfile;	24	import org.eclipse.equinox.p2.engine.IProfile;

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;	11	package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;
12		12
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.util.Collection;	16	import java.util.Collection;
15	import java.util.Map;	17	import java.util.Map;
Lines 17-23 Link Here
17	import org.eclipse.core.runtime.Status;	19	import org.eclipse.core.runtime.Status;
18	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;	20	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
19	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;	21	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;	22	import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
22	import org.eclipse.equinox.p2.core.IProvisioningAgent;	23	import org.eclipse.equinox.p2.core.IProvisioningAgent;
23	import org.eclipse.equinox.p2.engine.IProfile;	24	import org.eclipse.equinox.p2.engine.IProfile;




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

import org.eclipse.equinox.p2.query.QueryUtil;

import java.io.File;
import java.util.Collection;
import java.util.Map;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.query.QueryUtil;
import org.eclipse.osgi.util.NLS;

public class UninstallBundleAction extends ProvisioningAction {




public class EquinoxUtils {

	public static URL[] getConfigAreaURL(BundleContext context) {
		Location configLocation = getConfigLocation(context);
		if (configLocation == null)
			return null;

		URL baseURL = configLocation.getURL();
		if (configLocation.getParentLocation() != null && configLocation.getURL() != null) {
			if (baseURL == null)
				return new URL[] {configLocation.getParentLocation().getURL()};
			else
				return new URL[] {baseURL, configLocation.getParentLocation().getURL()};
		}
		if (baseURL != null)
			return new URL[] {baseURL};

		return null;
	}

	public static Location getConfigLocation(BundleContext context) {
		Filter filter = null;
		try {
			filter = context.createFilter(Location.CONFIGURATION_FILTER);

		ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);
		configLocationTracker.open();
		try {
			return (Location) configLocationTracker.getService();
			if (configLocation == null)
				return null;

			URL baseURL = configLocation.getURL();
			if (configLocation.getParentLocation() != null && configLocation.getURL() != null) {
				if (baseURL == null)
					return new URL[] {configLocation.getParentLocation().getURL()};
				else
					return new URL[] {baseURL, configLocation.getParentLocation().getURL()};
			}
			if (baseURL != null)
				return new URL[] {baseURL};

			return null;
		} finally {
			configLocationTracker.close();
		}




	private static final String ENCODED_COMMA = "%2C";

	public static List readConfiguration(URL url, URI base) throws IOException {
		InputStream stream = null;

		BufferedReader r = null;
		try {
			stream = url.openStream();
		} catch (IOException e) {
			// if the exception is a FNF we return an empty bundle list
			if (e instanceof FileNotFoundException)
				return Collections.EMPTY_LIST;
			throw e;
		}

		try {
			return readConfiguration(stream, base);
		} finally {
			stream.close();
		}
	}

	/**
	 * Read the configuration from the given InputStream
	 * 
	 * @param stream - the stream is always closed 
	 * @param base
	 * @return
	 * @throws IOException
	 */
	public static List readConfiguration(InputStream stream, URI base) throws IOException {
		List bundles = new ArrayList();

		BufferedReader r = new BufferedReader(new InputStreamReader(stream));
		String line;
		try {
			String line;
			while ((line = r.readLine()) != null) {
				line = line.trim();
				//ignore any comment or empty lines




Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator.manipulator;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.internal.frameworkadmin.equinox,
 org.eclipse.equinox.internal.frameworkadmin.utils,
 org.eclipse.equinox.internal.provisional.configuratormanipulator,
 org.eclipse.equinox.internal.provisional.frameworkadmin,
 org.eclipse.equinox.internal.simpleconfigurator.utils,
 org.eclipse.osgi.service.datalocation,
 org.osgi.framework;version="1.3.0"
Bundle-Vendor: %providerName
Export-Package: org.eclipse.equinox.internal.simpleconfigurator.manipulator;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse",
 org.eclipse.equinox.simpleconfigurator.manipulator;version="2.0.0"
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
 J2SE-1.4
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.5.0"

Lines 5-10 Link Here

(-)OSGI-INF/configurator.xml (-1 / +1 lines)
5	<property name="service.vendor" type="String" value="Eclipse.org"/>	5	<property name="service.vendor" type="String" value="Eclipse.org"/>
6	<service>	6	<service>
7	<provide interface="org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator"/>	7	<provide interface="org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator"/>
8	<provide interface="org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator"/>	8	<provide interface="org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator"/>
9	</service>	9	</service>
10	</scr:component>	10	</scr:component>




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

package org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator;

import java.io.File;
import java.io.IOException;
import java.net.URL;
import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

public interface SimpleConfiguratorManipulator extends ConfiguratorManipulator {
	/**
	 * An instance of an ISimpleConfiguratorManipulator is registered as a ConfiguratorManipulator 
	 * service with ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME =
	 * SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.
	 */
	public static final String SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME = "org.eclipse.equinox.simpleconfigurator"; //$NON-NLS-1$

	/**
	 * 
	 * @param url
	 * @param launcherLocation
	 * @return The loaded configuration
	 * @throws IOException
	 */
	public BundleInfo[] loadConfiguration(URL url, File launcherLocation) throws IOException;

	/**
	 * 
	 * @param configuration
	 * @param outputFile
	 * @param base
	 * @throws IOException
	 */
	public void saveConfiguration(BundleInfo[] configuration, File outputFile, File base) throws IOException;
}




 *******************************************************************************/
package org.eclipse.equinox.internal.simpleconfigurator.manipulator;

import java.io.*;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.frameworkadmin.equinox.ParserUtils;
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
import org.eclipse.equinox.internal.simpleconfigurator.utils.EquinoxUtils;
import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorUtils;
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.osgi.service.datalocation.Location;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;

/**
 * 
 */
public class SimpleConfiguratorManipulatorImpl implements SimpleConfiguratorManipulator, ConfiguratorManipulator {
	class LocationInfo {
		URI[] prerequisiteLocations = null;
		URI systemBundleLocation = null;

		}
	}

	public BundleInfo[] loadConfiguration(BundleContext context, String infoPath) throws IOException {
		URI installArea = EquinoxUtils.getInstallLocationURI(context);
		Location configLocation = EquinoxUtils.getConfigLocation(context);

		return loadConfiguration(configLocation.getDataArea(infoPath).openStream(), installArea);
	}

	/*
	 * InputStream must be closed
	 * (non-Javadoc)
	 * @see org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator#loadConfiguration(java.io.InputStream, java.net.URI)
	 */
	public BundleInfo[] loadConfiguration(InputStream stream, URI installArea) throws IOException {
		if (stream == null)
			return NULL_BUNDLEINFOS;

		List simpleBundles = SimpleConfiguratorUtils.readConfiguration(stream, installArea);

		// convert to FrameworkAdmin BundleInfo Type
		BundleInfo[] result = new BundleInfo[simpleBundles.size()];

		return result;
	}

	public void saveConfiguration(BundleInfo[] configuration, OutputStream stream, URI installArea) throws IOException {
		org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] simpleInfos = convertBundleInfos(configuration, installArea);
		SimpleConfiguratorManipulatorUtils.writeConfiguration(simpleInfos, stream);
	}

	public void saveConfiguration(BundleInfo[] configuration, File outputFile, URI installArea) throws IOException {
		saveConfiguration(configuration, outputFile, installArea, false);
	}

	private void saveConfiguration(BundleInfo[] configuration, File outputFile, URI installArea, boolean backup) throws IOException {
		if (backup && outputFile.exists()) {
			File backupFile = Utils.getSimpleDataFormattedFile(outputFile);
			if (!outputFile.renameTo(backupFile)) {

			}
		}

		org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] simpleInfos = convertBundleInfos(configuration, installArea);

		// if empty remove the configuration file
		if (simpleInfos == null || simpleInfos.length == 0) {
			if (outputFile.exists()) {
				outputFile.delete();
			}
			File parentDir = outputFile.getParentFile();
			if (parentDir.exists()) {
				parentDir.delete();
			}
			return;
		}
		SimpleConfiguratorManipulatorUtils.writeConfiguration(simpleInfos, outputFile);
	}

	private org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] convertBundleInfos(BundleInfo[] configuration, URI installArea) {
		// convert to SimpleConfigurator BundleInfo Type
		org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] simpleInfos = new org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[configuration.length];
		for (int i = 0; i < configuration.length; i++) {
			BundleInfo bundleInfo = configuration[i];
			URI location = bundleInfo.getLocation();
			if (bundleInfo.getSymbolicName() == null || bundleInfo.getVersion() == null || location == null)
			URI location = base != null ? URIUtil.makeRelative(bundleInfo.getLocation(), base.toURI()) : bundleInfo.getLocation();
			if (symbolicName == null || bundleVersion == null || location == null)
				throw new IllegalArgumentException("Cannot persist bundleinfo: " + bundleInfo.toString());
			//only need to make a new BundleInfo if we are changing it.
			if (installArea != null)
				location = URIUtil.makeRelative(location, installArea);
			simpleInfos[i] = new org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo(bundleInfo.getSymbolicName(), bundleInfo.getVersion(), location, bundleInfo.getStartLevel(), bundleInfo.isMarkedAsStarted());
		}
		return simpleInfos;
	}

	public BundleInfo[] save(Manipulator manipulator, boolean backup) throws IOException {

			return configData.getBundles();

		File outputFile = getConfigFile(manipulator);
		URI installArea = ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData()).toURI();
		saveConfiguration((BundleInfo[]) setToSimpleConfig.toArray(new BundleInfo[setToSimpleConfig.size()]), outputFile, installArea, backup);
		configData.setProperty(SimpleConfiguratorManipulatorImpl.PROP_KEY_CONFIGURL, outputFile.toURL().toExternalForm());
		return orderingInitialConfig(setToInitialConfig);
	}

		boolean exclusiveInstallation = Boolean.valueOf(properties.getProperty(SimpleConfiguratorManipulatorImpl.PROP_KEY_EXCLUSIVE_INSTALLATION)).booleanValue();
		File configFile = getConfigFile(manipulator);

		File installArea = ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData());
		//input stream will be closed for us
		BundleInfo[] toInstall = loadConfiguration(new FileInputStream(configFile), installArea.toURI());

		List toUninstall = new LinkedList();
		if (exclusiveInstallation)

Lines 14-21 Link Here

(-)src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java (-38 / +38 lines)
14	import java.util.Comparator;	14	import java.util.Comparator;
15	import org.eclipse.equinox.internal.frameworkadmin.equinox.Messages;	15	import org.eclipse.equinox.internal.frameworkadmin.equinox.Messages;
16	import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;	16	import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
17	import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
18	import org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo;	17	import org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo;
		18	import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
19	import org.osgi.framework.Version;	19	import org.osgi.framework.Version;
20		20
21	public class SimpleConfiguratorManipulatorUtils {	21	public class SimpleConfiguratorManipulatorUtils {
Lines 25-43 Link Here
25	private static final Version OLD_STYLE_SIMPLE_CONFIGURATOR_VERSION = new Version("1.0.100.v20081206"); //$NON-NLS-1$	25	private static final Version OLD_STYLE_SIMPLE_CONFIGURATOR_VERSION = new Version("1.0.100.v20081206"); //$NON-NLS-1$
26		26
27	public static void writeConfiguration(BundleInfo[] simpleInfos, File outputFile) throws IOException {	27	public static void writeConfiguration(BundleInfo[] simpleInfos, File outputFile) throws IOException {
		28	if (!Utils.createParentDir(outputFile)) {
		29	throw new IllegalStateException(Messages.exception_failedToCreateDir);
		30	}
28		31
29	// if empty remove the configuration file	32	IOException caughtException = null;
30	if (simpleInfos == null \|\| simpleInfos.length == 0) {	33	OutputStream stream = null;
31	if (outputFile.exists()) {	34	try {
32	outputFile.delete();	35	stream = new FileOutputStream(outputFile);
33	}	36	writeConfiguration(simpleInfos, stream);
34	File parentDir = outputFile.getParentFile();	37	} catch (IOException e) {
35	if (parentDir.exists()) {	38	caughtException = e;
36	parentDir.delete();	39	} finally {
		40	try {
		41	if (stream != null)
		42	stream.close();
		43	} catch (IOException e) {
		44	// we want to avoid over-writing the original exception
		45	if (caughtException != null)
		46	caughtException = e;
37	}	47	}
38	return;
39	}	48	}
		49	if (caughtException != null)
		50	throw caughtException;
		51	}
40		52
		53	/**
		54	* The output stream is left open
		55	* @param simpleInfos
		56	* @param stream
		57	* @throws IOException
		58	*/
		59	public static void writeConfiguration(BundleInfo[] simpleInfos, OutputStream stream) throws IOException {
41	// sort by symbolic name	60	// sort by symbolic name
42	Arrays.sort(simpleInfos, new Comparator() {	61	Arrays.sort(simpleInfos, new Comparator() {
43	public int compare(Object o1, Object o2) {	62	public int compare(Object o1, Object o2) {
Lines 48-58 Link Here
48	}	67	}
49	});	68	});
50		69
51	if (!Utils.createParentDir(outputFile)) {
52	throw new IllegalStateException(Messages.exception_failedToCreateDir);
53	}
54	BufferedWriter writer = null;	70	BufferedWriter writer = null;
55	IOException caughtException = null;
56	boolean oldStyle = false;	71	boolean oldStyle = false;
57	for (int i = 0; i < simpleInfos.length; i++) {	72	for (int i = 0; i < simpleInfos.length; i++) {
58	if (SimpleConfiguratorManipulator.SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.equals(simpleInfos[i].getSymbolicName())) {	73	if (SimpleConfiguratorManipulator.SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.equals(simpleInfos[i].getSymbolicName())) {
Lines 63-94 Link Here
63	}	78	}
64	}	79	}
65		80
66	try {	81	writer = new BufferedWriter(new OutputStreamWriter(stream));
67	writer = new BufferedWriter(new FileWriter(outputFile));	82	// version line
68	// version line	83	writer.write(createVersionLine());
69	writer.write(createVersionLine());	84	writer.newLine();
70	writer.newLine();
71		85
72	// bundle info lines	86	// bundle info lines
73	for (int i = 0; i < simpleInfos.length; i++) {	87	for (int i = 0; i < simpleInfos.length; i++) {
74	writer.write(createBundleInfoLine(simpleInfos[i], oldStyle));	88	writer.write(createBundleInfoLine(simpleInfos[i], oldStyle));
75	writer.newLine();	89	writer.newLine();
76	}
77	} catch (IOException e) {
78	caughtException = e;
79	} finally {
80	if (writer != null) {
81	try {
82	writer.close();
83	} catch (IOException e) {
84	// we want to avoid over-writing the original exception
85	if (caughtException != null)
86	caughtException = e;
87	}
88	}
89	}	90	}
90	if (caughtException != null)	91	writer.flush();
91	throw caughtException;
92	}	92	}
93		93
94	public static String createVersionLine() {	94	public static String createVersionLine() {




/*******************************************************************************
 * 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
 * 
 * Contributors: IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.equinox.simpleconfigurator.manipulator;

import java.io.*;
import java.net.URI;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.osgi.framework.BundleContext;

/**
 * @since 2.0
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface SimpleConfiguratorManipulator {
	/**
	 * An instance of an ISimpleConfiguratorManipulator is registered as a ConfiguratorManipulator 
	 * service with ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME =
	 * SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.
	 */
	public static final String SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME = "org.eclipse.equinox.simpleconfigurator"; //$NON-NLS-1$

	/**
	 * Load the configuration file for the currently running system
	 * @param context : the BundleContext for the running system
	 * @param bundleInfoPath: path to the bundle info file to read, relative to the configuration location
	 * @throws IOException
	 */
	public BundleInfo[] loadConfiguration(BundleContext context, String bundleInfoPath) throws IOException;

	/**
	 *	Load the configuration from the given input stream
	 *  The supplied input stream is consumed by this method and will be closed.
	 *  
	 * @param configuration - the input stream to read the configuration from.  The stream will be closed even if an exception is thrown
	 * @param installArea: Relative URIs from the configuration file will be resolved relative to here
	 * @return The loaded configuration
	 * @throws IOException
	 */
	public BundleInfo[] loadConfiguration(InputStream configuration, URI installArea) throws IOException;

	/**
	 * Save the configuration to the given output stream
	 * The output stream is flushed and left open.
	 * 
	 * @param configuration - bundle information to save
	 * @param outputStream - the output stream to write to.  Stream is not closed
	 * @param installArea - bundle locations are written as relative to this URI
	 * @throws IOException
	 */
	public void saveConfiguration(BundleInfo[] configuration, OutputStream outputStream, URI installArea) throws IOException;

	/**
	 * Save the configuration to the specified file
	 * @param configuration - bundle information to save
	 * @param configurationFile - file to save the configuration in
	 * @param installArea - bundle locations are written as relative to this URI
	 * 
	 * @throws IOException
	 */
	public void saveConfiguration(BundleInfo[] configuration, File configurationFile, URI installArea) throws IOException;
}

Lines 36-42 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
36	org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)",	36	org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)",
37	org.eclipse.core.variables;bundle-version="[3.2.200,4.0.0)",	37	org.eclipse.core.variables;bundle-version="[3.2.200,4.0.0)",
38	org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.100,4.0.0)",	38	org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.100,4.0.0)",
39	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",	39	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[2.0.0,3.0.0)",
40	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",	40	org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
41	org.eclipse.jdt.junit.core;bundle-version="[3.6.0,4.0.0)";visibility:=reexport	41	org.eclipse.jdt.junit.core;bundle-version="[3.6.0,4.0.0)";visibility:=reexport
42	Bundle-RequiredExecutionEnvironment: J2SE-1.4	42	Bundle-RequiredExecutionEnvironment: J2SE-1.4

Lines 24-29 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
24	org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)",	24	org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)",
25	org.eclipse.jdt.junit.runtime;bundle-version="[3.4.100,4.0.0)",	25	org.eclipse.jdt.junit.runtime;bundle-version="[3.4.100,4.0.0)",
26	org.eclipse.core.variables;bundle-version="[3.2.200,4.0.0)",	26	org.eclipse.core.variables;bundle-version="[3.2.200,4.0.0)",
27	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",	27	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[2.0.0,3.0.0)",
28	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)"	28	org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)"
29	Bundle-RequiredExecutionEnvironment: J2SE-1.4	29	Bundle-RequiredExecutionEnvironment: J2SE-1.4

Lines 18-24 Link Here

(-)src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java (-1 / +1 lines)
18		18
19	import org.osgi.framework.Version;	19	import org.osgi.framework.Version;
20		20
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	21	import org.eclipse.equinox.frameworkadmin.BundleInfo;
22	import org.eclipse.osgi.service.resolver.VersionRange;	22	import org.eclipse.osgi.service.resolver.VersionRange;
23		23
24	import org.eclipse.core.runtime.FileLocator;	24	import org.eclipse.core.runtime.FileLocator;





import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.osgi.framework.BundleContext;
import org.osgi.framework.Version;

import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.service.resolver.VersionRange;

import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.URIUtil;

import org.eclipse.jdt.internal.junit.JUnitCorePlugin;

	}

	/**
	 * Adds the directories (as <code>java.io.File</code>) for the given location and all of its parents to the given list.
	 * 
	 * @param locations the list to add the URLs to
	 * @param location the location
	 * @param useParent <code>true</code> if location's parent directory should be used <code>false</code> otherwise
	 */
	private static void addLocationDirs(List locations, Location location, boolean useParent) {
		while (location != null) {
			URL url= location.getURL();
			if (url != null) {
				try {
					File dir = new File(FileLocator.toFileURL(url).getPath());
					if (useParent)
						dir = dir.getParentFile();
					if (!locations.contains(dir))
						locations.add(dir);
				} catch (IOException e) {
					JUnitCorePlugin.log(e);
				}
			}
			location= location.getParentLocation();
		}
	}

	/**
	 * Finds the bundle info for the given arguments.
	 * <p>
	 * The first match will be returned if more than one bundle matches the arguments.

		if (manipulator == null)
			return null;

		List bundleLocations = new ArrayList();
		addLocationDirs(bundleLocations, Platform.getConfigurationLocation(), true);
		addLocationDirs(bundleLocations, Platform.getInstallLocation(), false);

		BundleInfo bestMatch= null;
		Version bestVersion= null;

		String bundleInfoPath= null;
		if (isSourceBundle)
			bundleInfoPath= SRC_INFO_PATH;
		else
			bundleInfoPath= BUNDLE_INFO_PATH;

		BundleContext context= JUnitCorePlugin.getDefault().getBundle().getBundleContext();
		BundleInfo bundles[]= null;
		try {
			bundles= manipulator.loadConfiguration(context, bundleInfoPath);
		} catch (IOException e) {
			JUnitCorePlugin.log(e);
		}
		
		if (bundles != null) {
			for (int j= 0; j < bundles.length; j++) {
				BundleInfo bundleInfo= bundles[j];
				if (symbolicName.equals(bundleInfo.getSymbolicName())) {
					Version version= new Version(bundleInfo.getVersion());
					if (versionRange.isIncluded(version)) {
						IPath path= getBundleLocationPath(bundleInfo);
						if (path.toFile().exists()) {
							if (bestMatch == null || bestVersion.compareTo(version) < 0) {
								bestMatch= bundleInfo;
								bestVersion= version;
											bestMatch= bundleInfo;
											bestVersion= version;
										}
									}
								}
							}
						}
					}
				}
			} catch (MalformedURLException e) {
				JUnitCorePlugin.log(e);
			} catch (IOException e) {
				JUnitCorePlugin.log(e);
			}
		}

		return bestMatch;
	}





 org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
 org.eclipse.equinox.p2.director.app;bundle-version="1.0.200"
Import-Package: com.ibm.icu.util,
 org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.internal.p2.core.helpers,
 org.eclipse.equinox.internal.p2.engine,
 org.eclipse.equinox.internal.p2.engine.phases,

 org.eclipse.equinox.internal.provisional.frameworkadmin,
 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.metadata,
 org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,
 org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.metadata.query;version="[2.0.0,3.0.0)",

 org.eclipse.equinox.p2.repository;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",
 org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4

Lines 11-21 Link Here

(-)src/org/eclipse/pde/internal/build/ProductFile.java (-1 / +2 lines)
11		11
12	package org.eclipse.pde.internal.build;	12	package org.eclipse.pde.internal.build;
13		13
		14	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		15
14	import java.io.*;	16	import java.io.*;
15	import java.util.*;	17	import java.util.*;
16	import javax.xml.parsers.*;	18	import javax.xml.parsers.*;
17	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
19	import org.eclipse.osgi.util.NLS;	20	import org.eclipse.osgi.util.NLS;
20	import org.eclipse.pde.internal.build.site.compatibility.FeatureEntry;	21	import org.eclipse.pde.internal.build.site.compatibility.FeatureEntry;
21	import org.xml.sax.*;	22	import org.xml.sax.*;

Lines 8-17 Link Here

(-)src/org/eclipse/pde/internal/build/ProductGenerator.java (-1 / +2 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.pde.internal.build;	9	package org.eclipse.pde.internal.build;
10		10
		11	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		12
11	import java.io.*;	13	import java.io.*;
12	import java.util.*;	14	import java.util.*;
13	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
14	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
15	import org.eclipse.osgi.service.resolver.BundleDescription;	16	import org.eclipse.osgi.service.resolver.BundleDescription;
16	import org.eclipse.osgi.service.resolver.VersionRange;	17	import org.eclipse.osgi.service.resolver.VersionRange;
17	import org.eclipse.pde.internal.build.site.*;	18	import org.eclipse.pde.internal.build.site.*;

Lines 10-15 Link Here

(-)src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java (+2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.build.publisher.compatibility;	11	package org.eclipse.pde.internal.build.publisher.compatibility;
12		12
		13	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.util.*;	16	import java.util.*;
15	import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;	17	import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;




 *******************************************************************************/
package org.eclipse.pde.internal.build.site;

import java.io.*;
import java.io.IOException;
import java.net.*;
import java.util.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.pde.internal.build.*;



		List infos = new ArrayList();
		try {
			//streams are closed for us
			infos.addAll(Arrays.asList(manipulator.loadConfiguration(new FileInputStream(bundlesTxt), root.toURI())));
			infos.addAll(Arrays.asList(manipulator.loadConfiguration(new FileInputStream(sourceTxt), root.toURI())));
		} catch (MalformedURLException e) {
			// TODO Auto-generated catch block
			e.printStackTrace();


		SimpleConfiguratorManipulator manipulator = (SimpleConfiguratorManipulator) BundleHelper.getDefault().acquireService(SimpleConfiguratorManipulator.class.getName());
		try {
			bundlesTxt.getParentFile().mkdirs();
			srcBundlesTxt.getParentFile().mkdirs();
			OutputStream bundleOutput = new FileOutputStream(bundlesTxt);
			OutputStream srcOutput = new FileOutputStream(srcBundlesTxt);
			try {
				manipulator.saveConfiguration(infos, bundleOutput, base.toURI());
				manipulator.saveConfiguration(sources, srcOutput, base.toURI());
			} finally {
				Utils.close(bundleOutput);
				Utils.close(srcOutput);
			}
		} catch (IOException e) {
			return null;
		}




 org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",
 org.eclipse.pde.build;bundle-version="[3.2.0,4.1.0)",
 org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
 org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
 org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.director;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",
 org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0]",
 org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",




import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
import org.eclipse.equinox.p2.engine.*;
import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.equinox.p2.metadata.VersionRange;
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.osgi.service.resolver.*;
import org.eclipse.pde.core.plugin.IPluginBase;
import org.eclipse.pde.core.plugin.IPluginModelBase;

		if (manipulator == null) {
			return null;
		}

		// the input stream will be buffered and closed for us
		return manipulator.loadConfiguration(fileURL.openStream(), home.toURI());
	}

	/**

Lines 19-24 Link Here

(-)src/org/eclipse/pde/internal/core/target/AbstractBundleContainer.java (+1 lines)
19	import org.eclipse.core.runtime.spi.RegistryContributor;	19	import org.eclipse.core.runtime.spi.RegistryContributor;
20	import org.eclipse.core.variables.IStringVariableManager;	20	import org.eclipse.core.variables.IStringVariableManager;
21	import org.eclipse.core.variables.VariablesPlugin;	21	import org.eclipse.core.variables.VariablesPlugin;
		22	import org.eclipse.equinox.frameworkadmin.BundleInfo;
22	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	23	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
23	import org.eclipse.osgi.service.pluginconversion.PluginConversionException;	24	import org.eclipse.osgi.service.pluginconversion.PluginConversionException;
24	import org.eclipse.osgi.service.pluginconversion.PluginConverter;	25	import org.eclipse.osgi.service.pluginconversion.PluginConverter;

Lines 16-22 Link Here

(-)src/org/eclipse/pde/internal/core/target/ProfileBundleContainer.java (-1 / +1 lines)
16	import java.util.ArrayList;	16	import java.util.ArrayList;
17	import java.util.List;	17	import java.util.List;
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	19	import org.eclipse.equinox.frameworkadmin.BundleInfo;
20	import org.eclipse.osgi.util.NLS;	20	import org.eclipse.osgi.util.NLS;
21	import org.eclipse.pde.internal.build.site.PluginPathFinder;	21	import org.eclipse.pde.internal.build.site.PluginPathFinder;
22	import org.eclipse.pde.internal.core.P2Utils;	22	import org.eclipse.pde.internal.core.P2Utils;

Lines 12-18 Link Here

(-)src/org/eclipse/pde/internal/core/target/ResolvedBundle.java (-1 / +1 lines)
12		12
13	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.core.runtime.Status;	14	import org.eclipse.core.runtime.Status;
15	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
16	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;	16	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
17	import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;	17	import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
18		18

Lines 18-24 Link Here

(-)src/org/eclipse/pde/internal/core/target/TargetDefinition.java (-1 / +1 lines)
18	import org.eclipse.core.variables.IStringVariableManager;	18	import org.eclipse.core.variables.IStringVariableManager;
19	import org.eclipse.core.variables.VariablesPlugin;	19	import org.eclipse.core.variables.VariablesPlugin;
20	import org.eclipse.debug.core.DebugPlugin;	20	import org.eclipse.debug.core.DebugPlugin;
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	21	import org.eclipse.equinox.frameworkadmin.BundleInfo;
22	import org.eclipse.equinox.p2.engine.IProfile;	22	import org.eclipse.equinox.p2.engine.IProfile;
23	import org.eclipse.equinox.p2.engine.IProfileRegistry;	23	import org.eclipse.equinox.p2.engine.IProfileRegistry;
24	import org.eclipse.equinox.p2.engine.query.IUProfilePropertyQuery;	24	import org.eclipse.equinox.p2.engine.query.IUProfilePropertyQuery;

Lines 15-22 Link Here

(-)src/org/eclipse/pde/internal/core/target/TargetPlatformService.java (-1 / +1 lines)
15	import java.util.*;	15	import java.util.*;
16	import org.eclipse.core.resources.*;	16	import org.eclipse.core.resources.*;
17	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.p2.garbagecollector.GarbageCollector;	19	import org.eclipse.equinox.internal.p2.garbagecollector.GarbageCollector;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
20	import org.eclipse.equinox.p2.core.IProvisioningAgent;	20	import org.eclipse.equinox.p2.core.IProvisioningAgent;
21	import org.eclipse.equinox.p2.engine.IProfile;	21	import org.eclipse.equinox.p2.engine.IProfile;
22	import org.eclipse.equinox.p2.engine.IProfileRegistry;	22	import org.eclipse.equinox.p2.engine.IProfileRegistry;

Lines 11-17 Link Here

(-)src/org/eclipse/pde/internal/core/target/provisional/IResolvedBundle.java (-1 / +1 lines)
11	package org.eclipse.pde.internal.core.target.provisional;	11	package org.eclipse.pde.internal.core.target.provisional;
12		12
13	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	14	import org.eclipse.equinox.frameworkadmin.BundleInfo;
15		15
16	/**	16	/**
17	* A resolved bundle contained in a bundle container of a target definition.	17	* A resolved bundle contained in a bundle container of a target definition.

Lines 20-26 Link Here

(-)src/org/eclipse/pde/internal/core/target/provisional/LoadTargetDefinitionJob.java (-1 / +1 lines)
20	import org.eclipse.core.runtime.jobs.Job;	20	import org.eclipse.core.runtime.jobs.Job;
21	import org.eclipse.core.variables.IStringVariableManager;	21	import org.eclipse.core.variables.IStringVariableManager;
22	import org.eclipse.core.variables.VariablesPlugin;	22	import org.eclipse.core.variables.VariablesPlugin;
23	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	23	import org.eclipse.equinox.frameworkadmin.BundleInfo;
24	import org.eclipse.jdt.launching.IVMInstall;	24	import org.eclipse.jdt.launching.IVMInstall;
25	import org.eclipse.jdt.launching.JavaRuntime;	25	import org.eclipse.jdt.launching.JavaRuntime;
26	import org.eclipse.pde.core.plugin.IPluginModelBase;	26	import org.eclipse.pde.core.plugin.IPluginModelBase;

Lines 104-110 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
104	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",	104	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",
105	org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)",	105	org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)",
106	org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)",	106	org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)",
107	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",	107	org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
108	org.eclipse.equinox.frameworkadmin.equinox;bundle-version="[1.0.100,2.0.0)",	108	org.eclipse.equinox.frameworkadmin.equinox;bundle-version="[1.0.100,2.0.0)",
109	org.eclipse.pde.launching;bundle-version="[3.6.0,4.0.0)";visibility:=reexport	109	org.eclipse.pde.launching;bundle-version="[3.6.0,4.0.0)";visibility:=reexport
110	Eclipse-LazyStart: true	110	Eclipse-LazyStart: true

Lines 13-19 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java (-1 / +1 lines)
13	import java.util.*;	13	import java.util.*;
14	import java.util.List;	14	import java.util.List;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.jface.viewers.*;	17	import org.eclipse.jface.viewers.*;
18	import org.eclipse.jface.window.Window;	18	import org.eclipse.jface.window.Window;
19	import org.eclipse.osgi.util.NLS;	19	import org.eclipse.osgi.util.NLS;

Lines 17-23 Link Here

(-)src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java (-1 / +1 lines)
17	import org.eclipse.core.resources.IFile;	17	import org.eclipse.core.resources.IFile;
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
19	import org.eclipse.core.runtime.jobs.*;	19	import org.eclipse.core.runtime.jobs.*;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
21	import org.eclipse.jface.dialogs.*;	21	import org.eclipse.jface.dialogs.*;
22	import org.eclipse.jface.dialogs.Dialog;	22	import org.eclipse.jface.dialogs.Dialog;
23	import org.eclipse.jface.operation.IRunnableWithProgress;	23	import org.eclipse.jface.operation.IRunnableWithProgress;

Lines 13-20 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java (-1 / +1 lines)
13	import com.ibm.icu.text.MessageFormat;	13	import com.ibm.icu.text.MessageFormat;
14	import java.net.URI;	14	import java.net.URI;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
		16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
16	import org.eclipse.equinox.internal.p2.metadata.TranslationSupport;	17	import org.eclipse.equinox.internal.p2.metadata.TranslationSupport;
17	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.p2.metadata.IInstallableUnit;	18	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
19	import org.eclipse.jface.resource.ImageDescriptor;	19	import org.eclipse.jface.resource.ImageDescriptor;
20	import org.eclipse.jface.viewers.*;	20	import org.eclipse.jface.viewers.*;

Lines 20-26 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java (-1 / +1 lines)
20	import java.util.zip.ZipEntry;	20	import java.util.zip.ZipEntry;
21	import java.util.zip.ZipFile;	21	import java.util.zip.ZipFile;
22	import org.eclipse.core.runtime.*;	22	import org.eclipse.core.runtime.*;
23	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	23	import org.eclipse.equinox.frameworkadmin.BundleInfo;
24	import org.eclipse.jface.action.Action;	24	import org.eclipse.jface.action.Action;
25	import org.eclipse.jface.action.MenuManager;	25	import org.eclipse.jface.action.MenuManager;
26	import org.eclipse.jface.dialogs.ProgressMonitorDialog;	26	import org.eclipse.jface.dialogs.ProgressMonitorDialog;

Lines 17-23 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java (-1 / +1 lines)
17	import org.eclipse.core.runtime.preferences.IEclipsePreferences;	17	import org.eclipse.core.runtime.preferences.IEclipsePreferences;
18	import org.eclipse.core.runtime.preferences.InstanceScope;	18	import org.eclipse.core.runtime.preferences.InstanceScope;
19	import org.eclipse.debug.ui.StringVariableSelectionDialog;	19	import org.eclipse.debug.ui.StringVariableSelectionDialog;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
21	import org.eclipse.jdt.launching.JavaRuntime;	21	import org.eclipse.jdt.launching.JavaRuntime;
22	import org.eclipse.jdt.launching.environments.IExecutionEnvironment;	22	import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
23	import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;	23	import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;

Lines 10-17 Link Here

(-)src/org/eclipse/pde/ui/tests/target/AbstractTargetTest.java (-3 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.ui.tests.target;	11	package org.eclipse.pde.ui.tests.target;
12		12
13	import org.eclipse.core.runtime.Platform;
14
15	import java.io.*;	13	import java.io.*;
16	import java.net.URL;	14	import java.net.URL;
17	import java.util.*;	15	import java.util.*;
Lines 19-25 Link Here
19	import java.util.zip.ZipFile;	17	import java.util.zip.ZipFile;
20	import junit.framework.TestCase;	18	import junit.framework.TestCase;
21	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
22	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
23	import org.eclipse.pde.core.plugin.TargetPlatform;	21	import org.eclipse.pde.core.plugin.TargetPlatform;
24	import org.eclipse.pde.internal.core.target.provisional.*;	22	import org.eclipse.pde.internal.core.target.provisional.*;
25	import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;	23	import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;




 *******************************************************************************/
package org.eclipse.pde.ui.tests.target;

import org.eclipse.pde.internal.core.target.provisional.NameVersionDescriptor;

import java.io.*;
import java.net.URL;
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.target.TargetDefinition;
import org.eclipse.pde.internal.core.target.TargetDefinitionPersistenceHelper;
import org.eclipse.pde.internal.core.target.provisional.*;
import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper;
import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;




 *******************************************************************************/
package org.eclipse.pde.ui.tests.target;

import org.eclipse.pde.internal.core.target.provisional.NameVersionDescriptor;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;



import org.eclipse.pde.internal.core.target.IUBundleContainer;

import org.eclipse.pde.internal.core.target.TargetPlatformService;

import java.io.File;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.pde.core.plugin.TargetPlatform;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.target.IUBundleContainer;
import org.eclipse.pde.internal.core.target.TargetPlatformService;
import org.eclipse.pde.internal.core.target.provisional.*;

public class TargetDefinitionResolutionTests extends AbstractTargetTest {

Return to bug 269496

Lines 2-14 Link Here

(-)META-INF/MANIFEST.MF (-2 / +3 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin;singleton:=true	4	Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin;singleton:=true
5	Bundle-Version: 1.0.200.qualifier	5	Bundle-Version: 2.0.0.qualifier
6	Bundle-Vendor: %providerName	6	Bundle-Vendor: %providerName
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Import-Package: org.eclipse.osgi.service.pluginconversion;version="1.0.0",	8	Import-Package: org.eclipse.osgi.service.pluginconversion;version="1.0.0",
9	org.eclipse.osgi.util;version="1.1.0",	9	org.eclipse.osgi.util;version="1.1.0",
10	org.osgi.framework;version="1.3.0"	10	org.osgi.framework;version="1.3.0"
11	Export-Package: org.eclipse.equinox.internal.frameworkadmin.utils;	11	Export-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
		12	org.eclipse.equinox.internal.frameworkadmin.utils;
12	x-friends:="org.eclipse.equinox.frameworkadmin.equinox,	13	x-friends:="org.eclipse.equinox.frameworkadmin.equinox,
13	org.eclipse.equinox.p2.metadata.generator,	14	org.eclipse.equinox.p2.metadata.generator,
14	org.eclipse.equinox.p2.publisher,	15	org.eclipse.equinox.p2.publisher,

Added Link Here

(-)src/org/eclipse/equinox/frameworkadmin/BundleInfo.java (+221 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.equinox.frameworkadmin;
12
13	import java.net.URI;
14	import org.eclipse.core.runtime.URIUtil;
15
16	/**
17	* This object represents information of a bundle. This class is a copy of the BundleInfo
18	* class in org.eclipse.equinox.simpleconfigurator
19	* @since 2.0
20	*/
21	public class BundleInfo {
22	public static final int NO_LEVEL = -1;
23	public static final int NO_BUNDLEID = -1;
24
25	private String symbolicName = null;
26	private String version = null;
27	private URI baseLocation;
28	private URI location;
29	private long bundleId = NO_BUNDLEID;
30
31	private boolean markedAsStarted = false;
32	private int startLevel = NO_LEVEL;
33	private boolean resolved = false;
34
35	private String manifest;
36	private String fragmentHost;
37
38	public BundleInfo() {
39	}
40
41	public BundleInfo(URI location) {
42	this.location = location;
43	}
44
45	public BundleInfo(URI location, int startLevel, boolean started) {
46	this.location = location;
47	this.startLevel = startLevel;
48	this.markedAsStarted = started;
49	}
50
51	public BundleInfo(URI location, int startLevel, boolean started, long bundleId) {
52	this.location = location;
53	this.startLevel = startLevel;
54	this.markedAsStarted = started;
55	this.bundleId = bundleId;
56	}
57
58	public BundleInfo(String symbolic, String version, URI location, int startLevel, boolean started) {
59	this.symbolicName = symbolic;
60	this.version = version;
61	this.location = location;
62	this.markedAsStarted = started;
63	this.startLevel = startLevel;
64	}
65
66	public long getBundleId() {
67	return bundleId;
68	}
69
70	public URI getBaseLocation() {
71	return baseLocation;
72	}
73
74	public URI getLocation() {
75	return location;
76	}
77
78	public String getManifest() {
79	return manifest;
80	}
81
82	public int getStartLevel() {
83	return startLevel;
84	}
85
86	public String getSymbolicName() {
87	return symbolicName;
88	}
89
90	public String getVersion() {
91	return version;
92	}
93
94	public String getFragmentHost() {
95	return fragmentHost;
96	}
97
98	public boolean isMarkedAsStarted() {
99	return markedAsStarted;
100	}
101
102	public boolean isResolved() {
103	return resolved;
104	}
105
106	public void setBundleId(long bundleId) {
107	this.bundleId = bundleId;
108	}
109
110	public void setBaseLocation(URI baseLocation) {
111	this.baseLocation = baseLocation;
112	}
113
114	public void setLocation(URI location) {
115	this.location = location;
116	}
117
118	public void setManifest(String manifest) {
119	this.manifest = manifest;
120	}
121
122	public void setMarkedAsStarted(boolean markedAsStarted) {
123	this.markedAsStarted = markedAsStarted;
124	}
125
126	public void setResolved(boolean resolved) {
127	this.resolved = resolved;
128	}
129
130	public void setStartLevel(int level) {
131	this.startLevel = level;
132	}
133
134	public void setSymbolicName(String symbolicName) {
135	this.symbolicName = symbolicName;
136	}
137
138	public void setVersion(String value) {
139	this.version = value;
140	}
141
142	public void setFragmentHost(String fragmentHost) {
143	this.fragmentHost = fragmentHost;
144	}
145
146	/* (non-Javadoc)
147	* @see java.lang.Object#toString()
148	*/
149	public String toString() {
150	StringBuffer buffer = new StringBuffer();
151	buffer.append("BundleInfo("); //$NON-NLS-1$
152	if (symbolicName != null)
153	buffer.append(symbolicName);
154	buffer.append(", "); //$NON-NLS-1$
155	if (version != null)
156	buffer.append(version);
157
158	if (fragmentHost != null) {
159	buffer.append(", fragmentHost="); //$NON-NLA-1$
160	buffer.append(fragmentHost);
161	}
162
163	if (baseLocation != null) {
164	buffer.append(", baseLocation="); //$NON-NLS-1$
165	buffer.append(baseLocation);
166	}
167	buffer.append(", location="); //$NON-NLS-1$
168	buffer.append(location);
169	buffer.append(", startLevel="); //$NON-NLS-1$
170	buffer.append(startLevel);
171	buffer.append(", toBeStarted="); //$NON-NLS-1$
172	buffer.append(markedAsStarted);
173	buffer.append(", resolved="); //$NON-NLS-1$
174	buffer.append(resolved);
175	buffer.append(", id="); //$NON-NLS-1$
176	buffer.append(this.bundleId);// buffer.append(',').append(manifest == null ? "no manifest" : "manifest available");
177	buffer.append(',').append(manifest == null ? "no manifest" : "manifest available"); //$NON-NLS-1$ //$NON-NLS-2$
178	buffer.append(')');
179	return buffer.toString();
180	}
181
182	public int hashCode() {
183	final int prime = 31;
184	int result = 1;
185	result = prime * result + ((symbolicName == null) ? 0 : symbolicName.hashCode());
186	result = prime * result + ((version == null) ? 0 : version.hashCode());
187	return result;
188	}
189
190	public boolean equals(Object obj) {
191	if (this == obj)
192	return true;
193
194	if (obj == null)
195	return false;
196
197	if (getClass() != obj.getClass())
198	return false;
199
200	BundleInfo other = (BundleInfo) obj;
201	if (symbolicName == null) {
202	if (other.symbolicName != null)
203	return false;
204	} else if (!symbolicName.equals(other.symbolicName))
205	return false;
206
207	if (version == null) {
208	if (other.version != null)
209	return false;
210	} else if (!version.equals(other.version))
211	return false;
212
213	if (location == null \|\| other.location == null)
214	return true;
215
216	//compare absolute location URIs
217	URI absoluteLocation = baseLocation == null ? location : URIUtil.append(baseLocation, location.toString());
218	URI otherAbsoluteLocation = other.baseLocation == null ? other.location : URIUtil.append(other.baseLocation, other.location.toString());
219	return URIUtil.sameURI(absoluteLocation, otherAbsoluteLocation);
220	}
221	}

Lines 6-11 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
6	Bundle-Vendor: %providerName	6	Bundle-Vendor: %providerName
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Import-Package: org.eclipse.core.runtime.internal.adaptor,	8	Import-Package: org.eclipse.core.runtime.internal.adaptor,
		9	org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
9	org.eclipse.equinox.internal.frameworkadmin.utils,	10	org.eclipse.equinox.internal.frameworkadmin.utils,
10	org.eclipse.equinox.internal.provisional.configuratormanipulator,	11	org.eclipse.equinox.internal.provisional.configuratormanipulator,
11	org.eclipse.equinox.internal.provisional.frameworkadmin,	12	org.eclipse.equinox.internal.provisional.frameworkadmin,
Lines 18-24 Link Here
18	org.osgi.service.log;version="1.3.0",	19	org.osgi.service.log;version="1.3.0",
19	org.osgi.service.startlevel;version="1.0.0",	20	org.osgi.service.startlevel;version="1.0.0",
20	org.osgi.util.tracker;version="1.3.0"	21	org.osgi.util.tracker;version="1.3.0"
21	Export-Package: org.eclipse.equinox.internal.frameworkadmin.equinox;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.metadata.generator",	22	Export-Package: org.eclipse.equinox.internal.frameworkadmin.equinox;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.simpleconfigurator.manipulator",
22	org.eclipse.equinox.internal.frameworkadmin.equinox.utils;x-internal:=true	23	org.eclipse.equinox.internal.frameworkadmin.equinox.utils;x-internal:=true
23	Require-Bundle: org.eclipse.equinox.common	24	Require-Bundle: org.eclipse.equinox.common
24	Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,	25	Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,

Lines 1-5 Link Here

(-)All p2 Tests.launch (-4 / +5 lines)
1	<?xml version="1.0" encoding="UTF-8" standalone="no"?>	1	<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
2	<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
3	<booleanAttribute key="append.args" value="true"/>	2	<booleanAttribute key="append.args" value="true"/>
4	<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>	3	<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
5	<booleanAttribute key="askclear" value="false"/>	4	<booleanAttribute key="askclear" value="false"/>
Lines 53-70 Link Here
53	<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>	52	<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
54	<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>	53	<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
55	<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>	54	<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
		55	<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/IBM-1.6.0-20090519-SR5"/>
56	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>	56	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>
57	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>	57	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>
58	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>	58	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>
59	<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>	59	<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
60	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=/home/thhal/Download/eclipse-platform-N20091109-2000-linux-gtk-x86_64.tar.gz -Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=/home/thhal/Download/eclipse-platform-3.5.1-linux-gtk-x86_64.tar.gz -Dorg.eclipse.equinox.p2.repository -Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/ -Xmx512m"/>	60	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/dev/platform/zips/eclipse-platform-I20100119-0800-win32.zip -Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=c:/dev/platform/zips/eclipse-platform-3.5-win32.zip -Dorg.eclipse.equinox.p2.repository -Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/ -Xmx512m"/>
61	<stringAttribute key="pde.version" value="3.3"/>	61	<stringAttribute key="pde.version" value="3.3"/>
62	<stringAttribute key="product" value="org.eclipse.sdk.ide"/>	62	<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
63	<booleanAttribute key="run_in_ui_thread" value="true"/>	63	<booleanAttribute key="run_in_ui_thread" value="true"/>
64	<booleanAttribute key="show_selected_only" value="false"/>	64	<booleanAttribute key="show_selected_only" value="false"/>
65	<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>	65	<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
66	<booleanAttribute key="tracing" value="false"/>	66	<booleanAttribute key="tracing" value="false"/>
		67	<booleanAttribute key="useCustomFeatures" value="false"/>
67	<booleanAttribute key="useDefaultConfig" value="true"/>	68	<booleanAttribute key="useDefaultConfig" value="true"/>
68	<booleanAttribute key="useDefaultConfigArea" value="false"/>	69	<booleanAttribute key="useDefaultConfigArea" value="false"/>
69	<booleanAttribute key="useProduct" value="false"/>	70	<booleanAttribute key="useProduct" value="false"/>
70	</launchConfiguration>	71	</launchConfiguration>

Lines 12-22 Link Here

(-)src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java (-9 / +11 lines)
12	package org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator;	12	package org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator;
13		13
14	import java.io.File;	14	import java.io.File;
		15	import java.io.FileInputStream;
15	import java.net.URI;	16	import java.net.URI;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
18	import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;	18	import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;
		19	import org.eclipse.equinox.internal.simpleconfigurator.utils.URIUtil;
19	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	20	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
		21	import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
20		22
21	public class SimpleConfiguratorManipulatorTests extends AbstractProvisioningTest {	23	public class SimpleConfiguratorManipulatorTests extends AbstractProvisioningTest {
22		24
Lines 24-49 Link Here
24	File folder = getTestFolder("saveConfiguration");	26	File folder = getTestFolder("saveConfiguration");
25	File infoFile = new File(folder, "bundle.info");	27	File infoFile = new File(folder, "bundle.info");
26		28
27	File baseFile = getTempFolder();	29	URI baseFile = getTempFolder().toURI();
28		30
29	//absolute location written with base	31	//absolute location written with base
30	BundleInfo[] bundles = new BundleInfo[] {new BundleInfo("a", "1.0.0", new File(folder, "plugins/a_1.0.0.jar").toURI(), BundleInfo.NO_LEVEL, false)};	32	BundleInfo[] bundles = new BundleInfo[] {new BundleInfo("a", "1.0.0", new File(folder, "plugins/a_1.0.0.jar").toURI(), BundleInfo.NO_LEVEL, false)};
31	SimpleConfiguratorManipulator manipulator = new SimpleConfiguratorManipulatorImpl();	33	SimpleConfiguratorManipulator manipulator = new SimpleConfiguratorManipulatorImpl();
32	manipulator.saveConfiguration(bundles, infoFile, folder);	34	manipulator.saveConfiguration(bundles, infoFile, folder.toURI());
33	bundles = manipulator.loadConfiguration(infoFile.toURL(), baseFile);	35	bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);
34	assertEquals(bundles[0].getLocation(), new File(baseFile, "plugins/a_1.0.0.jar").toURI());	36	assertEquals(bundles[0].getLocation(), URIUtil.append(baseFile, "plugins/a_1.0.0.jar"));
35		37
36	//relative location written with null base	38	//relative location written with null base
37	bundles = new BundleInfo[] {new BundleInfo("b", "1.0.0", new URI("plugins/b_1.0.0.jar"), BundleInfo.NO_LEVEL, false)};	39	bundles = new BundleInfo[] {new BundleInfo("b", "1.0.0", new URI("plugins/b_1.0.0.jar"), BundleInfo.NO_LEVEL, false)};
38	manipulator.saveConfiguration(bundles, infoFile, null);	40	manipulator.saveConfiguration(bundles, infoFile, null);
39	bundles = manipulator.loadConfiguration(infoFile.toURL(), baseFile);	41	bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);
40	assertEquals(bundles[0].getLocation(), new File(baseFile, "plugins/b_1.0.0.jar").toURI());	42	assertEquals(bundles[0].getLocation(), URIUtil.append(baseFile, "plugins/b_1.0.0.jar"));
41		43
42	//absolute location written with null base	44	//absolute location written with null base
43	URI absolute = new File(folder, "plugins/c_1.0.0.jar").toURI();	45	URI absolute = new File(folder, "plugins/c_1.0.0.jar").toURI();
44	bundles = new BundleInfo[] {new BundleInfo("c", "1.0.0", absolute, BundleInfo.NO_LEVEL, false)};	46	bundles = new BundleInfo[] {new BundleInfo("c", "1.0.0", absolute, BundleInfo.NO_LEVEL, false)};
45	manipulator.saveConfiguration(bundles, infoFile, null);	47	manipulator.saveConfiguration(bundles, infoFile, null);
46	bundles = manipulator.loadConfiguration(infoFile.toURL(), baseFile);	48	bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);
47	assertEquals(bundles[0].getLocation(), absolute);	49	assertEquals(bundles[0].getLocation(), absolute);
48	}	50	}
49	}	51	}

Lines 14-24 Link Here

(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddSourceBundleActionTest.java (-1 / +1 lines)
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.net.URI;	15	import java.net.URI;
16	import java.util.*;	16	import java.util.*;
		17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;	18	import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;
18	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*;	19	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*;
19	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;	20	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;
20	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.AddSourceBundleAction;	21	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.AddSourceBundleAction;
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
22	import org.eclipse.equinox.p2.engine.IProfile;	22	import org.eclipse.equinox.p2.engine.IProfile;
23	import org.eclipse.equinox.p2.metadata.IArtifactKey;	23	import org.eclipse.equinox.p2.metadata.IArtifactKey;
24	import org.eclipse.equinox.p2.metadata.IInstallableUnit;	24	import org.eclipse.equinox.p2.metadata.IInstallableUnit;

Lines 18-23 Link Here

(-)src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java (-15 / +19 lines)
18	public class EquinoxUtils {	18	public class EquinoxUtils {
19		19
20	public static URL[] getConfigAreaURL(BundleContext context) {	20	public static URL[] getConfigAreaURL(BundleContext context) {
		21	Location configLocation = getConfigLocation(context);
		22	if (configLocation == null)
		23	return null;
		24
		25	URL baseURL = configLocation.getURL();
		26	if (configLocation.getParentLocation() != null && configLocation.getURL() != null) {
		27	if (baseURL == null)
		28	return new URL[] {configLocation.getParentLocation().getURL()};
		29	else
		30	return new URL[] {baseURL, configLocation.getParentLocation().getURL()};
		31	}
		32	if (baseURL != null)
		33	return new URL[] {baseURL};
		34
		35	return null;
		36	}
		37
		38	public static Location getConfigLocation(BundleContext context) {
21	Filter filter = null;	39	Filter filter = null;
22	try {	40	try {
23	filter = context.createFilter(Location.CONFIGURATION_FILTER);	41	filter = context.createFilter(Location.CONFIGURATION_FILTER);
Lines 27-47 Link Here
27	ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);	45	ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);
28	configLocationTracker.open();	46	configLocationTracker.open();
29	try {	47	try {
30	Location configLocation = (Location) configLocationTracker.getService();	48	return (Location) configLocationTracker.getService();
31	if (configLocation == null)
32	return null;
33
34	URL baseURL = configLocation.getURL();
35	if (configLocation.getParentLocation() != null && configLocation.getURL() != null) {
36	if (baseURL == null)
37	return new URL[] {configLocation.getParentLocation().getURL()};
38	else
39	return new URL[] {baseURL, configLocation.getParentLocation().getURL()};
40	}
41	if (baseURL != null)
42	return new URL[] {baseURL};
43
44	return null;
45	} finally {	49	} finally {
46	configLocationTracker.close();	50	configLocationTracker.close();
47	}	51	}

Lines 28-46 Link Here

(-)src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java (-6 / +24 lines)
28	private static final String ENCODED_COMMA = "%2C";	28	private static final String ENCODED_COMMA = "%2C";
29		29
30	public static List readConfiguration(URL url, URI base) throws IOException {	30	public static List readConfiguration(URL url, URI base) throws IOException {
31	List bundles = new ArrayList();	31	InputStream stream = null;
32
33	BufferedReader r = null;
34	try {	32	try {
35	r = new BufferedReader(new InputStreamReader(url.openStream()));	33	stream = url.openStream();
36	} catch (IOException e) {	34	} catch (IOException e) {
37	// if the exception is a FNF we return an empty bundle list	35	// if the exception is a FNF we return an empty bundle list
38	if (e instanceof FileNotFoundException)	36	if (e instanceof FileNotFoundException)
39	return bundles;	37	return Collections.EMPTY_LIST;
40	throw e;	38	throw e;
41	}	39	}
		40
		41	try {
		42	return readConfiguration(stream, base);
		43	} finally {
		44	stream.close();
		45	}
		46	}
		47
		48	/**
		49	* Read the configuration from the given InputStream
		50	*
		51	* @param stream - the stream is always closed
		52	* @param base
		53	* @return
		54	* @throws IOException
		55	*/
		56	public static List readConfiguration(InputStream stream, URI base) throws IOException {
		57	List bundles = new ArrayList();
		58
		59	BufferedReader r = new BufferedReader(new InputStreamReader(stream));
		60	String line;
42	try {	61	try {
43	String line;
44	while ((line = r.readLine()) != null) {	62	while ((line = r.readLine()) != null) {
45	line = line.trim();	63	line = line.trim();
46	//ignore any comment or empty lines	64	//ignore any comment or empty lines

Lines 2-19 Link Here

(-)META-INF/MANIFEST.MF (-4 / +6 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %bundleName	3	Bundle-Name: %bundleName
4	Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator.manipulator;singleton:=true	4	Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator.manipulator;singleton:=true
5	Bundle-Version: 1.0.200.qualifier	5	Bundle-Version: 2.0.0.qualifier
6	Bundle-Localization: plugin	6	Bundle-Localization: plugin
7	Bundle-ActivationPolicy: lazy	7	Bundle-ActivationPolicy: lazy
8	Import-Package: org.eclipse.equinox.internal.frameworkadmin.equinox,	8	Import-Package: org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
		9	org.eclipse.equinox.internal.frameworkadmin.equinox,
9	org.eclipse.equinox.internal.frameworkadmin.utils,	10	org.eclipse.equinox.internal.frameworkadmin.utils,
10	org.eclipse.equinox.internal.provisional.configuratormanipulator,	11	org.eclipse.equinox.internal.provisional.configuratormanipulator,
11	org.eclipse.equinox.internal.provisional.frameworkadmin,	12	org.eclipse.equinox.internal.provisional.frameworkadmin,
12	org.eclipse.equinox.internal.simpleconfigurator.utils,	13	org.eclipse.equinox.internal.simpleconfigurator.utils,
		14	org.eclipse.osgi.service.datalocation,
13	org.osgi.framework;version="1.3.0"	15	org.osgi.framework;version="1.3.0"
14	Bundle-Vendor: %providerName	16	Bundle-Vendor: %providerName
15	Export-Package: org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator;x-friends:="org.eclipse.pde.core,org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.publisher",	17	Export-Package: org.eclipse.equinox.internal.simpleconfigurator.manipulator;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse",
16	org.eclipse.equinox.internal.simpleconfigurator.manipulator;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse"	18	org.eclipse.equinox.simpleconfigurator.manipulator;version="2.0.0"
17	Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,	19	Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
18	J2SE-1.4	20	J2SE-1.4
19	Require-Bundle: org.eclipse.equinox.common;bundle-version="3.5.0"	21	Require-Bundle: org.eclipse.equinox.common;bundle-version="3.5.0"

Removed Link Here

(-)src/org/eclipse/equinox/internal/provisional/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java (-43 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008, 2009 IBM Corporation and others. All rights reserved.
3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,
5	* and is available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: IBM Corporation - initial API and implementation
8	*******************************************************************************/
9
10	package org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator;
11
12	import java.io.File;
13	import java.io.IOException;
14	import java.net.URL;
15	import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
17
18	public interface SimpleConfiguratorManipulator extends ConfiguratorManipulator {
19	/**
20	* An instance of an ISimpleConfiguratorManipulator is registered as a ConfiguratorManipulator
21	* service with ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME =
22	* SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.
23	*/
24	public static final String SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME = "org.eclipse.equinox.simpleconfigurator"; //$NON-NLS-1$
25
26	/**
27	*
28	* @param url
29	* @param launcherLocation
30	* @return The loaded configuration
31	* @throws IOException
32	*/
33	public BundleInfo[] loadConfiguration(URL url, File launcherLocation) throws IOException;
34
35	/**
36	*
37	* @param configuration
38	* @param outputFile
39	* @param base
40	* @throws IOException
41	*/
42	public void saveConfiguration(BundleInfo[] configuration, File outputFile, File base) throws IOException;
43	}

Added Link Here

(-)src/org/eclipse/equinox/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java (+68 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008, 2010 IBM Corporation and others. All rights reserved.
3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,
5	* and is available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: IBM Corporation - initial API and implementation
8	*******************************************************************************/
9
10	package org.eclipse.equinox.simpleconfigurator.manipulator;
11
12	import java.io.*;
13	import java.net.URI;
14	import org.eclipse.equinox.frameworkadmin.BundleInfo;
15	import org.osgi.framework.BundleContext;
16
17	/**
18	* @since 2.0
19	* @noimplement This interface is not intended to be implemented by clients.
20	*/
21	public interface SimpleConfiguratorManipulator {
22	/**
23	* An instance of an ISimpleConfiguratorManipulator is registered as a ConfiguratorManipulator
24	* service with ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME =
25	* SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.
26	*/
27	public static final String SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME = "org.eclipse.equinox.simpleconfigurator"; //$NON-NLS-1$
28
29	/**
30	* Load the configuration file for the currently running system
31	* @param context : the BundleContext for the running system
32	* @param bundleInfoPath: path to the bundle info file to read, relative to the configuration location
33	* @throws IOException
34	*/
35	public BundleInfo[] loadConfiguration(BundleContext context, String bundleInfoPath) throws IOException;
36
37	/**
38	* Load the configuration from the given input stream
39	* The supplied input stream is consumed by this method and will be closed.
40	*
41	* @param configuration - the input stream to read the configuration from. The stream will be closed even if an exception is thrown
42	* @param installArea: Relative URIs from the configuration file will be resolved relative to here
43	* @return The loaded configuration
44	* @throws IOException
45	*/
46	public BundleInfo[] loadConfiguration(InputStream configuration, URI installArea) throws IOException;
47
48	/**
49	* Save the configuration to the given output stream
50	* The output stream is flushed and left open.
51	*
52	* @param configuration - bundle information to save
53	* @param outputStream - the output stream to write to. Stream is not closed
54	* @param installArea - bundle locations are written as relative to this URI
55	* @throws IOException
56	*/
57	public void saveConfiguration(BundleInfo[] configuration, OutputStream outputStream, URI installArea) throws IOException;
58
59	/**
60	* Save the configuration to the specified file
61	* @param configuration - bundle information to save
62	* @param configurationFile - file to save the configuration in
63	* @param installArea - bundle locations are written as relative to this URI
64	*
65	* @throws IOException
66	*/
67	public void saveConfiguration(BundleInfo[] configuration, File configurationFile, URI installArea) throws IOException;
68	}

Lines 26-31 Link Here

(-)META-INF/MANIFEST.MF (-2 / +3 lines)
26	org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)";resolution:=optional,	26	org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
27	org.eclipse.equinox.p2.director.app;bundle-version="1.0.200"	27	org.eclipse.equinox.p2.director.app;bundle-version="1.0.200"
28	Import-Package: com.ibm.icu.util,	28	Import-Package: com.ibm.icu.util,
		29	org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
29	org.eclipse.equinox.internal.p2.core.helpers,	30	org.eclipse.equinox.internal.p2.core.helpers,
30	org.eclipse.equinox.internal.p2.engine,	31	org.eclipse.equinox.internal.p2.engine,
31	org.eclipse.equinox.internal.p2.engine.phases,	32	org.eclipse.equinox.internal.p2.engine.phases,
Lines 34-40 Link Here
34	org.eclipse.equinox.internal.provisional.frameworkadmin,	35	org.eclipse.equinox.internal.provisional.frameworkadmin,
35	org.eclipse.equinox.internal.provisional.p2.core,	36	org.eclipse.equinox.internal.provisional.p2.core,
36	org.eclipse.equinox.internal.provisional.p2.metadata,	37	org.eclipse.equinox.internal.provisional.p2.metadata,
37	org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,
38	org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",	38	org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
39	org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",	39	org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",
40	org.eclipse.equinox.p2.metadata.query;version="[2.0.0,3.0.0)",	40	org.eclipse.equinox.p2.metadata.query;version="[2.0.0,3.0.0)",
Lines 42-47 Link Here
42	org.eclipse.equinox.p2.repository;version="[2.0.0,3.0.0)",	42	org.eclipse.equinox.p2.repository;version="[2.0.0,3.0.0)",
43	org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",	43	org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",
44	org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",	44	org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",
45	org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)"	45	org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",
		46	org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)"
46	Bundle-ActivationPolicy: lazy	47	Bundle-ActivationPolicy: lazy
47	Bundle-RequiredExecutionEnvironment: J2SE-1.4	48	Bundle-RequiredExecutionEnvironment: J2SE-1.4

Lines 10-21 Link Here

(-)src/org/eclipse/pde/internal/build/site/P2Utils.java (-8 / +17 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.build.site;	11	package org.eclipse.pde.internal.build.site;
12		12
13	import java.io.File;	13	import java.io.*;
14	import java.io.IOException;
15	import java.net.*;	14	import java.net.*;
16	import java.util.*;	15	import java.util.*;
17	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;	17	import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
19	import org.eclipse.osgi.service.resolver.BundleDescription;	18	import org.eclipse.osgi.service.resolver.BundleDescription;
20	import org.eclipse.pde.internal.build.*;	19	import org.eclipse.pde.internal.build.*;
21		20
Lines 51-58 Link Here
51		50
52	List infos = new ArrayList();	51	List infos = new ArrayList();
53	try {	52	try {
54	infos.addAll(Arrays.asList(manipulator.loadConfiguration(bundlesTxt.toURL(), root)));	53	//streams are closed for us
55	infos.addAll(Arrays.asList(manipulator.loadConfiguration(sourceTxt.toURL(), root)));	54	infos.addAll(Arrays.asList(manipulator.loadConfiguration(new FileInputStream(bundlesTxt), root.toURI())));
		55	infos.addAll(Arrays.asList(manipulator.loadConfiguration(new FileInputStream(sourceTxt), root.toURI())));
56	} catch (MalformedURLException e) {	56	} catch (MalformedURLException e) {
57	// TODO Auto-generated catch block	57	// TODO Auto-generated catch block
58	e.printStackTrace();	58	e.printStackTrace();
Lines 175-182 Link Here
175		175
176	SimpleConfiguratorManipulator manipulator = (SimpleConfiguratorManipulator) BundleHelper.getDefault().acquireService(SimpleConfiguratorManipulator.class.getName());	176	SimpleConfiguratorManipulator manipulator = (SimpleConfiguratorManipulator) BundleHelper.getDefault().acquireService(SimpleConfiguratorManipulator.class.getName());
177	try {	177	try {
178	manipulator.saveConfiguration(infos, bundlesTxt, base);	178	bundlesTxt.getParentFile().mkdirs();
179	manipulator.saveConfiguration(sources, srcBundlesTxt, base);	179	srcBundlesTxt.getParentFile().mkdirs();
		180	OutputStream bundleOutput = new FileOutputStream(bundlesTxt);
		181	OutputStream srcOutput = new FileOutputStream(srcBundlesTxt);
		182	try {
		183	manipulator.saveConfiguration(infos, bundleOutput, base.toURI());
		184	manipulator.saveConfiguration(sources, srcOutput, base.toURI());
		185	} finally {
		186	Utils.close(bundleOutput);
		187	Utils.close(srcOutput);
		188	}
180	} catch (IOException e) {	189	} catch (IOException e) {
181	return null;	190	return null;
182	}	191	}

Lines 58-70 Link Here

(-)META-INF/MANIFEST.MF (-3 / +3 lines)
58	org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",	58	org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",
59	org.eclipse.pde.build;bundle-version="[3.2.0,4.1.0)",	59	org.eclipse.pde.build;bundle-version="[3.2.0,4.1.0)",
60	org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",	60	org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
61	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",	61	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[2.0.0,3.0.0)",
62	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",	62	org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
63	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",	63	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
64	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",	64	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
65	org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",	65	org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
66	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",	66	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
67	org.eclipse.equinox.p2.director;bundle-version="[2.0.0, 3.0.0)",	67	org.eclipse.equinox.p2.director;bundle-version="[2.0.0,3.0.0)",
68	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",	68	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",
69	org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0]",	69	org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0]",
70	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",	70	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",

Lines 17-32 Link Here

(-)src/org/eclipse/pde/internal/core/P2Utils.java (-3 / +5 lines)
17	import java.net.URL;	17	import java.net.URL;
18	import java.util.*;	18	import java.util.*;
19	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
21	import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;	21	import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
24	import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
25	import org.eclipse.equinox.p2.core.IProvisioningAgent;	24	import org.eclipse.equinox.p2.core.IProvisioningAgent;
26	import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;	25	import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
27	import org.eclipse.equinox.p2.engine.*;	26	import org.eclipse.equinox.p2.engine.*;
28	import org.eclipse.equinox.p2.metadata.*;	27	import org.eclipse.equinox.p2.metadata.*;
29	import org.eclipse.equinox.p2.metadata.VersionRange;	28	import org.eclipse.equinox.p2.metadata.VersionRange;
		29	import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
30	import org.eclipse.osgi.service.resolver.*;	30	import org.eclipse.osgi.service.resolver.*;
31	import org.eclipse.pde.core.plugin.IPluginBase;	31	import org.eclipse.pde.core.plugin.IPluginBase;
32	import org.eclipse.pde.core.plugin.IPluginModelBase;	32	import org.eclipse.pde.core.plugin.IPluginModelBase;
Lines 192-198 Link Here
192	if (manipulator == null) {	192	if (manipulator == null) {
193	return null;	193	return null;
194	}	194	}
195	return manipulator.loadConfiguration(fileURL, home);	195
		196	// the input stream will be buffered and closed for us
		197	return manipulator.loadConfiguration(fileURL.openStream(), home.toURI());
196	}	198	}
197		199
198	/**	200	/**

Lines 10-27 Link Here

(-)src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java (-4 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.ui.tests.target;	11	package org.eclipse.pde.ui.tests.target;
12		12
13	import org.eclipse.pde.internal.core.target.provisional.NameVersionDescriptor;
14
15	import java.io.*;	13	import java.io.*;
16	import java.net.URL;	14	import java.net.URL;
17	import java.util.*;	15	import java.util.*;
18	import junit.framework.Test;	16	import junit.framework.Test;
19	import junit.framework.TestSuite;	17	import junit.framework.TestSuite;
20	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	19	import org.eclipse.equinox.frameworkadmin.BundleInfo;
22	import org.eclipse.pde.core.plugin.*;	20	import org.eclipse.pde.core.plugin.*;
23	import org.eclipse.pde.internal.core.*;	21	import org.eclipse.pde.internal.core.*;
24	import org.eclipse.pde.internal.core.target.*;	22	import org.eclipse.pde.internal.core.target.TargetDefinition;
		23	import org.eclipse.pde.internal.core.target.TargetDefinitionPersistenceHelper;
25	import org.eclipse.pde.internal.core.target.provisional.*;	24	import org.eclipse.pde.internal.core.target.provisional.*;
26	import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper;	25	import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper;
27	import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;	26	import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;

Lines 10-33 Link Here

(-)src/org/eclipse/pde/ui/tests/target/TargetDefinitionResolutionTests.java (-11 / +4 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.ui.tests.target;	11	package org.eclipse.pde.ui.tests.target;
12		12
13	import org.eclipse.pde.internal.core.target.provisional.NameVersionDescriptor;
14
15	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
16
17
18
19	import org.eclipse.pde.internal.core.target.IUBundleContainer;
20
21	import org.eclipse.pde.internal.core.target.TargetPlatformService;
22
23	import java.io.File;	13	import java.io.File;
24	import junit.framework.Test;	14	import junit.framework.Test;
25	import junit.framework.TestSuite;	15	import junit.framework.TestSuite;
26	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
27	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		18	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
28	import org.eclipse.jdt.launching.JavaRuntime;	19	import org.eclipse.jdt.launching.JavaRuntime;
29	import org.eclipse.pde.core.plugin.TargetPlatform;	20	import org.eclipse.pde.core.plugin.TargetPlatform;
30	import org.eclipse.pde.internal.core.*;	21	import org.eclipse.pde.internal.core.*;
		22	import org.eclipse.pde.internal.core.target.IUBundleContainer;
		23	import org.eclipse.pde.internal.core.target.TargetPlatformService;
31	import org.eclipse.pde.internal.core.target.provisional.*;	24	import org.eclipse.pde.internal.core.target.provisional.*;
32		25
33	public class TargetDefinitionResolutionTests extends AbstractTargetTest {	26	public class TargetDefinitionResolutionTests extends AbstractTargetTest {