Attachment #128612 for bug #216278

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




/*******************************************************************************
 * Copyright (c) 2008 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.p2.core.repository;

import java.net.URI;
import java.util.EventObject;

/**
 * An event indicating a repository was added, removed, changed,
 * or discovered.
 * 
 * @noextend This class is not intended to be subclassed by clients.
 */
public class RepositoryEvent extends EventObject {
	private static final long serialVersionUID = 3082402920617281765L;

	/**
	 * A change kind constant (value 0), indicating a repository was added to the 
	 * list of repositories known to a repository manager.
	 */
	public static final int ADDED = 0;

	/**
	 * A change kind constant (value 1), indicating a repository was removed from 
	 * the list of repositories known to a repository manager.
	 */
	public static final int REMOVED = 1;

	/**
	 * A change kind constant (value 2), indicating a repository known to a 
	 * repository manager was modified.
	 */
	public static final int CHANGED = 2;

	/**
	 * A change kind constant (value 4), indicating a new repository was discovered.
	 * This event is a way to notify repository managers in a generic way about
	 * a newly discovered repository. The repository manager will typically receive
	 * this event, add the repository to its list of known repositories, and issue
	 * a subsequent {@link #ADDED} event. Other clients should not typically
	 * listen for this kind of event.
	 */
	public static final int DISCOVERED = 4;

	/**
	 * A change kind constant (value 8), indicating the repository's enablement
	 * was changed.  The {{@link #isRepositoryEnabled()} method can be used
	 * to find out the new enablement state of the repository, and to deduce
	 * the previous enablement state.
	 */
	public static final int ENABLEMENT = 8;

	private final int kind, type;
	private boolean isEnabled;
	private String nickname;

	/**
	 * Creates and returns a new repository discovery event.
	 * @param location the location of the repository that changed.
	 * @param nickname the repository nickname
	 * @param repositoryType the type of repository that was changed
	 * @param enabled whether the repository is enabled
	 * @return A new repository discovery event
	 * @see IRepository#PROP_NICKNAME
	 */
	public static RepositoryEvent newDiscoveryEvent(URI location, String nickname, int repositoryType, boolean enabled) {
		RepositoryEvent event = new RepositoryEvent(location, repositoryType, DISCOVERED, enabled);
		event.nickname = nickname;
		return event;
	}

	/**
	 * Creates a new repository event.
	 * 
	 * @param location the location of the repository that changed.
	 * @param repositoryType the type of repository that was changed
	 * @param kind the kind of change that occurred.
	 * @param enabled whether the repository is enabled
	 */
	public RepositoryEvent(URI location, int repositoryType, int kind, boolean enabled) {
		super(location);
		this.kind = kind;
		this.type = repositoryType;
		isEnabled = enabled;
	}

	/**
	 * Returns the kind of change that occurred.
	 *
	 * @return the kind of change that occurred.
	 * @see #ADDED
	 * @see #REMOVED
	 * @see #CHANGED
	 * @see #DISCOVERED
	 * @see #ENABLEMENT
	 */
	public int getKind() {
		return kind;
	}

	/**
	 * Returns the nickname of the repository. This method is only applicable
	 * for the {@link #DISCOVERED} event type. For other event types this
	 * method returns <code>null</code>.
	 */
	public String getRepositoryNickname() {
		return nickname;
	}

	/**
	 * Returns the location of the repository associated with this event.
	 * 
	 * @return the location of the repository associated with this event.
	 */
	public URI getRepositoryLocation() {
		return (URI) getSource();
	}

	/**
	 * Returns the type of repository associated with this event. Clients
	 * should not assume that the set of possible repository types is closed;
	 * clients should ignore events from repository types they don't know about.
	 * 
	 * @return the type of repository associated with this event.
	 *  ({@link IRepository#TYPE_METADATA} or {@link IRepository#TYPE_ARTIFACT}).
	 */
	public int getRepositoryType() {
		return type;
	}

	/**
	 * Returns whether the affected repository is enabled.
	 * 
	 * @return <code>true</code> if the repository is enabled,
	 * and <code>false</code> otherwise.
	 */
	public boolean isRepositoryEnabled() {
		return isEnabled;
	}

}




/*******************************************************************************
 * Copyright (c) 2007, 2008 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.p2.core.repository;

import java.net.URI;
import java.util.Map;
import org.eclipse.core.runtime.IAdaptable;

/**
 * Base interface that defines common properties that may be provided by 
 * various kinds of repositories.
 * 
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IRepository extends IAdaptable {
	/** 
	 * The key for a boolean property indicating that the repository
	 * is a system repository.  System repositories are implementation details
	 * that are not subject to general access, hidden from the typical user, etc.
	 */
	public static final String PROP_SYSTEM = "p2.system"; //$NON-NLS-1$

	/**
	 * The key for a boolean property indicating that repository metadata is
	 * stored in compressed form.  A compressed repository will have lower
	 * bandwidth cost to read when remote, but higher processing cost to
	 * uncompress when reading.
	 */
	public static final String PROP_COMPRESSED = "p2.compressed"; //$NON-NLS-1$

	/**
	 * The key for a string property providing a human-readable name for the repository.
	 */
	public static final String PROP_NAME = "name"; //$NON-NLS-1$

	/**
	 * The key for a string property providing a user-defined name for the repository.
	 * This property is never stored in the repository itself, but is instead tracked and managed
	 * by an {@link IRepositoryManager}.
	 */
	public static final String PROP_NICKNAME = "p2.nickname"; //$NON-NLS-1$

	/**
	 * The key for a string property providing a human-readable description for the repository.
	 */
	public static final String PROP_DESCRIPTION = "description"; //$NON-NLS-1$

	/**
	 * The key for a string property providing the common base URL that should
	 * be replaced with the mirror URL.
	 */
	public static final String PROP_MIRRORS_BASE_URL = "p2.mirrorsBaseURL"; //$NON-NLS-1$

	/**
	 * The key for a string property providing a URL that can return mirrors of this
	 * repository.
	 */
	public static final String PROP_MIRRORS_URL = "p2.mirrorsURL"; //$NON-NLS-1$

	/**
	 * The key for a string property containing the time when the repository was last modified.
	 */
	public static final String PROP_TIMESTAMP = "p2.timestamp"; //$NON-NLS-1$

	/**
	 * The key for a string property providing the user name to an authenticated
	 * URL.  This key is used in the secure preference store for repository data.
	 * @see #PREFERENCE_NODE
	 */
	public static final String PROP_USERNAME = "username"; //$NON-NLS-1$

	/**
	 * The key for a string property providing the password to an authenticated
	 * URL.  This key is used in the secure preference store for repository data.
	 * @see #PREFERENCE_NODE
	 */
	public static final String PROP_PASSWORD = "password"; //$NON-NLS-1$

	/**
	 * The node identifier for repository secure preference store.
	 */
	public static final String PREFERENCE_NODE = "org.eclipse.equinox.p2.repository"; //$NON-NLS-1$

	/**
	 * A repository type constant (value 0) representing a metadata repository.
	 */
	public static final int TYPE_METADATA = 0;

	/**
	 * A repository type constant (value 1) representing an artifact repository.
	 */
	public static final int TYPE_ARTIFACT = 1;

	/** 
	 * General purpose zero-valued bit mask constant. Useful whenever you need to
	 * supply a bit mask with no bits set.
	 */
	public static final int NONE = 0;

	/**
	 * An option flag constant (value 1) indicating an enabled repository.
	 */
	public static final int ENABLED = 1;

	/**
	 * Returns the URL of the repository.
	 * TODO: Should we use URL or URI? URL requires a protocol handler
	 * to be installed in Java.  Can the URL have any protocol?
	 * @return the URL of the repository.
	 */
	public URI getLocation();

	/**
	 * Returns the name of the repository.
	 * @return the name of the repository.
	 */
	public String getName();

	/**
	 * Returns a string representing the type of the repository.
	 * @return the type of the repository.
	 */
	public String getType();

	/**
	 * Returns a string representing the version for the repository type.
	 * @return the version of the type of the repository.
	 */
	public String getVersion();

	/**
	 * Returns a brief description of the repository.
	 * @return the description of the repository.
	 */
	public String getDescription();

	/**
	 * Returns the name of the provider of the repository.
	 * @return the provider of this repository.
	 */
	public String getProvider();

	/**
	 * Returns a read-only collection of the properties of the repository.
	 * @return the properties of this repository.
	 */
	public Map getProperties();

	/**
	 * Returns <code>true</code> if this repository can be modified.
	 * @return whether or not this repository can be modified
	 */
	public boolean isModifiable();

	/**
	 * Set the name of the repository.
	 */
	public void setName(String name);

	/**
	 * Sets the description of the repository.
	 */
	public void setDescription(String description);

	/**
	 * Sets the value of the property with the given key. Returns the old property
	 * associated with that key, if any.  Setting a value of <code>null</code> will
	 * remove the corresponding key from the properties of this repository.
	 * 
	 * @param key The property key
	 * @param value The new property value, or <code>null</code> to remove the key
	 * @return The old property value, or <code>null</code> if there was no old value
	 */
	public String setProperty(String key, String value);

	/**
	 * Sets the name of the provider of the repository.
	 */
	public void setProvider(String provider);
}




/*******************************************************************************
 * Copyright (c) 2008 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.p2.core.repository;

import java.net.URI;
import java.util.List;

public interface ICompositeRepository extends IRepository {
	/**
	 * 
	 * @return a list of URIs containing the locations of the children repositories
	 */
	public abstract List getChildren();

	/**
	 * Removes all child repositories
	 */
	public abstract void removeAllChildren();

	/**
	 * Removes specified URI from list of child repositories.
	 * Does nothing if specified URI is not a child repository
	 * @param child
	 */
	public abstract void removeChild(URI child);

	/**
	 * Adds a specified URI to list of child repositories.
	 * Does nothing if URI is a duplicate of an existing child repository.
	 * @param child
	 */
	public abstract void addChild(URI child);
}




/*******************************************************************************
 * 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.p2.core.repository;

import java.net.URI;

/**
 * The common base class for metadata and artifact repository managers.
 * <p>
 * A repository manager keeps track of a set of known repositories, and provides 
 * caching of these known repositories to avoid unnecessary loading of repositories 
 * from the disk or network.  The manager fires {@link RepositoryEvent}s when the 
 * set of known repositories changes.
 * 
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IRepositoryManager {
	/**
	 * Constant used to indicate that all enabled repositories are of interest.
	 */
	public static final int REPOSITORIES_ALL = 0;

	/**
	 * Constant used to indicate that disabled repositories are of interest.
	 * @see #getKnownRepositories(int)
	 */
	public static final int REPOSITORIES_DISABLED = 1 << 3;

	/**
	 * Constant used to indicate that local repositories are of interest.
	 * @see #getKnownRepositories(int)
	 */
	public static final int REPOSITORIES_LOCAL = 1 << 2;

	/**
	 * Constant used to indicate that non-system repositories are of interest.
	 * @see IRepository#PROP_SYSTEM
	 * @see #getKnownRepositories(int)
	 */
	public static final int REPOSITORIES_NON_SYSTEM = 1 << 1;

	/**
	 * Constant used to indicate that system repositories are of interest.
	 * @see IRepository#PROP_SYSTEM
	 * @see #getKnownRepositories(int)
	 */
	public static final int REPOSITORIES_SYSTEM = 1 << 0;

	/**
	 * Constant used to indicate that a repository manager should only load the
	 * repository if the repository is modifiable.
	 * @see IRepository#isModifiable()
	 */
	public static final int REPOSITORY_HINT_MODIFIABLE = 1 << 0;

	/**
	 * Adds the repository at the given location to the list of repositories tracked by 
	 * this repository manager.
	 * <p>
	 * If there is a known disabled repository at the given location, it will become
	 * enabled as a result of this method. Thus the caller can be guaranteed that
	 * there is a known, enabled repository at the given location when this method returns.
	 * 
	 * @param location The location of the repository to add
	 * @see #isEnabled(URI)
	 */
	public void addRepository(URI location);

	/**
	 * Returns whether a repository at the given location is in the list of repositories
	 * tracked by this repository manager.
	 * 
	 * @param location The location of the repository to look for
	 * @return <code>true</code> if the repository is known to this manager,
	 * and <code>false</code> otherwise
	 */
	public boolean contains(URI location);

	/**
	 * Returns the artifact repository locations known to the repository manager.
	 * <p>
	 * Note that the repository manager does not guarantee that a valid repository
	 * exists at any of the returned locations at any particular moment in time.
	 * A subsequent attempt to load a repository at any of the given locations may
	 * or may not succeed.
	 * 
	 * @param flags an integer bit-mask indicating which repositories should be
	 * returned.  <code>REPOSITORIES_ALL</code> can be used as the mask when
	 * all enabled repositories should be returned.
	 * @return the locations of the repositories managed by this repository manager.
	 * 
	 * @see #REPOSITORIES_ALL
	 * @see #REPOSITORIES_SYSTEM
	 * @see #REPOSITORIES_NON_SYSTEM
	 * @see #REPOSITORIES_LOCAL
	 * @see #REPOSITORIES_DISABLED
	 */
	public URI[] getKnownRepositories(int flags);

	/**
	 * Returns the property associated with the repository at the given URI, 
	 * without loading the repository.
	 * <p>
	 * Note that some properties for a repository can only be
	 * determined when that repository is loaded.  This method will return <code>null</code>
	 * for such properties.  Only values for the properties that are already
	 * known by a repository manager will be returned. 
	 * <p>
	 * If a client wishes to retrieve a property value from a repository 
	 * regardless of the cost of retrieving it, the client should load the 
	 * repository and then retrieve the property from the repository itself.
	 * 
	 * @param location the URI of the repository in question
	 * @param key the String key of the property desired
	 * @return the value of the property, or <code>null</code> if the repository
	 * does not exist, the value does not exist, or the property value 
	 * could not be determined without loading the repository.
	 * 
	 * @see IRepository#getProperties()
	 * @see #setRepositoryProperty(URI, String, String)
	 */
	public String getRepositoryProperty(URI location, String key);

	/**
	 * Sets the property associated with the repository at the given URI, 
	 * without loading the repository.
	 * <p>
	 * This method stores properties in a cache in the repository manager and does
	 * not write the property to the backing repository. This is useful for making
	 * repository properties available without incurring the cost of loading the repository.
	 * When the repository is loaded, it will overwrite any conflicting properties that
	 * have been set using this method.
	 * </p>
	 * <p>
	 * To persistently set a property on a repository, clients must load
	 * the repository and call {@link IRepository#setProperty(String, String)}.
	 * </p>
	 * 
	 * @param location the URI of the repository in question
	 * @param key the String key of the property desired
	 * @param value the value to set the property to
	 * @see #getRepositoryProperty(URI, String)
	 * @see IRepository#setProperty(String, String)
	 */
	public void setRepositoryProperty(URI location, String key, String value);

	/**
	 * Returns the enablement value of a repository.  Disabled repositories are known
	 * to the repository manager, but are never used in the context of provisioning
	 * operations. Disabled repositories are useful as a form of bookmark to indicate that a 
	 * repository location is of interest, but not currently used.
	 * <p>
	 * Note that enablement is a property of the repository manager and not a property
	 * of the affected repository. The enablement of the repository is discarded when 
	 * a repository is removed from the repository manager.
	 * 
	 * @param location The location of the repository whose enablement is requested
	 * @return <code>true</code> if the repository is enabled, and
	 * <code>false</code> if it is not enabled, or if the repository location 
	 * is not known to the repository manager.
	 * @see #REPOSITORIES_DISABLED
	 * @see #setEnabled(URI, boolean)
	 */
	public boolean isEnabled(URI location);

	/**
	 * Removes the repository at the given location from the list of
	 * repositories known to this repository manager.  The underlying
	 * repository is not deleted. This method has no effect if the given
	 * repository is not already known to this repository manager.
	 * 
	 * @param location The location of the repository to remove
	 * @return <code>true</code> if a repository was removed, and 
	 * <code>false</code> otherwise.
	 */
	public boolean removeRepository(URI location);

	/**
	 * Sets the enablement of a repository. Disabled repositories are known
	 * to the repository manager, but are never used in the context of provisioning
	 * operation. Disabled repositories are useful as a form of bookmark to indicate that a 
	 * repository location is of interest, but not currently used.
	 * <p>
	 * Note that enablement is a property of the repository manager and not a property
	 * of the affected repository. The enablement of the repository is discarded when 
	 * a repository is removed from the repository manager.
	 * <p>
	 * This method has no effect if the given repository location is not known to the
	 * repository manager.
	 * 
	 * @param location The location of the repository to enable or disable
	 * @param enablement <code>true</code>to enable the repository, and
	 * <code>false</code> to disable the repository
	 * @see #REPOSITORIES_DISABLED
	 * @see #isEnabled(URI)
	 */
	public void setEnabled(URI location, boolean enablement);

}




/*******************************************************************************
 * Copyright (c) 2007, 2008 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.p2.core.repository;

public class RepositoryCreationException extends Exception {

	private static final long serialVersionUID = -5648382121963317100L;

	public RepositoryCreationException(Throwable e) {
		super(e);
	}

}




#     IBM Corporation - initial API and implementation
###############################################################################

repoMan_adding = Adding repository {0}
repoMan_exists=Repository already exists at {0}.
repoMan_failedRead=The repository could not be read: {0}.
repoMan_internalError=Internal error.
repoMan_notExists=No repository found at {0}.
repoMan_save=Saving repository settings
repoMan_unknownType=Unknown repository type at {0}.

Util_Invalid_Zip_File_Format=Invalid zip file format
Util_Error_Unzipping=Error unzipping {0}: {1}




		// Do not instantiate
	}

	public static String repoMan_adding;
	public static String repoMan_exists;
	public static String repoMan_failedRead;
	public static String repoMan_internalError;
	public static String repoMan_notExists;
	public static String repoMan_save;
	public static String repoMan_unknownType;

	public static String Util_Invalid_Zip_File_Format;
	public static String Util_Error_Unzipping;





/*******************************************************************************
 * 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.p2.core.helpers;

import java.lang.ref.SoftReference;
import java.net.*;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.preferences.IPreferencesService;
import org.eclipse.equinox.internal.p2.core.Activator;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener;
import org.eclipse.equinox.internal.provisional.p2.core.repository.*;
import org.eclipse.osgi.util.NLS;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;

/**
 * Common code shared between artifact and metadata repository managers.
 */
public abstract class AbstractRepositoryManager implements IRepositoryManager, ProvisioningListener {
	protected static class RepositoryInfo {
		public String description;
		public boolean isEnabled = true;
		public boolean isSystem = false;
		public URI location;
		public String name;
		public String nickname;
		public SoftReference repository;
		public String suffix;

		public RepositoryInfo() {
			super();
		}
	}

	public static final String ATTR_SUFFIX = "suffix"; //$NON-NLS-1$
	public static final String EL_FACTORY = "factory"; //$NON-NLS-1$
	public static final String EL_FILTER = "filter"; //$NON-NLS-1$
	public static final String KEY_DESCRIPTION = "description"; //$NON-NLS-1$
	public static final String KEY_ENABLED = "enabled"; //$NON-NLS-1$
	public static final String KEY_NAME = "name"; //$NON-NLS-1$
	public static final String KEY_NICKNAME = "nickname"; //$NON-NLS-1$
	public static final String KEY_PROVIDER = "provider"; //$NON-NLS-1$
	public static final String KEY_SUFFIX = "suffix"; //$NON-NLS-1$
	public static final String KEY_SYSTEM = "isSystem"; //$NON-NLS-1$
	public static final String KEY_TYPE = "type"; //$NON-NLS-1$
	public static final String KEY_URI = "uri"; //$NON-NLS-1$
	public static final String KEY_URL = "url"; //$NON-NLS-1$
	public static final String KEY_VERSION = "version"; //$NON-NLS-1$

	public static final String NODE_REPOSITORIES = "repositories"; //$NON-NLS-1$

	/**
	 * Map of String->RepositoryInfo, where String is the repository key
	 * obtained via getKey(URI).
	 */
	protected Map repositories = null;

	//lock object to be held when referring to the repositories field
	protected final Object repositoryLock = new Object();

	/**
	 * Cache List of repositories that are not reachable. Maintain cache
	 * for short duration because repository may become available at any time.
	 */
	protected SoftReference unavailableRepositories;

	/**
	 * Set used to manage exclusive load locks on repository locations.
	 */
	private Map loadLocks = new HashMap();

	protected AbstractRepositoryManager() {
		IProvisioningEventBus bus = (IProvisioningEventBus) ServiceHelper.getService(Activator.getContext(), IProvisioningEventBus.SERVICE_NAME);
		if (bus != null)
			bus.addListener(this);
	}

	/**
	 * Adds a repository to the list of known repositories
	 * @param repository the repository object to add
	 * @param signalAdd whether a repository change event should be fired
	 * @param suffix the suffix used to load the repository, or <code>null</code> if unknown
	 */
	protected void addRepository(IRepository repository, boolean signalAdd, String suffix) {
		boolean added = false;
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			String key = getKey(repository.getLocation());
			RepositoryInfo info = (RepositoryInfo) repositories.get(key);
			if (info == null) {
				info = new RepositoryInfo();
				added = true;
				repositories.put(key, info);
			}
			info.repository = new SoftReference(repository);
			info.name = repository.getName();
			info.description = repository.getDescription();
			info.location = repository.getLocation();
			String value = (String) repository.getProperties().get(IRepository.PROP_SYSTEM);
			if (value != null)
				info.isSystem = Boolean.valueOf(value).booleanValue();
			info.suffix = suffix;
		}
		// save the given repository in the preferences.
		remember(repository, suffix);
		if (added && signalAdd)
			broadcastChangeEvent(repository.getLocation(), IRepository.TYPE_METADATA, RepositoryEvent.ADDED, true);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager#addRepository(java.net.URI)
	 */
	public void addRepository(URI location) {
		//add the repository, or enable it if already known
		if (!addRepository(location, true, true))
			setEnabled(location, true);
	}

	/**
	 * Adds the repository to the list of known repositories. 
	 * @param location The repository location
	 * @param isEnabled Whether the repository should be enabled
	 * @param signalAdd Whether a repository add event should be broadcast
	 * @return <code>true</code> if the repository was actually added, and 
	 * <code>false</code> otherwise.
	 */
	private boolean addRepository(URI location, boolean isEnabled, boolean signalAdd) {
		RepositoryInfo info = new RepositoryInfo();
		info.location = location;
		info.isEnabled = isEnabled;
		boolean added = true;
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			if (contains(location))
				return false;
			added = repositories.put(getKey(location), info) == null;
			// save the given repository in the preferences.
			remember(info, true);
		}
		if (added && signalAdd)
			broadcastChangeEvent(location, getRepositoryType(), RepositoryEvent.ADDED, isEnabled);
		return added;
	}

	protected IRepository basicGetRepository(URI location) {
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			RepositoryInfo info = (RepositoryInfo) repositories.get(getKey(location));
			if (info == null || info.repository == null)
				return null;
			IRepository repo = (IRepository) info.repository.get();
			//update our repository info because the repository may have changed
			if (repo != null)
				addRepository(repo, false, null);
			return repo;
		}
	}

	public IRepository basicRefreshRepository(URI location, IProgressMonitor monitor) throws ProvisionException {
		clearNotFound(location);
		boolean wasEnabled = isEnabled(location);
		//remove the repository so  event is broadcast and repositories can clear their caches
		if (!removeRepository(location))
			fail(location, ProvisionException.REPOSITORY_NOT_FOUND);
		try {
			IRepository result = loadRepository(location, monitor, null, 0);
			setEnabled(location, wasEnabled);
			return result;
		} catch (ProvisionException e) {
			//if we failed to load, make sure the repository is not lost
			addRepository(location, wasEnabled, true);
			throw e;
		}
	}

	private void broadcastChangeEvent(URI location, int repositoryType, int kind, boolean isEnabled) {
		IProvisioningEventBus bus = (IProvisioningEventBus) ServiceHelper.getService(Activator.getContext(), IProvisioningEventBus.class.getName());
		if (bus != null)
			bus.publishEvent(new RepositoryEvent(location, repositoryType, kind, isEnabled));
	}

	/**
	 * Check if we recently attempted to load the given location and failed
	 * to find anything. Returns <code>true</code> if the repository was not
	 * found, and <code>false</code> otherwise.
	 */
	private boolean checkNotFound(URI location) {
		if (unavailableRepositories == null)
			return false;
		List badRepos = (List) unavailableRepositories.get();
		if (badRepos == null)
			return false;
		return badRepos.contains(location);
	}

	/**
	 * Clear the fact that we tried to load a repository at this location and did not find anything.
	 */
	protected void clearNotFound(URI location) {
		List badRepos;
		if (unavailableRepositories != null) {
			badRepos = (List) unavailableRepositories.get();
			if (badRepos != null) {
				badRepos.remove(location);
				return;
			}
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager#contains(java.net.URI)
	 */
	public boolean contains(URI location) {
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			return repositories.containsKey(getKey(location));
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager#createRepository(java.net.URL, java.lang.String, java.lang.String, java.util.Map)
	 */
	protected IRepository doCreateRepository(URI location, String name, String type, Map properties) throws ProvisionException {
		Assert.isNotNull(name);
		Assert.isNotNull(type);
		IRepository result = null;
		try {
			enterLoad(location);
			boolean loaded = false;
			try {
				//repository should not already exist
				loadRepository(location, (IProgressMonitor) null, type, 0);
				loaded = true;
			} catch (ProvisionException e) {
				//expected - fall through and create the new repository
			}
			if (loaded)
				fail(location, ProvisionException.REPOSITORY_EXISTS);

			IExtension extension = RegistryFactory.getRegistry().getExtension(getRepositoryProviderExtensionPointId(), type);
			if (extension == null)
				fail(location, ProvisionException.REPOSITORY_UNKNOWN_TYPE);
			//		MetadataRepositoryFactory factory = (MetadataRepositoryFactory) createExecutableExtension(extension, EL_FACTORY);
			//		if (factory == null)
			//			fail(location, ProvisionException.REPOSITORY_FAILED_READ);
			result = factoryCreate(location, name, type, properties, extension);
			if (result == null)
				fail(location, ProvisionException.REPOSITORY_FAILED_READ);
			clearNotFound(location);
			addRepository(result, false, null);
		} finally {
			exitLoad(location);
		}
		//fire event after releasing load lock
		broadcastChangeEvent(location, getRepositoryType(), RepositoryEvent.ADDED, true);
		return result;
	}

	/**
	 * Returns the executable extension, or <code>null</code> if there
	 * was no corresponding extension, or an error occurred loading it
	 */
	protected Object createExecutableExtension(IExtension extension, String element) {
		IConfigurationElement[] elements = extension.getConfigurationElements();
		CoreException failure = null;
		for (int i = 0; i < elements.length; i++) {
			if (elements[i].getName().equals(element)) {
				try {
					return elements[i].createExecutableExtension("class"); //$NON-NLS-1$
				} catch (CoreException e) {
					log("Error loading repository extension: " + extension.getUniqueIdentifier(), failure); //$NON-NLS-1$
					return null;
				}
			}
		}
		log("Malformed repository extension: " + extension.getUniqueIdentifier(), null); //$NON-NLS-1$
		return null;
	}

	/**
	 * Obtains an exclusive right to load a repository at the given location. Blocks
	 * if another thread is currently loading at that location. Invocation of this
	 * method must be followed by a subsequent call to {@link #exitLoad(URI)}.
	 * 
	 * To avoid deadlock between the loadLock and repositoryLock, this method
	 * must not be called when repositoryLock is held.
	 * 
	 * @param location The location to lock
	 */
	private void enterLoad(URI location) {
		Thread current = Thread.currentThread();
		synchronized (loadLocks) {
			while (true) {
				Thread owner = (Thread) loadLocks.get(location);
				if (owner == null || current.equals(owner))
					break;
				try {
					loadLocks.wait();
				} catch (InterruptedException e) {
					//keep trying
				}
			}
			loadLocks.put(location, current);
		}
	}

	/**
	 * Relinquishes the exclusive right to load a repository at the given location. Unblocks
	 * other threads waiting to load at that location.
	 * @param location The location to unlock
	 */
	private void exitLoad(URI location) {
		synchronized (loadLocks) {
			loadLocks.remove(location);
			loadLocks.notifyAll();
		}
	}

	/**
	 * Creates and returns a repository using the given repository factory extension. Returns
	 * null if no factory could be found associated with that extension.
	 */
	protected abstract IRepository factoryCreate(URI location, String name, String type, Map properties, IExtension extension) throws ProvisionException;

	/**
	 * Loads and returns a repository using the given repository factory extension. Returns
	 * null if no factory could be found associated with that extension.
	 */
	protected abstract IRepository factoryLoad(URI location, IExtension extension, int flags, SubMonitor monitor) throws ProvisionException;

	protected void fail(URI location, int code) throws ProvisionException {
		String msg = null;
		switch (code) {
			case ProvisionException.REPOSITORY_EXISTS :
				msg = NLS.bind(Messages.repoMan_exists, location);
				break;
			case ProvisionException.REPOSITORY_UNKNOWN_TYPE :
				msg = NLS.bind(Messages.repoMan_unknownType, location);
				break;
			case ProvisionException.REPOSITORY_FAILED_READ :
				msg = NLS.bind(Messages.repoMan_failedRead, location);
				break;
			case ProvisionException.REPOSITORY_NOT_FOUND :
				msg = NLS.bind(Messages.repoMan_notExists, location);
				break;
		}
		if (msg == null)
			msg = Messages.repoMan_internalError;
		throw new ProvisionException(new Status(IStatus.ERROR, getBundleId(), code, msg, null));
	}

	protected IExtension[] findMatchingRepositoryExtensions(String suffix, String type) {
		IConfigurationElement[] elt = null;
		if (type != null && type.length() > 0) {
			IExtension ext = RegistryFactory.getRegistry().getExtension(getRepositoryProviderExtensionPointId(), type);
			elt = (ext != null) ? ext.getConfigurationElements() : new IConfigurationElement[0];
		} else {
			elt = RegistryFactory.getRegistry().getConfigurationElementsFor(getRepositoryProviderExtensionPointId());
		}
		int count = 0;
		for (int i = 0; i < elt.length; i++) {
			if (EL_FILTER.equals(elt[i].getName())) {
				if (!suffix.equals(elt[i].getAttribute(ATTR_SUFFIX))) {
					elt[i] = null;
				} else {
					count++;
				}
			} else {
				elt[i] = null;
			}
		}
		IExtension[] results = new IExtension[count];
		for (int i = 0; i < elt.length; i++) {
			if (elt[i] != null)
				results[--count] = elt[i].getDeclaringExtension();
		}
		return results;
	}

	protected String[] getAllSuffixes() {
		IConfigurationElement[] elements = RegistryFactory.getRegistry().getConfigurationElementsFor(getRepositoryProviderExtensionPointId());
		ArrayList result = new ArrayList(elements.length);
		result.add(getDefaultSuffix());
		for (int i = 0; i < elements.length; i++) {
			if (elements[i].getName().equals(EL_FILTER)) {
				String suffix = elements[i].getAttribute(ATTR_SUFFIX);
				if (!result.contains(suffix))
					result.add(suffix);
			}
		}
		return (String[]) result.toArray(new String[result.size()]);
	}

	/**
	 * Returns the bundle id of the bundle that provides the concrete repository manager
	 * @return a symbolic bundle id
	 */
	protected abstract String getBundleId();

	/**
	 * Returns the default repository suffix. This is used to ensure a particular
	 * repository type is preferred over all others.
	 */
	protected abstract String getDefaultSuffix();

	/*
	 * Return a string key based on the given repository location which
	 * is suitable for use as a preference node name.
	 * TODO: convert local file system URI to canonical form
	 */
	private String getKey(URI location) {
		String key = location.toString().replace('/', '_');
		//remove trailing slash
		if (key.endsWith("_")) //$NON-NLS-1$
			key = key.substring(0, key.length() - 1);
		return key;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager#getKnownRepositories(int)
	 */
	public URI[] getKnownRepositories(int flags) {
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			ArrayList result = new ArrayList();
			int i = 0;
			for (Iterator it = repositories.values().iterator(); it.hasNext(); i++) {
				RepositoryInfo info = (RepositoryInfo) it.next();
				if (matchesFlags(info, flags))
					result.add(info.location);
			}
			return (URI[]) result.toArray(new URI[result.size()]);
		}
	}

	/**
	 * Return the preference node which is the root for where we store the repository information.
	 */
	Preferences getPreferences() {
		IPreferencesService prefService = (IPreferencesService) ServiceHelper.getService(Activator.getContext(), IPreferencesService.class.getName());

		try {
			return prefService.getRootNode().node("/profile/_SELF_/" + getBundleId() + "/" + NODE_REPOSITORIES); //$NON-NLS-1$ //$NON-NLS-2$
		} catch (IllegalArgumentException e) {
			return null;
		}
	}

	/**
	 * Restores a repository location from the preferences.
	 */
	private URI getRepositoryLocation(Preferences node) {
		//prefer the location stored in URI form
		String locationString = node.get(KEY_URI, null);
		try {
			if (locationString != null)
				return new URI(locationString);
		} catch (URISyntaxException e) {
			log("Error while restoring repository: " + locationString, e); //$NON-NLS-1$
		}
		//we used to store the repository as a URL, so try old key for backwards compatibility
		locationString = node.get(KEY_URL, null);
		try {
			if (locationString != null)
				return URIUtil.toURI(new URL(locationString));
		} catch (MalformedURLException e) {
			log("Error while restoring repository: " + locationString, e); //$NON-NLS-1$
		} catch (URISyntaxException e) {
			log("Error while restoring repository: " + locationString, e); //$NON-NLS-1$
		}
		return null;
	}

	/*(non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager#getRepositoryProperty(java.net.URI, java.lang.String)
	 */
	public String getRepositoryProperty(URI location, String key) {
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			RepositoryInfo info = (RepositoryInfo) repositories.get(getKey(location));
			if (info == null)
				return null;// Repository not found
			if (IRepository.PROP_DESCRIPTION.equals(key))
				return info.description;
			else if (IRepository.PROP_NAME.equals(key))
				return info.name;
			else if (IRepository.PROP_SYSTEM.equals(key))
				return Boolean.toString(info.isSystem);
			else if (IRepository.PROP_NICKNAME.equals(key))
				return info.nickname;
			// Key not known, return null
			return null;
		}
	}

	/*(non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager#getRepositoryProperty(java.net.URI, java.lang.String)
	 */
	public void setRepositoryProperty(URI location, String key, String value) {
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			RepositoryInfo info = (RepositoryInfo) repositories.get(getKey(location));
			if (info == null)
				return;// Repository not found
			if (IRepository.PROP_DESCRIPTION.equals(key))
				info.description = value;
			else if (IRepository.PROP_NAME.equals(key))
				info.name = value;
			else if (IRepository.PROP_NICKNAME.equals(key))
				info.nickname = value;
			else if (IRepository.PROP_SYSTEM.equals(key))
				//only true if value.equals("true") which is OK because a repository is only system if it's explicitly set to system.
				info.isSystem = Boolean.valueOf(value).booleanValue();
			remember(info, true);
		}
	}

	/**
	 * Returns the fully qualified id of the repository provider extension point.
	 */
	protected abstract String getRepositoryProviderExtensionPointId();

	/**
	 * Returns the system property used to specify additional repositories to be
	 * automatically added to the list of known repositories.
	 */
	protected abstract String getRepositorySystemProperty();

	/**
	 * Returns the repository type stored in this manager.
	 */
	protected abstract int getRepositoryType();

	/* (non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager#isEnabled(java.net.URI)
	 */
	public boolean isEnabled(URI location) {
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			RepositoryInfo info = (RepositoryInfo) repositories.get(getKey(location));
			if (info != null)
				return info.isEnabled;
			// Repository not found, return false
			return false;
		}
	}

	protected IRepository loadRepository(URI location, IProgressMonitor monitor, String type, int flags) throws ProvisionException {
		boolean added = false;
		IRepository result = null;

		try {
			enterLoad(location);
			result = basicGetRepository(location);
			if (result != null)
				return result;
			if (checkNotFound(location))
				fail(location, ProvisionException.REPOSITORY_NOT_FOUND);
			//add the repository first so that it will be enabled, but don't send add event until after the load
			added = addRepository(location, true, false);
			String[] suffixes = sortSuffixes(getAllSuffixes(), location);
			SubMonitor sub = SubMonitor.convert(monitor, NLS.bind(Messages.repoMan_adding, location), suffixes.length * 100);
			ProvisionException failure = null;
			try {
				for (int i = 0; i < suffixes.length; i++) {
					if (sub.isCanceled())
						throw new OperationCanceledException();
					try {
						result = loadRepository(location, suffixes[i], type, flags, sub.newChild(100));
					} catch (ProvisionException e) {
						failure = e;
						break;
					}
					if (result != null) {
						addRepository(result, false, suffixes[i]);
						break;
					}
				}
			} finally {
				sub.done();
			}
			if (result == null) {
				//if we just added the repository, remove it because it cannot be loaded
				if (added)
					removeRepository(location, false);
				//eagerly cleanup missing system repositories
				if (Boolean.valueOf(getRepositoryProperty(location, IRepository.PROP_SYSTEM)).booleanValue())
					removeRepository(location);
				else
					rememberNotFound(location);
				if (failure != null)
					throw failure;
				fail(location, ProvisionException.REPOSITORY_NOT_FOUND);
			}
		} finally {
			exitLoad(location);
		}
		//broadcast the add event after releasing lock
		if (added)
			broadcastChangeEvent(location, IRepository.TYPE_METADATA, RepositoryEvent.ADDED, true);
		return result;
	}

	private IRepository loadRepository(URI location, String suffix, String type, int flags, SubMonitor monitor) throws ProvisionException {
		IExtension[] providers = findMatchingRepositoryExtensions(suffix, type);
		// Loop over the candidates and return the first one that successfully loads
		monitor.beginTask("", providers.length * 10); //$NON-NLS-1$
		for (int i = 0; i < providers.length; i++)
			try {
				IRepository repo = factoryLoad(location, providers[i], flags, monitor);
				if (repo != null)
					return repo;
			} catch (ProvisionException e) {
				if (e.getStatus().getCode() != ProvisionException.REPOSITORY_NOT_FOUND)
					throw e;
			} catch (Exception e) {
				//catch and log unexpected errors and move onto the next factory
				log("Unexpected error loading extension: " + providers[i].getUniqueIdentifier(), e); //$NON-NLS-1$
			} catch (LinkageError e) {
				//catch and log unexpected errors and move onto the next factory
				log("Unexpected error loading extension: " + providers[i].getUniqueIdentifier(), e); //$NON-NLS-1$
			}
		return null;
	}

	protected void log(String message, Throwable t) {
		LogHelper.log(new Status(IStatus.ERROR, getBundleId(), message, t));
	}

	private boolean matchesFlags(RepositoryInfo info, int flags) {
		if ((flags & REPOSITORIES_SYSTEM) == REPOSITORIES_SYSTEM)
			if (!info.isSystem)
				return false;
		if ((flags & REPOSITORIES_NON_SYSTEM) == REPOSITORIES_NON_SYSTEM)
			if (info.isSystem)
				return false;
		if ((flags & REPOSITORIES_DISABLED) == REPOSITORIES_DISABLED) {
			if (info.isEnabled)
				return false;
		} else {
			//ignore disabled repositories for all other flag types
			if (!info.isEnabled)
				return false;
		}
		if ((flags & REPOSITORIES_LOCAL) == REPOSITORIES_LOCAL)
			return "file".equals(info.location.getScheme()); //$NON-NLS-1$
		return true;
	}

	/*(non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener#notify(java.util.EventObject)
	 */
	public void notify(EventObject o) {
		if (o instanceof RepositoryEvent) {
			RepositoryEvent event = (RepositoryEvent) o;
			if (event.getKind() == RepositoryEvent.DISCOVERED && event.getRepositoryType() == getRepositoryType())
				addRepository(event.getRepositoryLocation(), event.isRepositoryEnabled(), true);
		}
	}

	/**
	 * Sets a preference and returns <code>true</code> if the preference
	 * was actually changed.
	 */
	protected boolean putValue(Preferences node, String key, String newValue) {
		String oldValue = node.get(key, null);
		if (oldValue == newValue || (oldValue != null && oldValue.equals(newValue)))
			return false;
		if (newValue == null)
			node.remove(key);
		else
			node.put(key, newValue);
		return true;
	}

	/*
	 * Add the given repository object to the preferences and save.
	 */
	private void remember(IRepository repository, String suffix) {
		boolean changed = false;
		Preferences node = getPreferences();
		// Ensure we retrieved preferences
		if (node == null)
			return;
		node = node.node(getKey(repository.getLocation()));

		try {
			changed |= putValue(node, KEY_URI, repository.getLocation().toString());
			changed |= putValue(node, KEY_URL, null);
			changed |= putValue(node, KEY_DESCRIPTION, repository.getDescription());
			changed |= putValue(node, KEY_NAME, repository.getName());
			changed |= putValue(node, KEY_PROVIDER, repository.getProvider());
			changed |= putValue(node, KEY_TYPE, repository.getType());
			changed |= putValue(node, KEY_VERSION, repository.getVersion());
			changed |= putValue(node, KEY_SYSTEM, (String) repository.getProperties().get(IRepository.PROP_SYSTEM));
			changed |= putValue(node, KEY_SUFFIX, suffix);
			if (changed)
				saveToPreferences();
		} catch (IllegalStateException e) {
			//the repository was removed concurrently, so we don't need to save it
		}
	}

	/**
	 * Writes the state of the repository information into the appropriate preference node.
	 * 
	 * @param info The info to write to the preference node
	 * @param flush <code>true</code> if the preference node should be flushed to
	 * disk, and <code>false</code> otherwise
	 */
	private boolean remember(RepositoryInfo info, boolean flush) {
		boolean changed = false;
		Preferences node = getPreferences();
		// Ensure we retrieved preferences
		if (node == null)
			return changed;
		node = node.node(getKey(info.location));
		try {
			changed |= putValue(node, KEY_URI, info.location.toString());
			changed |= putValue(node, KEY_URL, null);
			changed |= putValue(node, KEY_SYSTEM, Boolean.toString(info.isSystem));
			changed |= putValue(node, KEY_DESCRIPTION, info.description);
			changed |= putValue(node, KEY_NAME, info.name);
			changed |= putValue(node, KEY_NICKNAME, info.nickname);
			changed |= putValue(node, KEY_SUFFIX, info.suffix);
			changed |= putValue(node, KEY_ENABLED, Boolean.toString(info.isEnabled));
			if (changed && flush)
				saveToPreferences();
			return changed;
		} catch (IllegalStateException e) {
			//the repository was removed concurrently, so we don't need to save it
			return false;
		}
	}

	/**
	 * Cache the fact that we tried to load a repository at this location and did not find anything.
	 */
	private void rememberNotFound(URI location) {
		List badRepos;
		if (unavailableRepositories != null) {
			badRepos = (List) unavailableRepositories.get();
			if (badRepos != null) {
				badRepos.add(location);
				return;
			}
		}
		badRepos = new ArrayList();
		badRepos.add(location);
		unavailableRepositories = new SoftReference(badRepos);
	}

	public boolean removeRepository(URI toRemove) {
		return removeRepository(toRemove, true);
	}

	private boolean removeRepository(URI toRemove, boolean signalRemove) {
		Assert.isNotNull(toRemove);
		final String repoKey = getKey(toRemove);
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			if (repositories.remove(repoKey) == null)
				return false;
		}
		// remove the repository from the preference store
		try {
			if (Tracing.DEBUG_REMOVE_REPO) {
				String msg = "Removing repository: " + toRemove; //$NON-NLS-1$
				Tracing.debug(msg);
				new Exception(msg).printStackTrace();
			}
			Preferences node = getPreferences();
			if (node != null) {
				getPreferences().node(repoKey).removeNode();
				saveToPreferences();
			}
			clearNotFound(toRemove);
		} catch (BackingStoreException e) {
			log("Error saving preferences", e); //$NON-NLS-1$
		}
		//TODO: compute and pass appropriate isEnabled flag
		if (signalRemove)
			broadcastChangeEvent(toRemove, getRepositoryType(), RepositoryEvent.REMOVED, true);
		return true;
	}

	/*
	 * Load the list of repositories from the preferences.
	 */
	private void restoreFromPreferences() {
		// restore the list of repositories from the preference store
		Preferences node = getPreferences();
		if (node == null)
			return;
		String[] children;
		try {
			children = node.childrenNames();
		} catch (BackingStoreException e) {
			log("Error restoring repositories from preferences", e); //$NON-NLS-1$
			return;
		}
		for (int i = 0; i < children.length; i++) {
			Preferences child = node.node(children[i]);
			URI location = getRepositoryLocation(child);
			if (location == null)
				continue;
			RepositoryInfo info = new RepositoryInfo();
			info.location = location;
			info.name = child.get(KEY_NAME, null);
			info.nickname = child.get(KEY_NICKNAME, null);
			info.description = child.get(KEY_DESCRIPTION, null);
			info.isSystem = child.getBoolean(KEY_SYSTEM, false);
			info.isEnabled = child.getBoolean(KEY_ENABLED, true);
			info.suffix = child.get(KEY_SUFFIX, null);
			repositories.put(getKey(info.location), info);
		}
		// now that we have loaded everything, remember them
		saveToPreferences();
	}

	private void restoreFromSystemProperty() {
		String locationString = Activator.getContext().getProperty(getRepositorySystemProperty());
		if (locationString != null) {
			StringTokenizer tokenizer = new StringTokenizer(locationString, ","); //$NON-NLS-1$
			while (tokenizer.hasMoreTokens()) {
				try {
					addRepository(new URI(tokenizer.nextToken()), true, true);
				} catch (URISyntaxException e) {
					log("Error while restoring repository " + locationString, e); //$NON-NLS-1$
				}
			}
		}
	}

	/**
	 * Restores the repository list.
	 */
	private void restoreRepositories() {
		synchronized (repositoryLock) {
			repositories = new HashMap();
			restoreSpecialRepositories();
			restoreFromSystemProperty();
			restoreFromPreferences();
		}
	}

	/**
	 * Hook method to restore special additional repositories.
	 */
	protected void restoreSpecialRepositories() {
		//by default no special repositories
	}

	/*
	 * Save the list of repositories to the file-system.
	 */
	private void saveToPreferences() {
		try {
			Preferences node = getPreferences();
			if (node != null)
				node.flush();
		} catch (BackingStoreException e) {
			log("Error while saving repositories in preferences", e); //$NON-NLS-1$
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager#setEnabled(java.net.URI, boolean)
	 */
	public void setEnabled(URI location, boolean enablement) {
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			RepositoryInfo info = (RepositoryInfo) repositories.get(getKey(location));
			if (info == null || info.isEnabled == enablement)
				return;
			info.isEnabled = enablement;
			remember(info, true);
		}
		broadcastChangeEvent(location, getRepositoryType(), RepositoryEvent.ENABLEMENT, enablement);
	}

	/**
	 * Shuts down the repository manager.
	 */
	public void shutdown() {
		IProvisioningEventBus bus = (IProvisioningEventBus) ServiceHelper.getService(Activator.getContext(), IProvisioningEventBus.SERVICE_NAME);
		if (bus != null)
			bus.removeListener(this);
		//ensure all repository state in memory is written to disk
		boolean changed = false;
		synchronized (repositoryLock) {
			if (repositories != null) {
				for (Iterator it = repositories.values().iterator(); it.hasNext();) {
					RepositoryInfo info = (RepositoryInfo) it.next();
					changed |= remember(info, false);
				}
			}
		}
		if (changed) {
			if (Tracing.DEBUG)
				Tracing.debug("Unsaved preferences when shutting down " + getClass().getName()); //$NON-NLS-1$
			saveToPreferences();
		}
		repositories = null;
		unavailableRepositories = null;
	}

	/**
	 * Optimize the order in which repository suffixes are searched by trying 
	 * the last successfully loaded suffix first.
	 */
	private String[] sortSuffixes(String[] suffixes, URI location) {
		synchronized (repositoryLock) {
			if (repositories == null)
				restoreRepositories();
			RepositoryInfo info = (RepositoryInfo) repositories.get(getKey(location));
			if (info == null || info.suffix == null)
				return suffixes;
			//move lastSuffix to the front of the list but preserve order of remaining entries
			String lastSuffix = info.suffix;
			for (int i = 0; i < suffixes.length; i++) {
				if (lastSuffix.equals(suffixes[i])) {
					System.arraycopy(suffixes, 0, suffixes, 1, i);
					suffixes[0] = lastSuffix;
					return suffixes;
				}
			}
		}
		return suffixes;
	}

}




/*******************************************************************************
 * Copyright (c) 2007, 2008 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
 *     Genuitec, LLC - added license support
 *******************************************************************************/
package org.eclipse.equinox.internal.p2.persistence;

public interface XMLConstants {

	// Constants used in defining a default processing instruction
	// including a class name and a version of the associated XML
	// for some category of objects.
	//	e.g. <?category class='a.b.c.SomeClass' version='1.2.3'?>
	//
	public static final String PI_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
	public static final String PI_VERSION_ATTRIBUTE = "version"; //$NON-NLS-1$

	// Element and attribute names for a standard property collection.
	//	e.g. <properties size='1'>
	//			<property name='some_name' value='some_value'/>
	//		 </properties>
	public static final String PROPERTIES_ELEMENT = "properties"; //$NON-NLS-1$
	public static final String PROPERTY_ELEMENT = "property"; //$NON-NLS-1$
	public static final String PROPERTY_NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
	public static final String PROPERTY_VALUE_ATTRIBUTE = "value"; //$NON-NLS-1$

	// Constants for the names of common general attributes
	public static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$
	public static final String PARENT_ID_ATTRIBUTE = "parentId"; //$NON-NLS-1$
	public static final String TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
	public static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
	public static final String VERSION_ATTRIBUTE = "version"; //$NON-NLS-1$
	public static final String VERSION_RANGE_ATTRIBUTE = "range"; //$NON-NLS-1$
	public static final String NAMESPACE_ATTRIBUTE = "namespace"; //$NON-NLS-1$
	public static final String CLASSIFIER_ATTRIBUTE = "classifier"; //$NON-NLS-1$
	public static final String DESCRIPTION_ATTRIBUTE = "description"; //$NON-NLS-1$
	public static final String PROVIDER_ATTRIBUTE = "provider"; //$NON-NLS-1$
	public static final String URL_ATTRIBUTE = "url"; //$NON-NLS-1$
	public static final String URI_ATTRIBUTE = "uri"; //$NON-NLS-1$

	// Constants for the license and copyright elements
	public static final String LICENSES_ELEMENT = "licenses"; //$NON-NLS-1$
	public static final String LICENSE_ELEMENT = "license"; //$NON-NLS-1$
	public static final String COPYRIGHT_ELEMENT = "copyright"; //$NON-NLS-1$

	// A constant for the name of an attribute of a collection or array element
	// specifying the size or length
	public static final String COLLECTION_SIZE_ATTRIBUTE = "size"; //$NON-NLS-1$

	// A constant for an empty array of attribute names
	public static String[] noAttributes = new String[0];

	//Constants for attributes of a composite repository
	public static final String CHILDREN_ELEMENT = "children"; //$NON-NLS-1$
	public static final String CHILD_ELEMENT = "child"; //$NON-NLS-1$
	public static final String LOCATION_ELEMENT = "location"; //$NON-NLS-1$
}




/*******************************************************************************
 * 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.p2.persistence;

import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.internal.provisional.p2.core.repository.ICompositeRepository;

/*
 * Class used to persist a composite repository.
 */
public class CompositeWriter extends XMLWriter implements XMLConstants {

	private static final String REPOSITORY_ELEMENT = "repository"; //$NON-NLS-1$
	private static final Version CURRENT_VERSION = new Version(1, 0, 0);

	public CompositeWriter(OutputStream output, String type) throws UnsupportedEncodingException {
		super(output, new XMLWriter.ProcessingInstruction[] {XMLWriter.ProcessingInstruction.makeClassVersionInstruction(type, ICompositeRepository.class, CURRENT_VERSION)});
		// TODO: add a processing instruction for the metadata version
	}

	/**
	 * Writes a list of URIs referring to sub repositories
	 */
	protected void writeChildren(URI[] children) {
		if (children == null || children.length == 0)
			return;
		start(CHILDREN_ELEMENT);
		attribute(COLLECTION_SIZE_ATTRIBUTE, children.length);
		for (int i = 0; i < children.length; i++)
			writeChild(children[i]);
		end(CHILDREN_ELEMENT);
	}

	protected void writeChild(URI encodedURI) {
		String unencodedString = URIUtil.toUnencodedString(encodedURI);
		start(CHILD_ELEMENT);
		attribute(LOCATION_ELEMENT, unencodedString);
		end(CHILD_ELEMENT);
	}

	/**
	 * Write the given composite repository to the output stream.
	 */
	public void write(CompositeRepositoryState repository) {
		start(REPOSITORY_ELEMENT);
		attribute(NAME_ATTRIBUTE, repository.getName());
		attribute(TYPE_ATTRIBUTE, repository.getType());
		attribute(VERSION_ATTRIBUTE, repository.getVersion());
		attributeOptional(PROVIDER_ATTRIBUTE, repository.getProvider());
		attributeOptional(DESCRIPTION_ATTRIBUTE, repository.getDescription()); // TODO: could be cdata?
		writeProperties(repository.getProperties());
		writeChildren(repository.getChildren());
		end(REPOSITORY_ELEMENT);
		flush();
	}

}




###############################################################################
# Copyright (c) 2007, 2008 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
###############################################################################

# All these errors are bound to 5 args: 0-msg, 1-root, 2-name, 3-line, 4-column
XMLParser_Error_At_Line=Error at line {3}{1}: {0}
XMLParser_Error_At_Line_Column=Error at line {3}, column {4}{1}: {0}
XMLParser_Error_At_Name_Line=Error in {2} at line {3}: {0}
XMLParser_Error_At_Name_Line_Column=Error in {2} at line {3}, column {4}: {0}

XMLParser_No_SAX_Parser=Unable to acquire a SAX parser service.
XMLParser_Missing_Required_Attribute=Missing required attribute in "{0}": {1}
XMLParser_Illegal_Value_For_Attribute=Illegal value for attribute "{0}" of element "{1}": {2}
XMLParser_Duplicate_Element=Duplicate singleton element in element "{0}": <{1}{2}>

io_failedRead=Unable to read repository at {0}
io_IncompatibleVersion=\
Metadata repository has incompatible version {0}; expected {1}
io_parseError=\
Error parsing composite repository




/*******************************************************************************
 * Copyright (c) 2007 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.p2.persistence;

import java.io.*;
import java.util.*;
import org.eclipse.equinox.internal.provisional.p2.core.Version;

public class XMLWriter implements XMLConstants {

	public static class ProcessingInstruction {

		private String target;
		private String[] data;

		// The standard UTF-8 processing instruction
		public static final String XML_UTF8 = "<?xml version='1.0' encoding='UTF-8'?>"; //$NON-NLS-1$

		public ProcessingInstruction(String target, String[] attrs, String[] values) {
			// Lengths of attributes and values must be the same
			this.target = target;
			this.data = new String[attrs.length];
			for (int i = 0; i < attrs.length; i++) {
				data[i] = attributeImage(attrs[i], values[i]);
			}
		}

		public static ProcessingInstruction makeClassVersionInstruction(String target, Class clazz, Version version) {
			return new ProcessingInstruction(target, new String[] {PI_CLASS_ATTRIBUTE, PI_VERSION_ATTRIBUTE}, new String[] {clazz.getName(), version.toString()});
		}

		public String toString() {
			StringBuffer sb = new StringBuffer("<?"); //$NON-NLS-1$
			sb.append(this.target).append(' ');
			for (int i = 0; i < data.length; i++) {
				sb.append(this.data[i]);
				if (i < data.length - 1) {
					sb.append(' ');
				}
			}
			sb.append("?>"); //$NON-NLS-1$
			return sb.toString();
		}
	}

	private Stack elements; // XML elements that have not yet been closed
	private boolean open; // Can attributes be added to the current element?
	private String indent; // used for each level of indentation

	private PrintWriter pw;

	public XMLWriter(OutputStream output, ProcessingInstruction[] piElements) throws UnsupportedEncodingException {
		this.pw = new PrintWriter(new OutputStreamWriter(output, "UTF8"), false); //$NON-NLS-1$
		println(ProcessingInstruction.XML_UTF8);
		this.elements = new Stack();
		this.open = false;
		this.indent = "  "; //$NON-NLS-1$
		if (piElements != null) {
			for (int i = 0; i < piElements.length; i++) {
				println(piElements[i].toString());
			}
		}
	}

	// start a new element
	public void start(String name) {
		if (this.open) {
			println('>');
		}
		indent();
		print('<');
		print(name);
		this.elements.push(name);
		this.open = true;
	}

	// end the most recent element with this name
	public void end(String name) {
		if (this.elements.empty()) {
			throw new EndWithoutStartError();
		}
		int index = this.elements.search(name);
		if (index == -1) {
			throw new EndWithoutStartError(name);
		}
		for (int i = 0; i < index; i += 1) {
			end();
		}
	}

	// end the current element
	public void end() {
		if (this.elements.empty()) {
			throw new EndWithoutStartError();
		}
		String name = (String) this.elements.pop();
		if (this.open) {
			println("/>"); //$NON-NLS-1$
		} else {
			printlnIndented("</" + name + '>', false); //$NON-NLS-1$
		}
		this.open = false;
	}

	public static String escape(String txt) {
		StringBuffer buffer = null;
		for (int i = 0; i < txt.length(); ++i) {
			String replace;
			char c = txt.charAt(i);
			switch (c) {
				case '<' :
					replace = "&lt;"; //$NON-NLS-1$
					break;
				case '>' :
					replace = "&gt;"; //$NON-NLS-1$
					break;
				case '"' :
					replace = "&quot;"; //$NON-NLS-1$
					break;
				case '\'' :
					replace = "&apos;"; //$NON-NLS-1$
					break;
				case '&' :
					replace = "&amp;"; //$NON-NLS-1$
					break;
				case '\t' :
					replace = "&#x9;"; //$NON-NLS-1$
					break;
				case '\n' :
					replace = "&#xA;"; //$NON-NLS-1$
					break;
				case '\r' :
					replace = "&#xD;"; //$NON-NLS-1$
					break;
				default :
					// this is the set of legal xml scharacters in unicode excluding high surrogates since they cannot be represented with a char
					// see http://www.w3.org/TR/REC-xml/#charsets
					if ((c >= '\u0020' && c <= '\uD7FF') || (c >= '\uE000' && c <= '\uFFFD')) {
						if (buffer != null)
							buffer.append(c);
						continue;
					}
					replace = Character.isWhitespace(c) ? " " : null; //$NON-NLS-1$
			}
			if (buffer == null) {
				buffer = new StringBuffer(txt.length() + 16);
				buffer.append(txt.substring(0, i));
			}
			if (replace != null)
				buffer.append(replace);
		}

		if (buffer == null)
			return txt;

		return buffer.toString();
	}

	// write a boolean attribute if it doesn't have the default value
	public void attribute(String name, boolean value, boolean defaultValue) {
		if (value != defaultValue) {
			attribute(name, value);
		}
	}

	public void attribute(String name, boolean value) {
		attribute(name, Boolean.toString(value));
	}

	public void attribute(String name, int value) {
		attribute(name, Integer.toString(value));
	}

	public void attributeOptional(String name, String value) {
		if (value != null && value.length() > 0) {
			attribute(name, value);
		}
	}

	public void attribute(String name, Object value) {
		if (!this.open) {
			throw new AttributeAfterNestedContentError();
		}
		if (value == null) {
			return; // optional attribute with no value
		}
		print(' ');
		print(name);
		print("='"); //$NON-NLS-1$
		print(escape(value.toString()));
		print('\'');
	}

	public void cdata(String data) {
		cdata(data, true);
	}

	public void cdata(String data, boolean escape) {
		if (this.open) {
			println('>');
			this.open = false;
		}
		if (data != null) {
			printlnIndented(data, escape);
		}
	}

	public void flush() {
		this.pw.flush();
	}

	public void writeProperties(Map properties) {
		writeProperties(PROPERTIES_ELEMENT, properties);
	}

	public void writeProperties(String propertiesElement, Map properties) {
		if (properties != null && properties.size() > 0) {
			start(propertiesElement);
			attribute(COLLECTION_SIZE_ATTRIBUTE, properties.size());
			for (Iterator iter = properties.keySet().iterator(); iter.hasNext();) {
				String name = (String) iter.next();
				writeProperty(name, (String) properties.get(name));
			}
			end(propertiesElement);
		}
	}

	public void writeProperty(String name, String value) {
		start(PROPERTY_ELEMENT);
		attribute(PROPERTY_NAME_ATTRIBUTE, name);
		attribute(PROPERTY_VALUE_ATTRIBUTE, value);
		end();
	}

	protected static String attributeImage(String name, String value) {
		if (value == null) {
			return ""; // optional attribute with no value
		}
		return name + "='" + escape(value) + '\''; //$NON-NLS-1$
	}

	private void println(char c) {
		this.pw.println(c);
	}

	private void println(String s) {
		this.pw.println(s);
	}

	private void println() {
		this.pw.println();
	}

	private void print(char c) {
		this.pw.print(c);
	}

	private void print(String s) {
		this.pw.print(s);
	}

	private void printlnIndented(String s, boolean escape) {
		if (s.length() == 0) {
			println();
		} else {
			indent();
			println(escape ? escape(s) : s);
		}
	}

	private void indent() {
		for (int i = this.elements.size(); i > 0; i -= 1) {
			print(this.indent);
		}
	}

	public static class AttributeAfterNestedContentError extends Error {
		private static final long serialVersionUID = 1L; // not serialized
	}

	public static class EndWithoutStartError extends Error {
		private static final long serialVersionUID = 1L; // not serialized
		private String name;

		public EndWithoutStartError() {
			super();
		}

		public EndWithoutStartError(String name) {
			super();
			this.name = name;
		}

		public String getName() {
			return this.name;
		}
	}

}




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

import java.net.URI;
import java.util.Map;

/*
 * Instances of this class represent a composite repository (either metadata
 * or artifact) and are used in persisting or retrieving the repository to/from disk.
 */
public class CompositeRepositoryState {
	private String name;
	private String type;
	private String version;
	private String provider;
	private String description;
	private URI location;
	private Map properties;
	private URI[] children;

	public void setName(String value) {
		name = value;
	}

	public String getName() {
		return name;
	}

	public void setType(String value) {
		type = value;
	}

	public String getType() {
		return type;
	}

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

	public String getVersion() {
		return version;
	}

	public void setProvider(String value) {
		provider = value;
	}

	public String getProvider() {
		return provider;
	}

	public void setDescription(String value) {
		description = value;
	}

	public String getDescription() {
		return description;
	}

	public void setLocation(URI value) {
		location = value;
	}

	public URI getLocation() {
		return location;
	}

	public void setProperties(Map value) {
		properties = value;
	}

	public Map getProperties() {
		return properties;
	}

	public void setChildren(URI[] value) {
		children = value;
	}

	public URI[] getChildren() {
		return children;
	}
}




/*******************************************************************************
 * 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.p2.persistence;

import java.io.*;
import java.net.URI;
import java.util.*;
import javax.xml.parsers.ParserConfigurationException;
import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
import org.xml.sax.*;

/*
 * Class used to read a composite repository.
 */
public class CompositeParser extends XMLParser implements XMLConstants {

	private static final Version CURRENT_VERSION = new Version(1, 0, 0);
	static final VersionRange XML_TOLERANCE = new VersionRange(CURRENT_VERSION, true, new Version(2, 0, 0), false);
	private static final String REQUIRED_CAPABILITY_ELEMENT = "required"; //$NON-NLS-1$
	private static final String REPOSITORY_ELEMENT = "repository"; //$NON-NLS-1$
	String repositoryType;
	private CompositeRepositoryState theState;

	protected class ChildrenHandler extends AbstractHandler {
		private ArrayList children;

		public ChildrenHandler(AbstractHandler parentHandler, Attributes attributes) {
			super(parentHandler, CHILDREN_ELEMENT);
			String size = parseOptionalAttribute(attributes, COLLECTION_SIZE_ATTRIBUTE);
			children = (size != null ? new ArrayList(new Integer(size).intValue()) : new ArrayList(4));
		}

		public URI[] getChildren() {
			int size = children.size();
			URI[] result = new URI[size];
			int i = 0;
			for (Iterator it = children.iterator(); it.hasNext(); i++) {
				result[i] = (URI) it.next();
			}
			return result;
		}

		public void startElement(String name, Attributes attributes) {
			if (name.equals(CHILD_ELEMENT)) {
				new ChildHandler(this, attributes, children);
			} else {
				invalidElement(name, attributes);
			}
		}
	}

	protected class ChildHandler extends AbstractHandler {
		private final String[] required = new String[] {LOCATION_ELEMENT};
		private final String[] optional = new String[] {};

		URI currentRepo = null;

		private List repos;

		public ChildHandler(AbstractHandler parentHandler, Attributes attributes, List repos) {
			super(parentHandler, CHILD_ELEMENT);
			String[] values = parseAttributes(attributes, required, optional);
			this.repos = repos;
			//skip entire subrepository if the location is missing
			if (values[0] == null)
				return;
			currentRepo = checkURI(REQUIRED_CAPABILITY_ELEMENT, URI_ATTRIBUTE, values[0]);

		}

		public void startElement(String name, Attributes attributes) {
			checkCancel();
		}

		protected void finished() {
			if (currentRepo != null)
				repos.add(currentRepo);
		}
	}

	private final class RepositoryDocHandler extends DocHandler {

		public RepositoryDocHandler(String rootName, RootHandler rootHandler) {
			super(rootName, rootHandler);
		}

		public void processingInstruction(String target, String data) throws SAXException {
			if (repositoryType.equals(target)) {
				// TODO: should the root handler be constructed based on class
				// 		 via an extension registry mechanism?
				// String clazz = extractPIClass(data);
				// TODO: version tolerance by extension
				Version repositoryVersion = extractPIVersion(target, data);
				if (!XML_TOLERANCE.isIncluded(repositoryVersion)) {
					throw new SAXException(NLS.bind(Messages.io_IncompatibleVersion, repositoryVersion, XML_TOLERANCE));
				}
			}
		}
	}

	/*
	 * Handler for the "repository" attribute.
	 */
	private final class RepositoryHandler extends RootHandler {

		private final String[] required = new String[] {NAME_ATTRIBUTE, TYPE_ATTRIBUTE, VERSION_ATTRIBUTE};
		private final String[] optional = new String[] {DESCRIPTION_ATTRIBUTE, PROVIDER_ATTRIBUTE};
		private PropertiesHandler propertiesHandler = null;
		private ChildrenHandler childrenHandler = null;
		private CompositeRepositoryState state;
		private String[] attrValues = new String[required.length + optional.length];

		public RepositoryHandler() {
			super();
		}

		public CompositeRepositoryState getRepository() {
			return state;
		}

		protected void handleRootAttributes(Attributes attributes) {
			attrValues = parseAttributes(attributes, required, optional);
			attrValues[2] = checkVersion(REPOSITORY_ELEMENT, VERSION_ATTRIBUTE, attrValues[2]).toString();
		}

		public void startElement(String name, Attributes attributes) {
			if (PROPERTIES_ELEMENT.equals(name)) {
				if (propertiesHandler == null) {
					propertiesHandler = new PropertiesHandler(this, attributes);
				} else {
					duplicateElement(this, name, attributes);
				}
			} else if (CHILDREN_ELEMENT.equals(name)) {
				if (childrenHandler == null) {
					childrenHandler = new ChildrenHandler(this, attributes);
				} else {
					duplicateElement(this, name, attributes);
				}
			} else {
				invalidElement(name, attributes);
			}
		}

		/*
		 * If we parsed valid XML then fill in our repository state object with the parsed data.
		 */
		protected void finished() {
			if (isValidXML()) {
				state = new CompositeRepositoryState();
				state.setName(attrValues[0]);
				state.setType(attrValues[1]);
				state.setVersion(attrValues[2]);
				state.setDescription(attrValues[3]);
				state.setProvider(attrValues[4]);
				state.setProperties((propertiesHandler == null ? new OrderedProperties(0) //
						: propertiesHandler.getProperties()));
				state.setChildren((childrenHandler == null ? new URI[0] //
						: childrenHandler.getChildren()));
			}
		}
	}

	public CompositeParser(BundleContext context, String bundleId, String type) {
		super(context, bundleId);
		this.repositoryType = type;
	}

	public void parse(File file) throws IOException {
		parse(new FileInputStream(file));
	}

	public synchronized void parse(InputStream stream) throws IOException {
		this.status = null;
		try {
			// TODO: currently not caching the parser since we make no assumptions
			//		 or restrictions on concurrent parsing
			getParser();
			RepositoryHandler repositoryHandler = new RepositoryHandler();
			xmlReader.setContentHandler(new RepositoryDocHandler(REPOSITORY_ELEMENT, repositoryHandler));
			xmlReader.parse(new InputSource(stream));
			if (isValidXML()) {
				theState = repositoryHandler.getRepository();
			}
		} catch (SAXException e) {
			throw new IOException(e.getMessage());
		} catch (ParserConfigurationException e) {
			throw new IOException(e.getMessage());
		} finally {
			stream.close();
		}
	}

	public CompositeRepositoryState getRepositoryState() {
		return theState;
	}

	//TODO what?
	protected Object getRootObject() {
		return null;
	}

	protected String getErrorMessage() {
		return Messages.io_parseError;
	}

}




/*******************************************************************************
 * Copyright (c) 2007, 2008 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.p2.persistence;

import org.eclipse.osgi.util.NLS;

public class Messages extends NLS {

	private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.persistence.messages"; //$NON-NLS-1$

	static {
		// load message values from bundle file and assign to fields below
		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
	}

	public static String XMLParser_No_SAX_Parser;
	public static String XMLParser_Error_At_Line;
	public static String XMLParser_Error_At_Line_Column;
	public static String XMLParser_Error_At_Name_Line;
	public static String XMLParser_Error_At_Name_Line_Column;
	public static String XMLParser_Missing_Required_Attribute;
	public static String XMLParser_Illegal_Value_For_Attribute;
	public static String XMLParser_Duplicate_Element;

	public static String io_failedRead;
	public static String io_IncompatibleVersion;
	public static String io_parseError;

}




/*******************************************************************************
 * 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.p2.persistence;

import java.io.*;
import java.net.URL;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.Activator;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.osgi.util.NLS;

/**
 * This class reads and writes repository metadata (e.g. table of contents files) 
 * for composite artifact and metadata repositories.
 * <p>
 * Note: This class is not used for reading or writing the actual composite repositories.
 */
public class CompositeRepositoryIO {

	/**
	 * Writes the given repository to the stream.
	 * This method performs buffering, and closes the stream when finished.
	 */
	public void write(CompositeRepositoryState repository, OutputStream output, String type) {
		OutputStream bufferedOutput = null;
		try {
			try {
				bufferedOutput = new BufferedOutputStream(output);
				CompositeWriter repositoryWriter = new CompositeWriter(bufferedOutput, type);
				repositoryWriter.write(repository);
			} finally {
				if (bufferedOutput != null) {
					bufferedOutput.close();
				}
			}
		} catch (IOException ioe) {
			// TODO shouldn't this throw a core exception?
			ioe.printStackTrace();
		}
	}

	/**
	 * Reads the composite repository from the given stream,
	 * and returns the contained array of abstract composite repositories.
	 * 
	 * This method performs buffering, and closes the stream when finished.
	 */
	public CompositeRepositoryState read(URL location, InputStream input, String type, IProgressMonitor monitor) throws ProvisionException {
		BufferedInputStream bufferedInput = null;
		try {
			try {
				bufferedInput = new BufferedInputStream(input);
				CompositeParser repositoryParser = new CompositeParser(Activator.getContext(), Activator.ID, type);
				repositoryParser.parse(input);
				IStatus result = repositoryParser.getStatus();
				switch (result.getSeverity()) {
					case IStatus.CANCEL :
						throw new OperationCanceledException();
					case IStatus.ERROR :
						throw new ProvisionException(result);
					case IStatus.WARNING :
					case IStatus.INFO :
						LogHelper.log(result);
				}
				CompositeRepositoryState repositoryState = repositoryParser.getRepositoryState();
				if (repositoryState == null)
					throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, Messages.io_parseError, null));
				return repositoryState;
			} finally {
				if (bufferedInput != null)
					bufferedInput.close();
			}
		} catch (IOException ioe) {
			String msg = NLS.bind(Messages.io_failedRead, location);
			throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, ioe));
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2008 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.p2.persistence;

import java.net.*;
import java.util.List;
import java.util.StringTokenizer;
import javax.xml.parsers.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.Activator;
import org.eclipse.equinox.internal.p2.core.StringPool;
import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.osgi.util.tracker.ServiceTracker;
import org.xml.sax.*;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.DefaultHandler;

public abstract class XMLParser extends DefaultHandler implements XMLConstants {

	// Get the root object that is being parsed.
	protected abstract Object getRootObject();

	// Get a generic parser error message for inclusion in an error status
	protected abstract String getErrorMessage();

	protected BundleContext context; // parser class bundle context
	protected String bundleId; // parser class bundle id

	protected XMLReader xmlReader; // the XML reader for the parser

	protected MultiStatus status = null; // accumulation of non-fatal errors
	protected Locator locator = null; // document locator, if supported by the parser

	protected StringPool stringPool = new StringPool();//used to eliminate string duplication
	private IProgressMonitor monitor;

	private static ServiceTracker xmlTracker = null;

	public XMLParser(BundleContext context, String pluginId) {
		super();
		this.context = context;
		this.bundleId = pluginId;
	}

	/**
	 *  Non-fatal errors accumulated during parsing.
	 */
	public IStatus getStatus() {
		return (status != null ? status : Status.OK_STATUS);
	}

	/**
	 * Returns the canonical form of a string. Used to eliminate duplicate equal 
	 * strings.
	 */
	protected String canonicalize(String string) {
		return stringPool == null ? string : stringPool.add(string);
	}

	public boolean isValidXML() {
		return (status == null || !status.matches(IStatus.ERROR | IStatus.CANCEL));
	}

	private static SAXParserFactory acquireXMLParsing(BundleContext context) {
		if (xmlTracker == null) {
			xmlTracker = new ServiceTracker(context, SAXParserFactory.class.getName(), null);
			xmlTracker.open();
		}
		return (SAXParserFactory) xmlTracker.getService();
	}

	protected static void releaseXMLParsing() {
		if (xmlTracker != null) {
			xmlTracker.close();
		}
	}

	protected SAXParser getParser() throws ParserConfigurationException, SAXException {
		SAXParserFactory factory = acquireXMLParsing(this.context);
		if (factory == null) {
			throw new SAXException(Messages.XMLParser_No_SAX_Parser);
		}
		factory.setNamespaceAware(true);
		factory.setValidating(false);
		try {
			factory.setFeature("http://xml.org/sax/features/string-interning", true); //$NON-NLS-1$
		} catch (SAXException se) {
			// some parsers may not support string interning
		}
		SAXParser theParser = factory.newSAXParser();
		if (theParser == null) {
			throw new SAXException(Messages.XMLParser_No_SAX_Parser);
		}
		xmlReader = theParser.getXMLReader();
		return theParser;
	}

	public static String makeSimpleName(String localName, String qualifiedName) {
		if (localName != null && localName.length() > 0) {
			return localName;
		}
		int nameSpaceIndex = qualifiedName.indexOf(":"); //$NON-NLS-1$
		return (nameSpaceIndex == -1 ? qualifiedName : qualifiedName.substring(nameSpaceIndex + 1));
	}

	/**
	 * Set the document locator for the parser
	 * 
	 * @see org.xml.sax.ContentHandler#setDocumentLocator
	 */
	public void setDocumentLocator(Locator docLocator) {
		locator = docLocator;
	}

	/**
	 * Sets the progress monitor for the parser
	 */
	protected void setProgressMonitor(IProgressMonitor monitor) {
		this.monitor = monitor;
	}

	/**
	 * Abstract base class for content handlers
	 */
	protected abstract class AbstractHandler extends DefaultHandler {

		protected ContentHandler parentHandler = null;
		protected String elementHandled = null;

		protected StringBuffer characters = null; // character data inside an element

		public AbstractHandler() {
			// Empty constructor for a root handler
		}

		public AbstractHandler(ContentHandler parentHandler) {
			this.parentHandler = parentHandler;
			xmlReader.setContentHandler(this);
		}

		public AbstractHandler(ContentHandler parentHandler, String elementHandled) {
			this.parentHandler = parentHandler;
			xmlReader.setContentHandler(this);
			this.elementHandled = elementHandled;
		}

		/**
		 * Set the document locator for the parser
		 * 
		 * @see org.xml.sax.ContentHandler#setDocumentLocator
		 */
		public void setDocumentLocator(Locator docLocator) {
			locator = docLocator;
		}

		public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
			finishCharacters();
			String name = makeSimpleName(localName, qName);
			trace(name, attributes);
			startElement(name, attributes);
		}

		public abstract void startElement(String name, Attributes attributes) throws SAXException;

		public void invalidElement(String name, Attributes attributes) {
			unexpectedElement(this, name, attributes);
			new IgnoringHandler(this);
		}

		public void endElement(String namespaceURI, String localName, String qName) {
			// TODO: throw a bad state error if makeSimpleName(localName, qName) != elementHandled
			finishCharacters();
			finished();
			// Restore the parent content handler
			xmlReader.setContentHandler(parentHandler);
		}

		/**
		 * 	An implementation for startElement when there are no sub-elements
		 */
		protected void noSubElements(String name, Attributes attributes) {
			unexpectedElement(this, name, attributes);
			// Create a new handler to ignore subsequent nested elements			
			new IgnoringHandler(this);
		}

		/*
		 * Save up character data until endElement or nested startElement
		 * 
		 * @see org.xml.sax.ContentHandler#characters
		 */
		public void characters(char[] chars, int start, int length) {
			if (this.characters == null) {
				this.characters = new StringBuffer();
			}
			this.characters.append(chars, start, length);
		}

		// Consume the characters accumulated in this.characters.
		// Called before startElement or endElement
		private String finishCharacters() {
			// common case -- no characters or only whitespace
			if (this.characters == null || this.characters.length() == 0) {
				return null;
			}
			if (allWhiteSpace(this.characters)) {
				this.characters.setLength(0);
				return null;
			}

			// process the characters
			try {
				String trimmedChars = this.characters.toString().trim();
				if (trimmedChars.length() == 0) {
					// this shouldn't happen due to the test for allWhiteSpace above
					System.err.println("Unexpected non-whitespace characters: " //$NON-NLS-1$
							+ trimmedChars);
					return null;
				}
				processCharacters(trimmedChars);
				return trimmedChars;
			} finally {
				this.characters.setLength(0);
			}
		}

		// Method to override in the handler of an element with CDATA. 
		protected void processCharacters(String data) {
			if (data.length() > 0) {
				unexpectedCharacterData(this, data);
			}
		}

		private boolean allWhiteSpace(StringBuffer sb) {
			int length = sb.length();
			for (int i = 0; i < length; i += 1) {
				if (!Character.isWhitespace(sb.charAt(i))) {
					return false;
				}
			}
			return true;
		}

		/**
		 * 	Called when this element and all elements nested into it have been
		 * 	handled.
		 */
		protected void finished() {
			// Do nothing by default
		}

		/*
		 * 	A name used to identify the handler.
		 */
		public String getName() {
			return (elementHandled != null ? elementHandled : "NoName"); //$NON-NLS-1$
		}

		/**
		 * In p2 1.0 we stored URLs, in 1.1 and later we store URIs. This method will
		 * first check for a URI, and then resort to looking for a URL attribute for
		 * backwards compatibility.
		 * @param attributes The attributes to parse
		 * @param required If true, an exception is thrown if no URI or URL attribute is present
		 */
		protected URI parseURIAttribute(Attributes attributes, boolean required) {
			String location = parseOptionalAttribute(attributes, URI_ATTRIBUTE);
			try {
				if (location != null)
					return new URI(location);
				if (required)
					location = parseRequiredAttributes(attributes, new String[] {URL_ATTRIBUTE})[0];
				else
					location = parseOptionalAttribute(attributes, URL_ATTRIBUTE);
				if (location == null)
					return null;
				return URIUtil.toURI(new URL(location));
			} catch (MalformedURLException e) {
				invalidAttributeValue(elementHandled, URL_ATTRIBUTE, location, e);
			} catch (URISyntaxException e) {
				invalidAttributeValue(elementHandled, URL_ATTRIBUTE, location, e);
			}
			return null;
		}

		/**
		 * Parse the attributes of an element with two required attributes.
		 */
		protected String[] parseRequiredAttributes(Attributes attributes, String name1, String name2) {
			return parseRequiredAttributes(attributes, new String[] {name1, name2});
		}

		/**
		 * Parse the attributes of an element with only required attributes.
		 */
		protected String[] parseRequiredAttributes(Attributes attributes, String[] required) {
			return parseAttributes(attributes, required, noAttributes);
		}

		/**
		 * Parse the attributes of an element with a single optional attribute.
		 */
		protected String parseOptionalAttribute(Attributes attributes, String name) {
			return parseAttributes(attributes, noAttributes, new String[] {name})[0];
		}

		/**
		 * Parse the attributes of an element, given the list of required and optional ones.
		 * Return values in same order, null for those not present.
		 * Log warnings for extra attributes or missing required attributes.
		 */
		protected String[] parseAttributes(Attributes attributes, String[] required, String[] optional) {
			String[] result = new String[required.length + optional.length];
			for (int i = 0; i < attributes.getLength(); i += 1) {
				String name = attributes.getLocalName(i);
				String value = canonicalize(attributes.getValue(i).trim());
				int j;
				if ((j = indexOf(required, name)) >= 0) {
					result[j] = value;
				} else if ((j = indexOf(optional, name)) >= 0) {
					result[required.length + j] = value;
				} else {
					unexpectedAttribute(elementHandled, name, value);
				}
			}
			for (int i = 0; i < required.length; i += 1) {
				checkRequiredAttribute(elementHandled, required[i], result[i]);
			}
			return result;
		}

	}

	/**
	 *	Handler for an XML document.
	 *
	 *	Using the inelegant name 'DocHandler' to clearly distinguish
	 *	this class from the deprecated org.xml.sax.DocumentHandler.
	 */
	protected class DocHandler extends AbstractHandler {

		RootHandler rootHandler;

		public DocHandler(String rootName, RootHandler rootHandler) {
			super(null, rootName);
			this.rootHandler = rootHandler;
		}

		public void startElement(String name, Attributes attributes) {
			if (name.equals(elementHandled)) {
				rootHandler.initialize(this, name, attributes);
				xmlReader.setContentHandler(rootHandler);
			} else {
				this.noSubElements(name, attributes);
			}
		}

	}

	/**
	 * 	Abstract handler for the root element.
	 */
	protected abstract class RootHandler extends AbstractHandler {

		public RootHandler() {
			super();
		}

		public void initialize(DocHandler document, String rootName, Attributes attributes) {
			this.parentHandler = document;
			this.elementHandled = rootName;
			handleRootAttributes(attributes);
		}

		protected abstract void handleRootAttributes(Attributes attributes);

	}

	/**
	 * 	Handler for an ordered properties collection.
	 */
	protected class PropertiesHandler extends AbstractHandler {

		private OrderedProperties properties;

		public PropertiesHandler(ContentHandler parentHandler, Attributes attributes) {
			super(parentHandler, PROPERTIES_ELEMENT);
			String size = parseOptionalAttribute(attributes, COLLECTION_SIZE_ATTRIBUTE);
			properties = (size != null ? new OrderedProperties(new Integer(size).intValue()) : new OrderedProperties());
		}

		public OrderedProperties getProperties() {
			return properties;
		}

		public void startElement(String name, Attributes attributes) {
			if (name.equals(PROPERTY_ELEMENT)) {
				new PropertyHandler(this, attributes, properties);
			} else {
				invalidElement(name, attributes);
			}
		}

	}

	/**
	 * 	Handler for a property in an ordered properties collection.
	 */
	protected class PropertyHandler extends AbstractHandler {

		public PropertyHandler(ContentHandler parentHandler, Attributes attributes, OrderedProperties properties) {
			super(parentHandler, PROPERTY_ELEMENT);
			String[] property = parseProperty(attributes);
			if (isValidProperty(property)) {
				properties.setProperty(property[0], property[1]);
			}
		}

		public void startElement(String name, Attributes attributes) {
			invalidElement(name, attributes);
		}

		private String[] parseProperty(Attributes attributes) {
			return parseRequiredAttributes(attributes, PROPERTY_NAME_ATTRIBUTE, PROPERTY_VALUE_ATTRIBUTE);
		}

		private boolean isValidProperty(String[] property) {
			return (property.length == 2 && property[0] != null && property[1] != null);
		}
	}

	/**
	 * 	Handler for an element with only cdata and no sub-elements.
	 */
	protected class TextHandler extends AbstractHandler {

		private String text = null;

		private List texts = null;

		// Constructor for a subclass that processes the attributes
		public TextHandler(AbstractHandler parent, String elementName) {
			super(parent, elementName);
		}

		// Constructor for a subclass with no attributes
		public TextHandler(AbstractHandler parent, String elementName, Attributes attributes) {
			super(parent, elementName);
			parseAttributes(attributes, noAttributes, noAttributes);
		}

		public TextHandler(AbstractHandler parent, String elementName, Attributes attributes, List texts) {
			super(parent, elementName);
			parseAttributes(attributes, noAttributes, noAttributes);
			this.texts = texts;
		}

		public String getText() {
			return (text != null ? text : ""); //$NON-NLS-1$
		}

		public void startElement(String name, Attributes attributes) {
			invalidElement(name, attributes);
		}

		protected void processCharacters(String data) {
			this.text = canonicalize(data);
			if (texts != null) {
				texts.add(getText());
			}
		}

	}

	/**
	 * 	Handler for ignoring content.
	 */
	protected class IgnoringHandler extends AbstractHandler {

		public IgnoringHandler(AbstractHandler parent) {
			super(parent);
			this.elementHandled = "IgnoringAll"; //$NON-NLS-1$
		}

		public void startElement(String name, Attributes attributes) {
			noSubElements(name, attributes);
		}

	}

	// Helpers for processing instructions that include a Class and/or a Version.

	public String extractPIClass(String data) {
		return extractPIAttribute(data, PI_CLASS_ATTRIBUTE);
	}

	public Version extractPIVersion(String target, String data) {
		return checkVersion(target, PI_VERSION_ATTRIBUTE, extractPIAttribute(data, PI_VERSION_ATTRIBUTE));
	}

	private String extractPIAttribute(String data, String key) {
		StringTokenizer piTokenizer = new StringTokenizer(data, " \'\""); //$NON-NLS-1$
		String[] tokens = new String[piTokenizer.countTokens()];
		int index = 0;
		int valueIndex = -1;
		while (piTokenizer.hasMoreTokens() && index < tokens.length) {
			tokens[index] = piTokenizer.nextToken();
			if (tokens[index].equals(key + '=') && index < tokens.length) {
				valueIndex = index + 1;
			}
			index++;
		}
		return (valueIndex >= 0 ? tokens[valueIndex] : ""); //$NON-NLS-1$
	}

	public void error(SAXParseException ex) {
		addError(IStatus.WARNING, ex.getMessage(), ex);
	}

	public void fatalError(SAXParseException ex) {
		addError(IStatus.ERROR, ex.getMessage(), ex);
	}

	protected String getErrorPrefix() {
		return null;
	}

	protected String getErrorSuffix() {
		return null;
	}

	/**
	 * Collects an error or warning that occurred during parsing.
	 */
	public final void addError(int severity, String msg, Throwable exception) {
		int line = 0;
		int column = 0;
		String key = msg;
		Object[] args = new Object[] {};
		String root = (getRootObject() == null ? "" //$NON-NLS-1$
				: " (" + getRootObject() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
		if (this.locator != null) {
			String name = this.locator.getSystemId();
			line = this.locator.getLineNumber();
			column = this.locator.getColumnNumber();
			if (line > 0) {
				args = new Object[] {msg, root, name, new Integer(line), new Integer(column)};
				if (column > 0) {
					key = (name != null ? Messages.XMLParser_Error_At_Name_Line_Column //
							: Messages.XMLParser_Error_At_Line_Column);
				} else {
					key = (name != null ? Messages.XMLParser_Error_At_Name_Line //
							: Messages.XMLParser_Error_At_Line);
				}
			}
		}
		String errMsg = NLS.bind(key, args);
		String prefix = getErrorPrefix();
		String suffix = getErrorSuffix();
		if (prefix != null) {
			errMsg = prefix + errMsg;
		}
		if (suffix != null) {
			errMsg = errMsg + suffix;
		}
		IStatus currStatus = new Status(severity, Activator.ID, errMsg, exception);
		if (this.status == null) {
			this.status = new MultiStatus(bundleId, IStatus.OK, new IStatus[] {currStatus}, getErrorMessage(), null);
		} else {
			this.status.add(currStatus);
		}
	}

	public void trace(String element, Attributes attributes) {
		// TODO: support logging
		//		if (!getLogger().isDebugLoggable()) {
		//			return;
		//		}
		//		int indentSize = (this.stateStack != null ? this.stateStack.size() - 1 : 1);
		//		if (attributes == null) {
		//			indentSize -= 1;
		//		}
		//		char[] indent = new char[2 * indentSize];
		//		Arrays.fill(indent, ' ');
		//		StringBuffer sb = new StringBuffer();
		//		sb.append(indent);
		//		sb.append('<');
		//		if (attributes != null) {
		//			sb.append(element);
		//			toString(sb, attributes);
		//		} else {
		//			sb.append('/').append(element);
		//		}
		//		sb.append('>');
		//		getLogger().debug(sb.toString());
	}

	private static String toString(Attributes attributes) {
		StringBuffer result = new StringBuffer();
		toString(result, attributes);
		return result.toString();
	}

	private static void toString(StringBuffer sb, Attributes attributes) {
		for (int i = 0; i < attributes.getLength(); i += 1) {
			String name = attributes.getLocalName(i);
			String value = attributes.getValue(i).trim();
			sb.append(' ').append(name);
			sb.append('=').append('"');
			sb.append(value);
			sb.append('"');
		}
	}

	public void checkRequiredAttribute(String element, String name, Object value) {
		if (value == null) {
			addError(IStatus.WARNING, NLS.bind(Messages.XMLParser_Missing_Required_Attribute, element, name), null);
		}
	}

	// Check the format of a required boolean attribute
	public Boolean checkBoolean(String element, String attribute, String value) {
		try {
			return Boolean.valueOf(value);
		} catch (IllegalArgumentException iae) {
			invalidAttributeValue(element, attribute, value);
		} catch (NullPointerException npe) {
			invalidAttributeValue(element, attribute, null);
		}
		return Boolean.FALSE;
	}

	// Check the format of an optional boolean attribute
	public Boolean checkBoolean(String element, String attribute, String value, boolean defaultValue) {
		Boolean result = (defaultValue ? Boolean.TRUE : Boolean.FALSE);
		if (value != null) {
			try {
				return Boolean.valueOf(value);
			} catch (IllegalArgumentException iae) {
				invalidAttributeValue(element, attribute, value);
			}
		}
		return result;
	}

	// Check the format of a required integer attribute
	public int checkInteger(String element, String attribute, String value) {
		try {
			return Integer.parseInt(value);
		} catch (IllegalArgumentException iae) {
			invalidAttributeValue(element, attribute, value);
		}
		return 0;
	}

	// Check the format of a required URI attribute
	public URI checkURI(String element, String attribute, String value) {
		try {
			return URIUtil.fromString(value);
		} catch (URISyntaxException e) {
			invalidAttributeValue(element, attribute, value);
		}
		//TODO ok to return null?
		return null;
	}

	public void checkCancel() {
		if (monitor != null && monitor.isCanceled())
			throw new OperationCanceledException();
	}

	/**
	 * Converts a version string to a Version object. Returns the version object,
	 * or {@link Version#emptyVersion} if the value was not a valid version.
	 */
	public Version checkVersion(String element, String attribute, String value) {
		try {
			if (value != null)
				return new Version(value);
		} catch (IllegalArgumentException iae) {
			invalidAttributeValue(element, attribute, value);
		} catch (NullPointerException npe) {
			invalidAttributeValue(element, attribute, null);
		}
		return Version.emptyVersion;
	}

	public VersionRange checkVersionRange(String element, String attribute, String value) {
		try {
			return new VersionRange(value);
		} catch (IllegalArgumentException iae) {
			invalidAttributeValue(element, attribute, value);
		} catch (NullPointerException npe) {
			invalidAttributeValue(element, attribute, null);
		}
		return VersionRange.emptyRange;
	}

	public void unexpectedAttribute(String element, String attribute, String value) {
		if (Tracing.DEBUG_PARSE_PROBLEMS)
			Tracing.debug("Unexpected attribute for element " + element + ": " + attribute + '=' + value); //$NON-NLS-1$ //$NON-NLS-2$
	}

	public void invalidAttributeValue(String element, String attribute, String value) {
		invalidAttributeValue(element, attribute, value, null);
	}

	public void invalidAttributeValue(String element, String attribute, String value, Throwable exception) {
		addError(IStatus.WARNING, NLS.bind(Messages.XMLParser_Illegal_Value_For_Attribute, new Object[] {attribute, element, value}), exception);
	}

	public void unexpectedElement(AbstractHandler handler, String element, Attributes attributes) {
		if (Tracing.DEBUG_PARSE_PROBLEMS)
			Tracing.debug("Unexpected element in element " + handler.getName() + ": <" + element + toString(attributes) + '>'); //$NON-NLS-1$ //$NON-NLS-2$
	}

	public void duplicateElement(AbstractHandler handler, String element, Attributes attributes) {
		addError(IStatus.WARNING, NLS.bind(Messages.XMLParser_Duplicate_Element, new Object[] {handler.getName(), element, toString(attributes)}), null);
		//ignore the duplicate element entirely because we have already logged it
		new IgnoringHandler(handler);
	}

	public void unexpectedCharacterData(AbstractHandler handler, String cdata) {
		if (Tracing.DEBUG_PARSE_PROBLEMS)
			Tracing.debug("Unexpected character data in element " + handler.getName() + ": " + cdata.trim()); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/**
	 * Find the index of the first occurrence of object in array, or -1.
	 * Use Arrays.binarySearch if array is big and sorted.
	 */
	protected static int indexOf(String[] array, String value) {
		for (int i = 0; i < array.length; i += 1) {
			if (value == null ? array[i] == null : value.equals(array[i])) {
				return i;
			}
		}
		return -1;
	}

	//	public class BadStateError extends AssertionError {
	//		private static final long serialVersionUID = 1L; // not serialized
	//
	//		public BadStateError() {
	//			super("unexpected state" + //$NON-NLS-1$
	//					(XMLParser.this.stateStack != null ? ": " + XMLParser.this.stateStack //$NON-NLS-1$
	//					: "")); //$NON-NLS-1$
	//		}
	//
	//		public BadStateError(String element) {
	//			super("unexpected state for " + element + //$NON-NLS-1$
	//					(XMLParser.this.stateStack != null ? ": " + XMLParser.this.stateStack //$NON-NLS-1$
	//					: "")); //$NON-NLS-1$
	//		}
	//	}

}




 org.osgi.util.tracker;version="1.3.3",
 org.xml.sax,
 org.xml.sax.helpers
Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository",
 org.eclipse.equinox.internal.p2.core.helpers;
  x-friends:="org.eclipse.equinox.p2.director,
   org.eclipse.equinox.p2.artifact.processors,

   org.eclipse.equinox.p2.reconciler.dropins,
   org.eclipse.equinox.p2.extensionlocation,
   org.eclipse.equinox.p2.publisher,
   org.eclipse.equinox.p2.repository.tools,
   org.eclipse.equinox.p2.repository",
 org.eclipse.equinox.internal.provisional.p2.core;
  x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
   org.eclipse.equinox.p2.artifact.processors,

   org.eclipse.equinox.p2.updatesite,
   org.eclipse.pde.ui,
   org.eclipse.equinox.p2.metadata,
   org.eclipse.equinox.p2.repository.tools,
   org.eclipse.equinox.p2.repository",
 org.eclipse.equinox.internal.provisional.p2.core.eventbus;
  x-friends:="org.eclipse.equinox.p2.metadata,
   org.eclipse.equinox.p2.metadata.generator,

   org.eclipse.equinox.p2.artifact.repository,
   org.eclipse.equinox.p2.touchpoint.eclipse,
   org.eclipse.equinox.p2.touchpoint.natives,
   org.eclipse.equinox.p2.publisher,
   org.eclipse.equinox.p2.repository",
 org.eclipse.equinox.internal.provisional.p2.core.location;
  x-friends:="org.eclipse.equinox.p2.artifact.repository,
   org.eclipse.equinox.p2.touchpoint.natives,

   org.eclipse.equinox.p2.director,
   org.eclipse.equinox.p2.engine,
   org.eclipse.equinox.p2.touchpoint.eclipse",
 org.eclipse.equinox.internal.provisional.p2.core.repository;
  x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
   org.eclipse.equinox.p2.artifact.processors,
   org.eclipse.equinox.p2.artifact.repository,
   org.eclipse.equinox.p2.core,
   org.eclipse.equinox.p2.director,
   org.eclipse.equinox.p2.engine,
   org.eclipse.equinox.p2.exemplarysetup,
   org.eclipse.equinox.p2.extensionlocation,
   org.eclipse.equinox.p2.garbagecollector,
   org.eclipse.equinox.p2.installer,
   org.eclipse.equinox.p2.jarprocessor,
   org.eclipse.equinox.p2.metadata,
   org.eclipse.equinox.p2.metadata.generator,
   org.eclipse.equinox.p2.metadata.repository,
   org.eclipse.equinox.p2.reconciler.dropins,
   org.eclipse.equinox.p2.touchpoint.eclipse,
   org.eclipse.equinox.p2.touchpoint.natives,
   org.eclipse.equinox.p2.ui,
   org.eclipse.equinox.p2.ui.admin,
   org.eclipse.equinox.p2.ui.admin.rcp,
   org.eclipse.equinox.p2.ui.sdk,
   org.eclipse.equinox.p2.updatechecker,
   org.eclipse.equinox.p2.updatesite,
   org.eclipse.equinox.p2.console,
   org.eclipse.equinox.p2.directorywatcher,
   org.eclipse.equinox.p2.publisher,
   org.eclipse.equinox.p2.director.app,
   org.eclipse.equinox.p2.repository.tools",
 org.eclipse.equinox.internal.provisional.p2.query;
  x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
   org.eclipse.equinox.p2.artifact.processors,

   org.eclipse.equinox.p2.console,
   org.eclipse.equinox.p2.publisher,
   org.eclipse.pde.ui,
   org.eclipse.equinox.p2.repository.tools"
 org.eclipse.equinox.internal.provisional.spi.p2.core.repository;
  x-friends:="org.eclipse.equinox.p2.artifact.repository,
   org.eclipse.equinox.p2.metadata.repository,
   org.eclipse.equinox.p2.extensionlocation,
   org.eclipse.equinox.p2.updatesite,
   org.eclipse.equinox.p2.engine"
Eclipse-LazyStart: true
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: J2SE-1.4,




/*******************************************************************************
 * Copyright (c) 2007, 2008 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.spi.p2.core.repository;

import java.net.URI;
import java.util.Map;
import org.eclipse.core.runtime.PlatformObject;
import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;

/**
* AbstractRepository defines common properties that may be provided by various kinds
* of repositories.
* <p>
* Clients may extend this class.
* </p>
*/
public abstract class AbstractRepository extends PlatformObject implements IRepository {
	protected String description;
	protected transient URI location;
	protected String name;
	protected Map properties = new OrderedProperties();
	protected String provider;
	protected String type;
	protected String version;

	protected AbstractRepository(String name, String type, String version, URI location, String description, String provider, Map properties) {
		this.name = name;
		this.type = type;
		this.version = version;
		this.location = location;
		this.description = description == null ? "" : description; //$NON-NLS-1$
		this.provider = provider == null ? "" : provider; //$NON-NLS-1$
		if (properties != null)
			this.properties.putAll(properties);
	}

	/**
	 * Asserts that this repository is modifiable, throwing a runtime exception if
	 * it is not. This is suitable for use by subclasses when an attempt is made
	 * to write to a repository.
	 */
	protected void assertModifiable() {
		if (!isModifiable())
			throw new UnsupportedOperationException("Repository not modifiable: " + location); //$NON-NLS-1$
	}

	/**
	 * Returns a brief description of the repository.
	 * @return the description of the repository.
	 */
	public synchronized String getDescription() {
		return description;
	}

	/**
	 * Returns the location of this repository.
	 * TODO: Should we use URL or URI? URL requires a protocol handler
	 * to be installed in Java.  Can the URL have any protocol?
	 * @return the URL of the repository.
	 */
	public synchronized URI getLocation() {
		return location;
	}

	/**
	 * Returns the name of the repository.
	 * @return the name of the repository.
	 */
	public synchronized String getName() {
		return name;
	}

	/**
	 * Returns a read-only collection of the properties of the repository.
	 * @return the properties of this repository.
	 */
	public synchronized Map getProperties() {
		return OrderedProperties.unmodifiableProperties(properties);
	}

	/**
	 * Returns the name of the provider of the repository.
	 * @return the provider of this repository.
	 */
	public synchronized String getProvider() {
		return provider;
	}

	/**
	 * Returns a string representing the type of the repository.
	 * @return the type of the repository.
	 */
	public synchronized String getType() {
		return type;
	}

	/**
	 * Returns a string representing the version for the repository type.
	 * @return the version of the type of the repository.
	 */
	public synchronized String getVersion() {
		return version;
	}

	public boolean isModifiable() {
		return false;
	}

	public synchronized void setDescription(String description) {
		this.description = description;
	}

	public synchronized void setName(String value) {
		this.name = value;
	}

	public synchronized String setProperty(String key, String value) {
		assertModifiable();
		return (String) (value == null ? properties.remove(key) : properties.put(key, value));
	}

	public synchronized void setProvider(String provider) {
		this.provider = provider;
	}
}

Lines 9-15 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
9	Import-Package: org.eclipse.equinox.internal.p2.core.helpers,	9	Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
10	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	10	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
11	org.eclipse.equinox.internal.provisional.p2.core,	11	org.eclipse.equinox.internal.provisional.p2.core,
12	org.eclipse.equinox.internal.provisional.p2.core.repository,	12	org.eclipse.equinox.internal.provisional.p2.repository,
13	org.eclipse.equinox.internal.provisional.p2.director,	13	org.eclipse.equinox.internal.provisional.p2.director,
14	org.eclipse.equinox.internal.provisional.p2.engine,	14	org.eclipse.equinox.internal.provisional.p2.engine,
15	org.eclipse.equinox.internal.provisional.p2.metadata,	15	org.eclipse.equinox.internal.provisional.p2.metadata,

Lines 17-23 Link Here

(-)src/org/eclipse/equinox/internal/p2/updatechecker/UpdateChecker.java (-1 / +1 lines)
17	import org.eclipse.core.runtime.Status;	17	import org.eclipse.core.runtime.Status;
18	import org.eclipse.equinox.internal.p2.core.helpers.*;	18	import org.eclipse.equinox.internal.p2.core.helpers.*;
19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
20	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
21	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;	20	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
22	import org.eclipse.equinox.internal.provisional.p2.engine.*;	21	import org.eclipse.equinox.internal.provisional.p2.engine.*;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
Lines 25-30 Link Here
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
26	import org.eclipse.equinox.internal.provisional.p2.query.Collector;	25	import org.eclipse.equinox.internal.provisional.p2.query.Collector;
27	import org.eclipse.equinox.internal.provisional.p2.query.Query;	26	import org.eclipse.equinox.internal.provisional.p2.query.Query;
		27	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
28	import org.eclipse.equinox.internal.provisional.p2.updatechecker.*;	28	import org.eclipse.equinox.internal.provisional.p2.updatechecker.*;
29		29
30	/**	30	/**

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableArtifactRepositoryManager.java (-2 / +3 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.provisional.p2.ui;	12	package org.eclipse.equinox.internal.provisional.p2.ui;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		16
14	import java.net.URI;	17	import java.net.URI;
15	import java.util.Arrays;	18	import java.util.Arrays;
16	import org.eclipse.core.runtime.IProgressMonitor;	19	import org.eclipse.core.runtime.IProgressMonitor;
Lines 19-26 Link Here
19	import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;	22	import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
20	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
21	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
22	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
23	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
24	import org.eclipse.equinox.internal.provisional.p2.query.Collector;	25	import org.eclipse.equinox.internal.provisional.p2.query.Collector;
25	import org.eclipse.equinox.internal.provisional.p2.query.Query;	26	import org.eclipse.equinox.internal.provisional.p2.query.Query;
26	import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;	27	import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;

Lines 11-20 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/RepositoryLocationQuery.java (-1 / +2 lines)
11		11
12	package org.eclipse.equinox.internal.provisional.p2.ui;	12	package org.eclipse.equinox.internal.provisional.p2.ui;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15
14	import java.net.URI;	16	import java.net.URI;
15	import java.util.Iterator;	17	import java.util.Iterator;
16	import org.eclipse.equinox.internal.p2.core.helpers.QueryHelpers;	18	import org.eclipse.equinox.internal.p2.core.helpers.QueryHelpers;
17	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
18	import org.eclipse.equinox.internal.provisional.p2.query.Collector;	19	import org.eclipse.equinox.internal.provisional.p2.query.Collector;
19	import org.eclipse.equinox.internal.provisional.p2.query.Query;	20	import org.eclipse.equinox.internal.provisional.p2.query.Query;
20		21





package org.eclipse.equinox.internal.provisional.p2.ui;

import java.util.EventObject;
import org.eclipse.equinox.internal.p2.ui.BatchChangeBeginningEvent;
import org.eclipse.equinox.internal.p2.ui.BatchChangeCompleteEvent;

import java.util.EventObject;
import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
import org.eclipse.equinox.internal.provisional.p2.engine.ProfileEvent;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;

/**
 * ProvisioningListener which handles event batching and other




 *******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.ui;

import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;

import java.net.URI;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.query.*;
import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;
import org.eclipse.osgi.util.NLS;




import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.query.*;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.statushandlers.StatusManager;





package org.eclipse.equinox.internal.p2.ui.model;

import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;

import java.net.URI;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;




import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;

Lines 8-14 Link Here

(-)plugin.xml (-1 / +1 lines)
8	class="org.eclipse.equinox.internal.p2.ui.ProvUIAdapterFactory">	8	class="org.eclipse.equinox.internal.p2.ui.ProvUIAdapterFactory">
9	<adapter type="org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit"/>	9	<adapter type="org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit"/>
10	<adapter type="org.eclipse.equinox.internal.provisional.p2.engine.IProfile"/>	10	<adapter type="org.eclipse.equinox.internal.provisional.p2.engine.IProfile"/>
11	<adapter type="org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository"/>	11	<adapter type="org.eclipse.equinox.internal.provisional.p2.repository.IRepository"/>
12	<adapter type="org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository"/>	12	<adapter type="org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository"/>
13	<adapter type="org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository"/>	13	<adapter type="org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository"/>
14	</factory>	14	</factory>

Lines 20-28 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUGroup.java (-2 / +2 lines)
20	import org.eclipse.equinox.internal.p2.ui.viewers.DeferredQueryContentProvider;	20	import org.eclipse.equinox.internal.p2.ui.viewers.DeferredQueryContentProvider;
21	import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider;	21	import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
		24	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		25	import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
26	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;	26	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
27	import org.eclipse.equinox.internal.provisional.p2.ui.QueryableMetadataRepositoryManager;	27	import org.eclipse.equinox.internal.provisional.p2.ui.QueryableMetadataRepositoryManager;
28	import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement;	28	import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement;

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.ui.operations;	11	package org.eclipse.equinox.internal.provisional.p2.ui.operations;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
15	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
16	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
17		18
18	/**	19	/**
19	* Operation that adds colocated artifact and metadata repositories	20	* Operation that adds colocated artifact and metadata repositories

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java (-2 / +3 lines)
11		11
12	package org.eclipse.equinox.internal.provisional.p2.ui.operations;	12	package org.eclipse.equinox.internal.provisional.p2.ui.operations;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15	import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
		16
14	import java.net.URI;	17	import java.net.URI;
15	import java.util.Map;	18	import java.util.Map;
16	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
Lines 21-28 Link Here
21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;	26	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
25	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
26	import org.eclipse.equinox.internal.provisional.p2.director.*;	27	import org.eclipse.equinox.internal.provisional.p2.director.*;
27	import org.eclipse.equinox.internal.provisional.p2.engine.*;	28	import org.eclipse.equinox.internal.provisional.p2.engine.*;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	29	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;

Lines 11-19 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/StructuredViewerProvisioningListener.java (-2 / +1 lines)
11		11
12	package org.eclipse.equinox.internal.provisional.p2.ui.viewers;	12	package org.eclipse.equinox.internal.provisional.p2.ui.viewers;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
14	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIProvisioningListener;	15	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIProvisioningListener;
15
16	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
17	import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement;	16	import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement;
18	import org.eclipse.jface.viewers.StructuredViewer;	17	import org.eclipse.jface.viewers.StructuredViewer;
19	import org.eclipse.swt.widgets.Display;	18	import org.eclipse.swt.widgets.Display;

Lines 11-21 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java (-1 / +2 lines)
11		11
12	package org.eclipse.equinox.internal.provisional.p2.ui.viewers;	12	package org.eclipse.equinox.internal.provisional.p2.ui.viewers;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15
14	import org.eclipse.equinox.internal.p2.ui.model.IIUElement;	16	import org.eclipse.equinox.internal.p2.ui.model.IIUElement;
15	import org.eclipse.equinox.internal.p2.ui.model.ProvElement;	17	import org.eclipse.equinox.internal.p2.ui.model.ProvElement;
16	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
17	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;	19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
18	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
19	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	20	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
20	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
21	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;

Lines 10-16 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/policy/IUViewQueryContext.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.ui.policy;	11	package org.eclipse.equinox.internal.provisional.p2.ui.policy;
12		12
13	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
14	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	15	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
15		16
16	/**	17	/**

Lines 11-18 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/UIRepositoryEvent.java (-1 / +2 lines)
11		11
12	package org.eclipse.equinox.internal.p2.ui;	12	package org.eclipse.equinox.internal.p2.ui;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
		15
14	import java.net.URI;	16	import java.net.URI;
15	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
16		17
17	/**	18	/**
18	* UIMetadataRepositoryEvent is used to distinguish those metadata repository	19	* UIMetadataRepositoryEvent is used to distinguish those metadata repository

Lines 10-18 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.ui;	11	package org.eclipse.equinox.internal.p2.ui;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import org.eclipse.core.runtime.IAdapterFactory;	15	import org.eclipse.core.runtime.IAdapterFactory;
14	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	16	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
15	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
16	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	17	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
17	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	18	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
18	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;

Lines 11-20 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/DefaultMetadataURLValidator.java (-1 / +2 lines)
11		11
12	package org.eclipse.equinox.internal.p2.ui;	12	package org.eclipse.equinox.internal.p2.ui;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		15
14	import java.net.URI;	16	import java.net.URI;
15	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	18	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
17	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
18	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;	19	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
19	import org.eclipse.equinox.internal.provisional.p2.ui.policy.RepositoryLocationValidator;	20	import org.eclipse.equinox.internal.provisional.p2.ui.policy.RepositoryLocationValidator;
20		21




import org.eclipse.equinox.internal.p2.ui.*;
import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
import org.eclipse.equinox.internal.provisional.p2.ui.*;
import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.AddRepositoryDialog;
import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.AvailableIUGroup;

Lines 10-18 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/model/IRepositoryElement.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.ui.model;	11	package org.eclipse.equinox.internal.provisional.p2.ui.model;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
15	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
16		17
17	/**	18	/**
18	* Interface for elements that represent repositories.	19	* Interface for elements that represent repositories.

Lines 11-21 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/viewers/RepositoryDetailsLabelProvider.java (-1 / +2 lines)
11		11
12	package org.eclipse.equinox.internal.p2.ui.viewers;	12	package org.eclipse.equinox.internal.p2.ui.viewers;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15
14	import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;	16	import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
15	import org.eclipse.equinox.internal.p2.ui.model.MetadataRepositoryElement;	17	import org.eclipse.equinox.internal.p2.ui.model.MetadataRepositoryElement;
16	import org.eclipse.equinox.internal.p2.ui.model.ProvElement;	18	import org.eclipse.equinox.internal.p2.ui.model.ProvElement;
17	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
18	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
20	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;	21	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
21	import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement;	22	import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement;

Lines 10-16 Link Here

(-)src/org/eclipse/equinox/p2/tests/ui/query/AbstractQueryTest.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.ui.query;	11	package org.eclipse.equinox.p2.tests.ui.query;
12		12
13	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
14	import org.eclipse.equinox.internal.provisional.p2.query.MatchQuery;	15	import org.eclipse.equinox.internal.provisional.p2.query.MatchQuery;
15	import org.eclipse.equinox.internal.provisional.p2.query.Query;	16	import org.eclipse.equinox.internal.provisional.p2.query.Query;
16	import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;	17	import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/p2/tests/ui/operations/ProvisioningUtilTest.java (-2 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.ui.operations;	11	package org.eclipse.equinox.p2.tests.ui.operations;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		15
13	import java.net.URI;	16	import java.net.URI;
14	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
15	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
16	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
17	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;	18	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
18	import org.eclipse.equinox.p2.tests.ui.AbstractProvisioningUITest;	19	import org.eclipse.equinox.p2.tests.ui.AbstractProvisioningUITest;
19		20

Lines 17-20 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
17	org.eclipse.equinox.p2.engine;bundle-version="1.0.100",	17	org.eclipse.equinox.p2.engine;bundle-version="1.0.100",
18	org.eclipse.equinox.p2.director;bundle-version="1.0.100",	18	org.eclipse.equinox.p2.director;bundle-version="1.0.100",
19	org.eclipse.equinox.p2.artifact.repository;bundle-version="1.0.100",	19	org.eclipse.equinox.p2.artifact.repository;bundle-version="1.0.100",
20	org.junit;bundle-version="[3.8.0,4.0.0)"	20	org.junit;bundle-version="[3.8.0,4.0.0)",
		21	org.eclipse.equinox.p2.repository;bundle-version="1.0.0"

Lines 17-23 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
17	org.eclipse.equinox.p2.core,	17	org.eclipse.equinox.p2.core,
18	org.eclipse.equinox.p2.artifact.repository,	18	org.eclipse.equinox.p2.artifact.repository,
19	org.eclipse.swt,	19	org.eclipse.swt,
20	org.eclipse.core.net;bundle-version="1.1.0"	20	org.eclipse.core.net;bundle-version="1.1.0",
		21	org.eclipse.equinox.p2.repository;bundle-version="1.0.0"
21	Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,	22	Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
22	J2SE-1.4	23	J2SE-1.4
23	Export-Package: org.eclipse.equinox.internal.p2.installer;x-internal:=true,	24	Export-Package: org.eclipse.equinox.internal.p2.installer;x-internal:=true,

Lines 1-5 Link Here

(-)src/org/eclipse/equinox/internal/p2/engine/ProfileMetadataRepository.java (-2 / +3 lines)
1	package org.eclipse.equinox.internal.p2.engine;	1	package org.eclipse.equinox.internal.p2.engine;
2		2
		3	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		4	import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
		5
3	import java.io.File;	6	import java.io.File;
4	import java.net.URI;	7	import java.net.URI;
5	import java.net.URISyntaxException;	8	import java.net.URISyntaxException;
Lines 10-17 Link Here
10	import org.eclipse.equinox.internal.p2.metadata.repository.Activator;	13	import org.eclipse.equinox.internal.p2.metadata.repository.Activator;
11	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	14	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
12	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;	15	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
13	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
14	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	16	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
16	import org.eclipse.equinox.internal.provisional.p2.query.Collector;	17	import org.eclipse.equinox.internal.provisional.p2.query.Collector;
17	import org.eclipse.equinox.internal.provisional.p2.query.Query;	18	import org.eclipse.equinox.internal.provisional.p2.query.Query;

Lines 10-20 Link Here

(-)src/org/eclipse/equinox/internal/p2/engine/ProfileMetadataRepositoryFactory.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.engine;	11	package org.eclipse.equinox.internal.p2.engine;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.Map;	16	import java.util.Map;
15	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	18	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
17	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
18	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
19	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;	20	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;
20		21

Lines 11-23 Link Here

(-)src/org/eclipse/equinox/internal/p2/engine/DownloadManager.java (-1 / +2 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.engine;	12	package org.eclipse.equinox.internal.p2.engine;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		15
14	import java.net.URI;	16	import java.net.URI;
15	import java.util.*;	17	import java.util.*;
16	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
17	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;	19	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	20	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	21	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
20	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
21	import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;	22	import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
22		23
23	public class DownloadManager {	24	public class DownloadManager {




 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.core.eventbus,
 org.eclipse.equinox.internal.provisional.p2.core.location,
 org.eclipse.equinox.internal.provisional.p2.core.repository,
 org.eclipse.equinox.internal.provisional.p2.metadata,
 org.eclipse.equinox.internal.provisional.p2.metadata.query,
 org.eclipse.equinox.internal.provisional.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.p2.query,
 org.eclipse.equinox.internal.provisional.p2.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.repository,
 org.eclipse.osgi.service.datalocation;version="1.0.0",
 org.eclipse.osgi.service.resolver;version="1.1.0",
 org.eclipse.osgi.signedcontent;version="1.0.0",




import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
import org.eclipse.equinox.internal.provisional.p2.query.Collector;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;




Bundle-RequiredExecutionEnvironment: J2SE-1.4,
 CDC-1.1/Foundation-1.1
Import-Package: org.eclipse.equinox.app;version="1.0.0",
 org.eclipse.equinox.internal.p2.artifact.repository,
 org.eclipse.equinox.internal.p2.core.helpers,
 org.eclipse.equinox.internal.p2.extensionlocation,
 org.eclipse.equinox.internal.p2.artifact.repository,
 org.eclipse.equinox.internal.p2.metadata.repository,
 org.eclipse.equinox.internal.p2.update,
 org.eclipse.equinox.internal.provisional.configurator,
 org.eclipse.equinox.internal.provisional.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.repository,
 org.eclipse.equinox.internal.provisional.p2.director,
 org.eclipse.equinox.internal.provisional.p2.directorywatcher,
 org.eclipse.equinox.internal.provisional.p2.engine,

 org.eclipse.equinox.internal.provisional.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.p2.query,
 org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.core.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.repository,
 org.eclipse.osgi.service.datalocation;version="1.0.0",
 org.eclipse.osgi.service.environment;version="1.1.0",
 org.eclipse.osgi.util;version="1.1.0",




import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.equinox.internal.p2.updatesite.SiteXMLAction;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.IUPropertyQuery;
import org.eclipse.equinox.internal.provisional.p2.query.Collector;
import org.eclipse.equinox.internal.provisional.p2.query.Query;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.RepositoryReference;
import org.eclipse.equinox.p2.publisher.*;
import org.eclipse.equinox.p2.publisher.eclipse.FeaturesAction;

Lines 22-28 Link Here

(-)src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java (-1 / +1 lines)
22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
25	import org.eclipse.equinox.internal.provisional.p2.core.repository.*;	25	import org.eclipse.equinox.internal.provisional.p2.repository.*;
26	import org.eclipse.equinox.p2.tests.*;	26	import org.eclipse.equinox.p2.tests.*;
27	import org.osgi.framework.BundleException;	27	import org.osgi.framework.BundleException;
28	import org.osgi.service.prefs.BackingStoreException;	28	import org.osgi.service.prefs.BackingStoreException;

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java (-2 / +3 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.p2.tests.artifact.repository;	12	package org.eclipse.equinox.p2.tests.artifact.repository;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		16
14	import java.io.File;	17	import java.io.File;
15	import java.net.URI;	18	import java.net.URI;
16	import java.net.URISyntaxException;	19	import java.net.URISyntaxException;
Lines 21-28 Link Here
21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.core.Version;	26	import org.eclipse.equinox.internal.provisional.p2.core.Version;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
25	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
27	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.SimpleArtifactRepositoryFactory;	28	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.SimpleArtifactRepositoryFactory;
28	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	29	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;

Lines 13-19 Link Here

(-)src/org/eclipse/equinox/p2/tests/artifact/repository/TransferTest.java (-2 / +2 lines)
13	import java.io.*;	13	import java.io.*;
14	import java.net.*;	14	import java.net.*;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.p2.artifact.repository.ECFTransport;	16	import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
17	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	17	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
18	import org.osgi.framework.Bundle;	18	import org.osgi.framework.Bundle;
19	import org.osgi.framework.BundleException;	19	import org.osgi.framework.BundleException;
Lines 32-38 Link Here
32	} catch (BundleException e) {	32	} catch (BundleException e) {
33	fail("1.5", e);	33	fail("1.5", e);
34	}	34	}
35	IStatus s = ECFTransport.getInstance().download("http://download.eclipse.org/eclipse/updates/3.4/plugins/javax.servlet.jsp_2.0.0.v200806031607.jar.pack.gz", fos, new NullProgressMonitor());	35	IStatus s = RepositoryTransport.getInstance().download("http://download.eclipse.org/eclipse/updates/3.4/plugins/javax.servlet.jsp_2.0.0.v200806031607.jar.pack.gz", fos, new NullProgressMonitor());
36	assertOK("2.0", s);	36	assertOK("2.0", s);
37	int httpSize = -1;	37	int httpSize = -1;
38	URL u;	38	URL u;




import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository;
import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.ArtifactOutputStream;
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
import org.eclipse.equinox.internal.provisional.p2.repository.IStateful;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;

public class ArtifactOutputStreamTest extends TestCase {




import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener;
import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener;
import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
import org.eclipse.equinox.internal.provisional.p2.core.repository.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.query.Collector;
import org.eclipse.equinox.internal.provisional.p2.repository.*;
import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;
import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory;
import org.eclipse.equinox.p2.tests.*;

Lines 9-14 Link Here

(-)src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java (-1 / +2 lines)
9	******************************************************************************/	9	******************************************************************************/
10	package org.eclipse.equinox.p2.tests.metadata.repository;	10	package org.eclipse.equinox.p2.tests.metadata.repository;
11		11
		12	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		13
12	import org.eclipse.equinox.internal.p2.metadata.ProvidedCapability;	14	import org.eclipse.equinox.internal.p2.metadata.ProvidedCapability;
13	import org.eclipse.equinox.internal.p2.metadata.RequiredCapability;	15	import org.eclipse.equinox.internal.p2.metadata.RequiredCapability;
14		16
Lines 23-29 Link Here
23	import org.eclipse.core.runtime.NullProgressMonitor;	25	import org.eclipse.core.runtime.NullProgressMonitor;
24	import org.eclipse.equinox.internal.p2.metadata.InstallableUnit;	26	import org.eclipse.equinox.internal.p2.metadata.InstallableUnit;
25	import org.eclipse.equinox.internal.provisional.p2.core.*;	27	import org.eclipse.equinox.internal.provisional.p2.core.*;
26	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
27	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	29	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription;	30	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription;

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java (-2 / +3 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.p2.tests.metadata.repository;	12	package org.eclipse.equinox.p2.tests.metadata.repository;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15	import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
		16
14	import java.io.File;	17	import java.io.File;
15	import java.net.URI;	18	import java.net.URI;
16	import java.util.*;	19	import java.util.*;
Lines 18-25 Link Here
18	import org.eclipse.equinox.internal.provisional.p2.core.Version;	21	import org.eclipse.equinox.internal.provisional.p2.core.Version;
19	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener;	22	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener;
20	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener;	23	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener;
21	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
22	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;




import junit.framework.Assert;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRequest;
import org.eclipse.equinox.internal.p2.repository.Transport;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler;
import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryCreationException;
import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryCreationException;
import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository;

/**

	Set artifactDescriptors = new HashSet();

	Transport testhandler = new Transport() {
		@Deprecated
		public IStatus download(String toDownload, OutputStream target, IProgressMonitor pm) {
			byte[] contents = (byte[]) locationsToContents.get(toDownload);
			if (contents == null)

			}
			return Status.OK_STATUS;
		}

		public IStatus download(URI toDownload, OutputStream target, IProgressMonitor pm) {
			return download(toDownload.toString(), target, pm);
		}
	};

	public TestArtifactRepository() {

Lines 8-20 Link Here

(-)src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java (-1 / +2 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests;	9	package org.eclipse.equinox.p2.tests;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		12
11	import java.net.URI;	13	import java.net.URI;
12	import java.net.URISyntaxException;	14	import java.net.URISyntaxException;
13	import java.util.*;	15	import java.util.*;
14	import junit.framework.Assert;	16	import junit.framework.Assert;
15	import org.eclipse.core.runtime.IProgressMonitor;	17	import org.eclipse.core.runtime.IProgressMonitor;
16	import org.eclipse.equinox.internal.provisional.p2.core.Version;	18	import org.eclipse.equinox.internal.provisional.p2.core.Version;
17	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
18	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
20	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java (-1 / +2 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests;	9	package org.eclipse.equinox.p2.tests;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		12
11	import java.io.*;	13	import java.io.*;
12	import java.net.URI;	14	import java.net.URI;
13	import java.net.URL;	15	import java.net.URL;
Lines 21-27 Link Here
21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
22	import org.eclipse.equinox.internal.provisional.p2.core.*;	24	import org.eclipse.equinox.internal.provisional.p2.core.*;
23	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;	25	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
25	import org.eclipse.equinox.internal.provisional.p2.director.*;	26	import org.eclipse.equinox.internal.provisional.p2.director.*;
26	import org.eclipse.equinox.internal.provisional.p2.engine.*;	27	import org.eclipse.equinox.internal.provisional.p2.engine.*;
27	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.*;

Lines 10-20 Link Here

(-)src/org/eclipse/equinox/p2/tests/TestRepositoryListener.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests;	11	package org.eclipse.equinox.p2.tests;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.EventObject;	16	import java.util.EventObject;
15	import junit.framework.Assert;	17	import junit.framework.Assert;
16	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener;	18	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener;
17	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
18		19
19	/**	20	/**
20	* A provisioning event listener used for testing purposes. If a location is provided,	21	* A provisioning event listener used for testing purposes. If a location is provided,

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.mirror;	11	package org.eclipse.equinox.p2.tests.mirror;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.io.*;	15	import java.io.*;
14	import java.net.*;	16	import java.net.*;
15	import java.util.*;	17	import java.util.*;
Lines 24-30 Link Here
24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	26	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	27	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
26	import org.eclipse.equinox.internal.provisional.p2.core.Version;	28	import org.eclipse.equinox.internal.provisional.p2.core.Version;
27	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	29	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
29	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	30	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
30	import org.eclipse.equinox.p2.tests.TestActivator;	31	import org.eclipse.equinox.p2.tests.TestActivator;

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.mirror;	11	package org.eclipse.equinox.p2.tests.mirror;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.net.*;	16	import java.net.*;
15	import java.util.HashMap;	17	import java.util.HashMap;
Lines 18-24 Link Here
18	import org.eclipse.equinox.internal.p2.metadata.mirror.MirrorApplication;	20	import org.eclipse.equinox.internal.p2.metadata.mirror.MirrorApplication;
19	import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;	21	import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
21	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;

Lines 10-22 Link Here

(-)src/org/eclipse/equinox/p2/tests/extensionlocation/ExtensionLocationMetadataRepositoryFactoryTest.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.extensionlocation;	11	package org.eclipse.equinox.p2.tests.extensionlocation;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		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.*;	17	import java.net.*;
16	import org.eclipse.equinox.internal.p2.extensionlocation.Constants;	18	import org.eclipse.equinox.internal.p2.extensionlocation.Constants;
17	import org.eclipse.equinox.internal.p2.extensionlocation.ExtensionLocationMetadataRepositoryFactory;	19	import org.eclipse.equinox.internal.p2.extensionlocation.ExtensionLocationMetadataRepositoryFactory;
18	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
19	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
20	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
21	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
22	import org.eclipse.equinox.internal.provisional.p2.query.Collector;	23	import org.eclipse.equinox.internal.provisional.p2.query.Collector;

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/extensionlocation/ExtensionLocationArtifactRepositoryFactoryTest.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.extensionlocation;	11	package org.eclipse.equinox.p2.tests.extensionlocation;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		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.*;	17	import java.net.*;
Lines 18-24 Link Here
18	import org.eclipse.equinox.internal.p2.extensionlocation.ExtensionLocationArtifactRepositoryFactory;	20	import org.eclipse.equinox.internal.p2.extensionlocation.ExtensionLocationArtifactRepositoryFactory;
19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
21	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
22	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	23	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
23	import org.eclipse.equinox.p2.tests.TestActivator;	24	import org.eclipse.equinox.p2.tests.TestActivator;
24		25




Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-Version: 1.1.0.qualifier
Import-Package: javax.xml.parsers,
 org.eclipse.equinox.internal.p2.artifact.mirror,
 org.eclipse.equinox.internal.p2.artifact.processors.md5,
 org.eclipse.equinox.internal.p2.artifact.processors.pack200,

 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.core.eventbus,
 org.eclipse.equinox.internal.provisional.p2.core.location,
 org.eclipse.equinox.internal.provisional.p2.repository,
 org.eclipse.equinox.internal.provisional.p2.director,
 org.eclipse.equinox.internal.provisional.p2.directorywatcher,
 org.eclipse.equinox.internal.provisional.p2.engine,

 org.eclipse.equinox.internal.provisional.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.p2.query,
 org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.core.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.repository,
 org.eclipse.equinox.spi.p2.publisher,
 org.eclipse.internal.provisional.equinox.p2.jarprocessor,
 org.eclipse.osgi.service.datalocation,

 org.sat4j.core;bundle-version="2.0.0",
 org.sat4j.pb;bundle-version="2.0.0",
 org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",
 org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",
 org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",
 org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="1.0.100",
 org.eclipse.equinox.p2.repository;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Eclipse-RegisterBuddy: org.eclipse.equinox.p2.artifact.repository
Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 10-21 Link Here

(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveRepositoryActionTest.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.touchpoint.eclipse;	11	package org.eclipse.equinox.p2.tests.touchpoint.eclipse;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.HashMap;	16	import java.util.HashMap;
15	import java.util.Map;	17	import java.util.Map;
16	import org.eclipse.core.runtime.IStatus;	18	import org.eclipse.core.runtime.IStatus;
17	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.RemoveRepositoryAction;	19	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.RemoveRepositoryAction;
18	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
19	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	20	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
20		21
21	/**	22	/**

Lines 21-26 Link Here

(-)src/org/eclipse/equinox/p2/tests/publisher/TestArtifactRepository.java (+1 lines)
21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler;	21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
		24	import org.eclipse.equinox.internal.provisional.p2.repository.IStateful;
24	import org.eclipse.equinox.p2.tests.TestActivator;	25	import org.eclipse.equinox.p2.tests.TestActivator;
25	import org.eclipse.osgi.util.NLS;	26	import org.eclipse.osgi.util.NLS;
26		27




/*******************************************************************************
 * Copyright (c) 2009 Cloudsmith Inc. 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:
 *     Cloudsmith Inc. - initial API and implementation
 *******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.repository;

import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.osgi.framework.BundleException;

/**
 * Test supposed to be used interactivly to monitor the error message output.
 * @author henrik.lindberg@cloudsmith.com
 *
 */
public class TransferExceptionsTest extends AbstractProvisioningTest {

	public void testErrorMessages() {
		FileOutputStream fos = null;
		File f = null;
		try {
			f = File.createTempFile("TransferTest", "dummy.txt");
			fos = new FileOutputStream(f);
			Platform.getBundle("org.eclipse.ecf.provider.filetransfer").start();
		} catch (IOException e) {
			fail("1.0", e);
		} catch (BundleException e) {
			fail("1.5", e);
		}
		try {
			IStatus s = RepositoryTransport.getInstance().download(new URI("bogus!bogus"), fos, new NullProgressMonitor());
			assertNotOK(s);
			printStatus("1", s);
			s = RepositoryTransport.getInstance().download(new URI("bogus://somewhere.else"), fos, new NullProgressMonitor());
			assertNotOK(s);
			printStatus("2", s);
			s = RepositoryTransport.getInstance().download(new URI("http:bogusURL"), fos, new NullProgressMonitor());
			assertNotOK(s);
			printStatus("3", s);
			s = RepositoryTransport.getInstance().download(new URI("http://bogusURL:80/"), fos, new NullProgressMonitor());
			assertNotOK(s);
			printStatus("4", s);
			s = RepositoryTransport.getInstance().download(new URI("http:/bogusURL:999999999999/"), fos, new NullProgressMonitor());
			assertNotOK(s);
			printStatus("5", s);
			s = RepositoryTransport.getInstance().download(new URI("http://bogus.nowhere"), fos, new NullProgressMonitor());
			assertNotOK(s);
			printStatus("6", s);
			s = RepositoryTransport.getInstance().download(new URI("http://www.eclipse.org/AFileThatDoesNotExist.foo"), fos, new NullProgressMonitor());
			assertNotOK(s);
			printStatus("7", s);
		} catch (URISyntaxException e) {
			fail("URI syntax exception where none was expected: " + e.getMessage());
		}
	}

	private static void printStatus(String msg, IStatus s) {
		System.err.print("TEST OUTPUT: " + msg + "\n");
		System.err.print("     ");
		System.err.print("Message [" + s.getMessage() + "] Exception Class[" + s.getException().getClass().getName() + "] ExceptionMessage[ ");
		System.err.print(s.getException().getMessage() + "]\n");

	}

}




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

import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.updatesite.metadata.UpdateSiteMetadataRepositoryFactory;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;
import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.p2.tests.TestActivator;

/**
 * Tests for API of {@link IMetadataRepositoryManager}.
 */
public class MetadataRepositoryManagerExceptionsTest extends AbstractProvisioningTest {
	protected IMetadataRepositoryManager manager;
	/**
	 * Contains temp File handles that should be deleted at the end of the test.
	 */
	private final List toDelete = new ArrayList();

	public static Test suite() {
		return new TestSuite(MetadataRepositoryManagerExceptionsTest.class);
	}

	protected void setUp() throws Exception {
		super.setUp();
		manager = (IMetadataRepositoryManager) ServiceHelper.getService(TestActivator.context, IMetadataRepositoryManager.class.getName());
	}

	protected void tearDown() throws Exception {
		super.tearDown();
		for (Iterator it = toDelete.iterator(); it.hasNext();)
			delete((File) it.next());
		toDelete.clear();
	}

	/**
	 * Adds a repository for a non existing site, should
	 * return REPOSITORY_NOT_FOUND, since any other status code gets logged.
	 * 
	 * @throws URISyntaxException
	 */
	public void testFailedConnection() throws URISyntaxException {
		//		URI location = new URI("invalid://example");
		URI location = new URI("http://bogus.nowhere");
		MetadataRepositoryFactory factory;

		factory = new SimpleMetadataRepositoryFactory();
		try {
			factory.load(location, 0, new NullProgressMonitor());
		} catch (ProvisionException e) {
			assertEquals(ProvisionException.REPOSITORY_NOT_FOUND, e.getStatus().getCode());
		}
		factory = new UpdateSiteMetadataRepositoryFactory();
		try {
			factory.load(location, 0, new NullProgressMonitor());
		} catch (ProvisionException e) {
			assertEquals(ProvisionException.REPOSITORY_NOT_FOUND, e.getStatus().getCode());
		}
	}

}

Lines 11-17 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
11	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	11	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
12	org.eclipse.equinox.internal.provisional.p2.core,	12	org.eclipse.equinox.internal.provisional.p2.core,
13	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	13	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
14	org.eclipse.equinox.internal.provisional.p2.core.repository,	14	org.eclipse.equinox.internal.provisional.p2.repository,
15	org.eclipse.equinox.internal.provisional.p2.director,	15	org.eclipse.equinox.internal.provisional.p2.director,
16	org.eclipse.equinox.internal.provisional.p2.engine,	16	org.eclipse.equinox.internal.provisional.p2.engine,
17	org.eclipse.equinox.internal.provisional.p2.metadata,	17	org.eclipse.equinox.internal.provisional.p2.metadata,

Lines 10-22 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.ui.sdk;	11	package org.eclipse.equinox.internal.p2.ui.sdk;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.io.*;	15	import java.io.*;
14	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
15	import org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceConstants;	17	import org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceConstants;
16	import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;	18	import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;
17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
18	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;	20	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
19	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
20	import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;	21	import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;
21	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	22	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
22	import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;	23	import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/p2/internal/repository/tools/RecreateRepositoryApplication.java (-2 / +3 lines)
11		11
12	package org.eclipse.equinox.p2.internal.repository.tools;	12	package org.eclipse.equinox.p2.internal.repository.tools;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		16
14	import java.io.File;	17	import java.io.File;
15	import java.io.IOException;	18	import java.io.IOException;
16	import java.net.URI;	19	import java.net.URI;
Lines 20-27 Link Here
20	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;	24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
26	import org.eclipse.osgi.util.NLS;	27	import org.eclipse.osgi.util.NLS;
27		28

Lines 10-17 Link Here

(-)src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryDescriptor.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.internal.repository.tools;	11	package org.eclipse.equinox.p2.internal.repository.tools;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
15		16
16	public class RepositoryDescriptor {	17	public class RepositoryDescriptor {
17		18

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/internal/repository/tools/AbstractApplication.java (-2 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.internal.repository.tools;	11	package org.eclipse.equinox.p2.internal.repository.tools;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		15
13	import java.net.URI;	16	import java.net.URI;
14	import java.net.URISyntaxException;	17	import java.net.URISyntaxException;
15	import java.util.*;	18	import java.util.*;
Lines 19-26 Link Here
19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
20	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
21	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
22	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
23	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
26		27

Lines 19-25 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
19	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	19	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
20	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,	20	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
21	org.eclipse.equinox.internal.provisional.p2.core,	21	org.eclipse.equinox.internal.provisional.p2.core,
22	org.eclipse.equinox.internal.provisional.p2.core.repository,	22	org.eclipse.equinox.internal.provisional.p2.repository,
23	org.eclipse.equinox.internal.provisional.p2.engine,	23	org.eclipse.equinox.internal.provisional.p2.engine,
24	org.eclipse.equinox.internal.provisional.p2.engine.phases,	24	org.eclipse.equinox.internal.provisional.p2.engine.phases,
25	org.eclipse.equinox.internal.provisional.p2.metadata,	25	org.eclipse.equinox.internal.provisional.p2.metadata,

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepositoryFactory.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.metadata.repository;	11	package org.eclipse.equinox.internal.p2.metadata.repository;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.io.*;	15	import java.io.*;
14	import java.net.URI;	16	import java.net.URI;
15	import java.util.Map;	17	import java.util.Map;
Lines 20-26 Link Here
20	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryIO;	22	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryIO;
21	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryState;	23	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryState;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
25	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;	26	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;
26	import org.eclipse.osgi.util.NLS;	27	import org.eclipse.osgi.util.NLS;

Lines 22-27 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/Messages.java (+3 lines)
22	// Do not instantiate	22	// Do not instantiate
23	}	23	}
24		24
		25	public static String CacheManager_AuthenticationFaileFor_0;
		26	public static String CacheManager_FailedCommunicationWithRepo_0;
		27	public static String CacheManager_Neither_0_nor_1_found;
25	public static String io_failedRead;	28	public static String io_failedRead;
26	public static String ecf_configuration_error;	29	public static String ecf_configuration_error;
27		30

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java (-2 / +3 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.metadata.repository;	12	package org.eclipse.equinox.internal.p2.metadata.repository;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.ICompositeRepository;
		15	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		16
14	import java.io.*;	17	import java.io.*;
15	import java.net.URI;	18	import java.net.URI;
16	import java.net.URISyntaxException;	19	import java.net.URISyntaxException;
Lines 23-30 Link Here
23	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryIO;	26	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryIO;
24	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryState;	27	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryState;
25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	28	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
26	import org.eclipse.equinox.internal.provisional.p2.core.repository.ICompositeRepository;
27	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	29	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	30	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
30	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	31	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata.repository;

import org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager;

import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;

import java.net.URI;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.AbstractRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.query.*;

Lines 1-3 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/messages.properties (+3 lines)
		1	CacheManager_FailedCommunicationWithRepo_0=Failed to communicate with repository: {0}
		2	CacheManager_Neither_0_nor_1_found=Neither: {0} nor: {0} available
1	###############################################################################	3	###############################################################################
2	# Copyright (c) 2007, 2008 IBM Corporation and others.	4	# Copyright (c) 2007, 2008 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	5	# All rights reserved. This program and the accompanying materials
Lines 9-14 Link Here
9	# IBM Corporation - initial API and implementation	11	# IBM Corporation - initial API and implementation
10	###############################################################################	12	###############################################################################
11		13
		14	CacheManager_AuthenticationFaileFor_0=Authentication failed for: {0}
12	io_failedRead=Unable to read repository at {0}	15	io_failedRead=Unable to read repository at {0}
13	io_IncompatibleVersion=\	16	io_IncompatibleVersion=\
14	Metadata repository has incompatible version {0}; expected {1}	17	Metadata repository has incompatible version {0}; expected {1}




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata.repository;

import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
import java.net.*;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ecf.core.*;
import org.eclipse.ecf.core.security.ConnectContextFactory;
import org.eclipse.ecf.core.security.IConnectContext;
import org.eclipse.ecf.filetransfer.*;
import org.eclipse.ecf.filetransfer.events.*;
import org.eclipse.ecf.filetransfer.identity.FileCreateException;
import org.eclipse.ecf.filetransfer.identity.FileIDFactory;
import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI.AuthenticationInfo;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.security.storage.*;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.util.tracker.ServiceTracker;

/**
 * @deprecated
 * PLEASE REMOVE THIS CLASS - It is replaced by {@link RepositoryTransport}.
 */
public class ECFMetadataTransport {
	// TODO: remove this class
	/**
	 * The number of password retry attempts allowed before failing.
	 */
	private static final int LOGIN_RETRIES = 3;
	private static final ProtocolException ERROR_401 = new ProtocolException();

	/**
	 * A job that waits on a barrier.
	 */
	static class WaitJob extends Job {
		private final Object[] barrier;

		/**
		 * Creates a wait job.
		 * @param location A location string that is used in the job name
		 * @param barrier The job will wait until the first entry in the barrier is non-null
		 */
		WaitJob(String location, Object[] barrier) {
			super(NLS.bind(Messages.repo_loading, location));
			this.barrier = barrier;
			setSystem(true);
		}

		/* (non-Javadoc)
		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
		 */
		protected IStatus run(IProgressMonitor monitor) {
			synchronized (barrier) {
				while (barrier[0] == null) {
					try {
						barrier.wait();
					} catch (InterruptedException e) {
						//ignore
					}
				}
			}
			return Status.OK_STATUS;
		}
	}

	/**
	 * The singleton transport instance.
	 */
	private static ECFMetadataTransport instance;

	private final ServiceTracker retrievalFactoryTracker;

	public static synchronized ECFMetadataTransport getInstance() {
		if (instance == null) {
			instance = new ECFMetadataTransport();
		}
		return instance;
	}

	private ECFMetadataTransport() {
		retrievalFactoryTracker = new ServiceTracker(Activator.getContext(), IRetrieveFileTransferFactory.class.getName(), null);
		retrievalFactoryTracker.open();
		startBundle("org.eclipse.ecf.provider.filetransfer"); //$NON-NLS-1$
	}

	private boolean startBundle(String bundleId) {
		PackageAdmin packageAdmin = (PackageAdmin) ServiceHelper.getService(Activator.getContext(), PackageAdmin.class.getName());
		if (packageAdmin == null)
			return false;

		Bundle[] bundles = packageAdmin.getBundles(bundleId, null);
		if (bundles != null && bundles.length > 0) {
			for (int i = 0; i < bundles.length; i++) {
				try {
					if ((bundles[0].getState() & Bundle.INSTALLED) == 0) {
						bundles[0].start();
						return true;
					}
				} catch (BundleException e) {
					// failed, try next bundle
				}
			}
		}
		return false;
	}

	public IStatus download(String url, OutputStream destination, IProgressMonitor monitor) {
		try {
			IConnectContext context = getConnectionContext(url, false);
			for (int i = 0; i < LOGIN_RETRIES; i++) {
				try {
					return performDownload(url, destination, context, monitor);
				} catch (ProtocolException e) {
					if (e == ERROR_401)
						context = getConnectionContext(url, true);
				}
			}
		} catch (UserCancelledException e) {
			return Status.CANCEL_STATUS;
		} catch (ProvisionException e) {
			return e.getStatus();
		}
		//reached maximum number of retries without success
		return new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.io_failedRead, url), null);
	}

	public IStatus performDownload(String toDownload, OutputStream target, IConnectContext context, IProgressMonitor monitor) throws ProtocolException {
		IRetrieveFileTransferFactory factory = (IRetrieveFileTransferFactory) retrievalFactoryTracker.getService();
		if (factory == null)
			return new Status(IStatus.ERROR, Activator.ID, Messages.ecf_configuration_error);
		return transfer(factory.newInstance(), toDownload, target, context, monitor);
	}

	/**
	 * Gets the last modified date for the specified file.
	 * @param location - The URL location of the file.
	 * @return A <code>long</code> representing the date. Returns <code>0</code> if the file is not found or an error occurred.
	 * @exception OperationCanceledException if the request was canceled.
	 */
	public long getLastModified(URI location) throws ProvisionException {
		String locationString = location.toString();
		try {
			IConnectContext context = getConnectionContext(locationString, false);
			for (int i = 0; i < LOGIN_RETRIES; i++) {
				try {
					return doGetLastModified(locationString, context);
				} catch (ProtocolException e) {
					if (ERROR_401 == e)
						context = getConnectionContext(locationString, true);
				} catch (Exception e) {
					e.getMessage();
				}
			}
		} catch (UserCancelledException e) {
			throw new OperationCanceledException();
		}
		//too many retries, so report as failure
		throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.io_failedRead, locationString), null));
	}

	/**
	 * Perform the ECF call to get the last modified time, failing if there is any
	 * protocol failure such as an authentication failure.
	 */
	private long doGetLastModified(String location, IConnectContext context) throws ProtocolException {
		IContainer container;
		try {
			container = ContainerFactory.getDefault().createContainer();
		} catch (ContainerCreateException e) {
			return 0;
		}
		IRemoteFileSystemBrowserContainerAdapter adapter = (IRemoteFileSystemBrowserContainerAdapter) container.getAdapter(IRemoteFileSystemBrowserContainerAdapter.class);
		if (adapter == null) {
			return 0;
		}
		IRemoteFile remoteFile = checkFile(adapter, location, context);
		if (remoteFile == null) {
			return 0;
		}
		return remoteFile.getInfo().getLastModified();
	}

	/**
	 * Returns the connection context for the given URL. This may prompt the
	 * user for user name and password as required.
	 *
	 * @param xmlLocation - the file location requiring login details
	 * @param prompt - use <code>true</code> to prompt the user instead of
	 * looking at the secure preference store for login, use <code>false</code>
	 * to only try the secure preference store
	 * @throws UserCancelledException when the user cancels the login prompt
	 * @throws ProvisionException if the password cannot be read or saved
	 * @return The connection context
	 */
	public IConnectContext getConnectionContext(String xmlLocation, boolean prompt) throws UserCancelledException, ProvisionException {
		ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
		IPath hostLocation = new Path(xmlLocation).removeLastSegments(1);
		String nodeKey;
		try {
			nodeKey = URLEncoder.encode(hostLocation.toString(), "UTF-8"); //$NON-NLS-1$
		} catch (UnsupportedEncodingException e2) {
			//fall back to default platform encoding
			nodeKey = URLEncoder.encode(hostLocation.toString());
		}
		String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
		ISecurePreferences prefNode = null;
		if (securePreferences.nodeExists(nodeName))
			prefNode = securePreferences.node(nodeName);
		if (!prompt) {
			if (prefNode == null)
				return null;
			try {
				String username = prefNode.get(IRepository.PROP_USERNAME, null);
				String password = prefNode.get(IRepository.PROP_PASSWORD, null);
				//if we don't have stored connection data just return a null connection context
				if (username == null || password == null)
					return null;
				return ConnectContextFactory.createUsernamePasswordConnectContext(username, password);
			} catch (StorageException e) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			}
		}
		//need to prompt user for user name and password
		ServiceTracker adminUITracker = new ServiceTracker(Activator.getContext(), IServiceUI.class.getName(), null);
		adminUITracker.open();
		IServiceUI adminUIService = (IServiceUI) adminUITracker.getService();
		AuthenticationInfo loginDetails = null;
		if (adminUIService != null)
			loginDetails = adminUIService.getUsernamePassword(hostLocation.toString());
		//null result means user canceled password dialog
		if (loginDetails == null)
			throw new UserCancelledException();
		//save user name and password if requested by user
		if (loginDetails.saveResult()) {
			if (prefNode == null)
				prefNode = securePreferences.node(nodeName);
			try {
				prefNode.put(IRepository.PROP_USERNAME, loginDetails.getUserName(), true);
				prefNode.put(IRepository.PROP_PASSWORD, loginDetails.getPassword(), true);
				prefNode.flush();
			} catch (StorageException e1) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			} catch (IOException e) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			}
		}
		return ConnectContextFactory.createUsernamePasswordConnectContext(loginDetails.getUserName(), loginDetails.getPassword());
	}

	private IRemoteFile checkFile(final IRemoteFileSystemBrowserContainerAdapter retrievalContainer, final String location, IConnectContext context) throws ProtocolException {
		final Object[] result = new Object[2];
		final Object FAIL = new Object();
		IRemoteFileSystemListener listener = new IRemoteFileSystemListener() {
			public void handleRemoteFileEvent(IRemoteFileSystemEvent event) {
				Exception exception = event.getException();
				if (exception != null) {
					synchronized (result) {
						result[0] = FAIL;
						result[1] = exception;
						result.notify();
					}
				} else if (event instanceof IRemoteFileSystemBrowseEvent) {
					IRemoteFileSystemBrowseEvent fsbe = (IRemoteFileSystemBrowseEvent) event;
					IRemoteFile[] remoteFiles = fsbe.getRemoteFiles();
					if (remoteFiles != null && remoteFiles.length > 0 && remoteFiles[0] != null) {
						synchronized (result) {
							result[0] = remoteFiles[0];
							result.notify();
						}
					} else {
						synchronized (result) {
							result[0] = FAIL;
							result.notify();
						}
					}
				}
			}
		};
		try {
			retrievalContainer.setConnectContextForAuthentication(context);
			retrievalContainer.sendBrowseRequest(FileIDFactory.getDefault().createFileID(retrievalContainer.getBrowseNamespace(), location), listener);
		} catch (RemoteFileSystemException e) {
			return null;
		} catch (FileCreateException e) {
			return null;
		}
		waitFor(location, result);
		if (result[0] == FAIL && result[1] instanceof IOException) {
			IOException ioException = (IOException) result[1];
			//throw a special exception for authentication failure so we know to prompt for username/password
			String message = ioException.getMessage();
			if (message != null && (message.indexOf(" 401 ") != -1 || message.indexOf(SERVER_REDIRECT) != -1)) //$NON-NLS-1$
				throw ERROR_401;
		}
		if (result[0] instanceof IRemoteFile)
			return (IRemoteFile) result[0];
		return null;
	}

	/**
	 * Check if the given exception represents a permission failure (401 for HTTP),
	 * and throw a special marker exception if a permission failure was encountered.
	 */
	private void checkPermissionDenied(Throwable t) throws ProtocolException {
		if (!(t instanceof IncomingFileTransferException))
			return;
		IncomingFileTransferException e = (IncomingFileTransferException) t;
		if (e.getErrorCode() == 401)
			throw ERROR_401;
		//try to figure out if we have a 401 by parsing the exception message
		IStatus status = e.getStatus();
		Throwable exception = status.getException();
		if (exception instanceof IOException)
			if (exception.getMessage() != null && (exception.getMessage().indexOf(" 401 ") != -1 || exception.getMessage().indexOf(SERVER_REDIRECT) != -1)) //$NON-NLS-1$
				throw ERROR_401;
	}

	/**
	 * Waits until the first entry in the given array is non-null.
	 */
	private void waitFor(String location, Object[] barrier) {
		WaitJob wait = new WaitJob(location, barrier);
		wait.schedule();
		while (barrier[0] == null) {
			boolean logged = false;
			try {
				wait.join();
			} catch (InterruptedException e) {
				if (!logged)
					LogHelper.log(new Status(IStatus.WARNING, Activator.ID, "Unexpected interrupt while waiting on ECF transfer", e)); //$NON-NLS-1$
			}
		}
	}

	private IStatus transfer(final IRetrieveFileTransferContainerAdapter retrievalContainer, final String toDownload, final OutputStream target, IConnectContext context, final IProgressMonitor monitor) throws ProtocolException {
		final IStatus[] result = new IStatus[1];
		IFileTransferListener listener = new IFileTransferListener() {

			public void handleTransferEvent(IFileTransferEvent event) {
				if (event instanceof IFileTransferConnectStartEvent) {
					IFileTransferConnectStartEvent cse = (IFileTransferConnectStartEvent) event;
					FileTransferJob connectJob = cse.prepareConnectJob(null);
					cse.connectUsingJob(connectJob);
				} else if (event instanceof IIncomingFileTransferReceiveStartEvent) {
					IIncomingFileTransferReceiveStartEvent rse = (IIncomingFileTransferReceiveStartEvent) event;
					if (target != null) {
						try {
							rse.receive(target);
						} catch (IOException e) {
							IStatus status = convertToStatus(e);
							synchronized (result) {
								result[0] = status;
								result.notify();
							}
						}
					}
				}
				if (event instanceof IIncomingFileTransferReceiveDataEvent) {
					IIncomingFileTransfer source = ((IIncomingFileTransferReceiveDataEvent) event).getSource();
					if (monitor != null) {
						if (monitor.isCanceled())
							source.cancel();
					}
				}
				if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
					IStatus status = convertToStatus(((IIncomingFileTransferReceiveDoneEvent) event).getException());
					synchronized (result) {
						result[0] = status;
						result.notify();
					}
				}
			}
		};

		try {
			retrievalContainer.setConnectContextForAuthentication(context);
			retrievalContainer.sendRetrieveRequest(FileIDFactory.getDefault().createFileID(retrievalContainer.getRetrieveNamespace(), toDownload), listener, null);
		} catch (IncomingFileTransferException e) {
			checkPermissionDenied(e);
			return e.getStatus();
		} catch (FileCreateException e) {
			return e.getStatus();
		}
		waitFor(toDownload, result);
		final Throwable exception = result[0].getException();
		checkPermissionDenied(exception);
		//if the transfer failed, return the underlying exception status, otherwise return top level DownloadStatus
		if (exception instanceof IncomingFileTransferException) {
			IStatus cause = ((IncomingFileTransferException) exception).getStatus();
			if (!cause.isOK())
				return cause;
		}
		return result[0];
	}

	protected IStatus convertToStatus(Exception e) {
		if (e == null)
			return Status.OK_STATUS;
		if (e instanceof UserCancelledException)
			return new Status(IStatus.CANCEL, Activator.ID, e.getMessage(), e);
		return new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e);
	}
}




import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.ecf.filetransfer.UserCancelledException;
import org.eclipse.equinox.internal.p2.core.helpers.*;
import org.eclipse.equinox.internal.p2.repository.AuthenticationFailedException;
import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener;
import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;


	private static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$
	private static final String XML_EXTENSION = ".xml"; //$NON-NLS-1$

	/**
	 * Could not find a remote file corresponding to the cache.
	 */
	private static final int CACHE_MISSING_REMOTE = 0;
	/**
	 * The local cache is stale or missing.
	 */
	private static final int CACHE_STALE = 1;
	/**
	 * A remote JAR file exists, and is newer than the cache.
	 */
	private static final int CACHE_STALE_REMOTE_JAR = 2;
	/**
	 * The remote file exists, and the local cache is up to date.
	 */
	private static final int CACHE_OK = 3;
	private final HashSet knownPrefixes = new HashSet(5);

	/**

	 * @param monitor a progress monitor
	 * @return A {@link File} object pointing to the cache file or <code>null</code>
	 * if the location is not a repository.
	 * @throws FileNotFound exception if neither jar nor xml index file exists at given location 
	 * @throws AuthenticationFailedException if jar not available and xml causes authentication fail
	 * @throws IOException on general IO errors
	 * @throws ProvisionException on any error (e.g. user cancellation, unknown host, malformed address, connection refused, etc.)
	 */
	public File createCache(URI repositoryLocation, String prefix, IProgressMonitor monitor) throws IOException, ProvisionException {

		SubMonitor submonitor = SubMonitor.convert(monitor, 1000);
		URI jarLocation = URIUtil.append(repositoryLocation, prefix + JAR_EXTENSION);
		URI xmlLocation = URIUtil.append(repositoryLocation, prefix + XML_EXTENSION);
		AgentLocation agentLocation = (AgentLocation) ServiceHelper.getService(Activator.getContext(), AgentLocation.class.getName());
		URL dataArea = agentLocation.getDataArea(Activator.ID + "/cache/"); //$NON-NLS-1$
		File dataAreaFile = URLUtil.toFile(dataArea);
		int hashCode = computeHash(repositoryLocation);
		int state = getCacheState(repositoryLocation, prefix, cacheFile);
		URI remoteFile;
		switch (state) {
			case CACHE_OK :
				return cacheFile;
			case CACHE_MISSING_REMOTE :
				return null;
			case CACHE_STALE_REMOTE_JAR :
				//we know there is a remote jar at this point
				cacheFile = new File(dataAreaFile, prefix + hashCode + JAR_EXTENSION);
				remoteFile = jarLocation;
				break;
			case CACHE_STALE :
			default :
				//find the best available remote file
				long lastModifiedRemote = getTransport().getLastModified(jarLocation);
				if (lastModifiedRemote > 0) {
					cacheFile = new File(dataAreaFile, prefix + hashCode + JAR_EXTENSION);
					remoteFile = jarLocation;
				} else {
					lastModifiedRemote = getTransport().getLastModified(xmlLocation);
					if (lastModifiedRemote <= 0)
						// no jar or xml file found
						return null;
					cacheFile = new File(dataAreaFile, prefix + hashCode + XML_EXTENSION);
					remoteFile = xmlLocation;
				}
		}
		cacheFile.getParentFile().mkdirs();
		OutputStream metadata = new BufferedOutputStream(new FileOutputStream(cacheFile));
		IStatus result;
		try {
			knownPrefixes.add(prefix);
			File cacheFile = getCache(repositoryLocation, prefix);
			URI jarLocation = URIUtil.append(repositoryLocation, prefix + JAR_EXTENSION);
			URI xmlLocation = URIUtil.append(repositoryLocation, prefix + XML_EXTENSION);
			AgentLocation agentLocation = (AgentLocation) ServiceHelper.getService(Activator.getContext(), AgentLocation.class.getName());
			URL dataArea = agentLocation.getDataArea(Activator.ID + "/cache/"); //$NON-NLS-1$
			File dataAreaFile = URLUtil.toFile(dataArea);
			int hashCode = computeHash(repositoryLocation);

			// Knowing if cache is stale is complicated by the fact that a jar could have been 
			// produced after an xml index (and vice versa), and by the need to capture any
			// errors, as these needs to be reported to the user as something meaningful - instead of
			// just a general "can't read repository".
			// (Previous impl of stale checking ignored errors, and caused multiple round-trips)
			boolean stale = true;
			long lastModified = 0L;
			String name = null;
			String useExtension = JAR_EXTENSION;
			URI remoteFile = jarLocation;

			if (cacheFile != null) {
				cacheFile.lastModified();
				name = cacheFile.getName();
			}
			// get last modified on jar
			long lastModifiedRemote = 0L;
			try {
				lastModifiedRemote = getTransport().getLastModified(jarLocation, submonitor.newChild(1));
			} catch (Exception e) {
				// just set to 0 and test if xml exists, report general error for the xml file
				lastModifiedRemote = 0;
			}
			if (monitor.isCanceled())
				throw new ProvisionException(Status.CANCEL_STATUS);

			if (lastModifiedRemote != 0) {
				// There is a jar, and it should be used - cache is stale if it is xml based or
				// if older (irrespective of jar or xml).
				stale = lastModifiedRemote > lastModified || (name != null && name.endsWith(XML_EXTENSION));
			} else {
				// Also need to check remote XML file, and handle cancel, and errors
				// (Status is reported based on finding the XML file as giving up on certain errors
				// when checking for the jar may not be correct).
				try {
					lastModifiedRemote = getTransport().getLastModified(xmlLocation, submonitor.newChild(1));
					// if lastModifiedRemote is 0 - something is wrong in the communication stack, as 
					// a FileNotFound exception should have been thrown.
					if (lastModifiedRemote == 0)
						throw new FileNotFoundException();
				} catch (UserCancelledException e) {
					throw new ProvisionException(Status.CANCEL_STATUS);
				} catch (FileNotFoundException e) {
					throw new FileNotFoundException(NLS.bind(Messages.CacheManager_Neither_0_nor_1_found, jarLocation, xmlLocation));
				} catch (AuthenticationFailedException e) {
					throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, NLS.bind(Messages.CacheManager_AuthenticationFaileFor_0, repositoryLocation), e));
				} catch (CoreException e) {
					throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, NLS.bind(Messages.CacheManager_FailedCommunicationWithRepo_0, repositoryLocation), e));

				}
				// There is an xml, and it should be used - cache is stale if it is jar based or
				// if older (irrespective of jar or xml).
				stale = lastModifiedRemote > lastModified || (name != null && name.endsWith(JAR_EXTENSION));
				useExtension = XML_EXTENSION;
				remoteFile = xmlLocation;
			}

			if (!stale)
				return cacheFile;

			// Need to update cache
			cacheFile = new File(dataAreaFile, prefix + hashCode + useExtension);
			cacheFile.getParentFile().mkdirs();
			OutputStream metadata = new BufferedOutputStream(new FileOutputStream(cacheFile));
			IStatus result;
			try {
				submonitor.setWorkRemaining(1000);
				result = getTransport().download(remoteFile, metadata, submonitor.newChild(1000));
			} finally {
				metadata.close();
			}
			if (!result.isOK()) {
				//don't leave a partial cache file lying around
				// TODO: HENRIK Handle resume
				cacheFile.delete();
				throw new ProvisionException(result);
			}
			return cacheFile;

		} finally {
			if (monitor != null)
				monitor.done();
		}
		if (!result.isOK()) {
			//don't leave a partial cache file lying around
			cacheFile.delete();
			throw new ProvisionException(result);
		}
		return cacheFile;
	}

	/**

		return result;
	}

	private RepositoryTransport getTransport() {
		return RepositoryTransport.getInstance();
	}

	/**
	 * Checks if the repository's local cache file is out of date.
	 * @param repositoryLocation The remote location of the file
	 * @param prefix The prefix to use when creating the cache file
	 * @param cacheFile The current local cache of the remote location
	 * @return One of the CACHE_* constants
	 */
	private int getCacheState(URI repositoryLocation, String prefix, File cacheFile) {
		if (cacheFile == null)
			return CACHE_STALE;
		long lastModified = cacheFile.lastModified();
		String name = cacheFile.getName();
		URI metadataLocation = null;

		if (name.endsWith(XML_EXTENSION)) {
			metadataLocation = URIUtil.append(repositoryLocation, prefix + XML_EXTENSION);
		} else if (name.endsWith(JAR_EXTENSION)) {
			metadataLocation = URIUtil.append(repositoryLocation, prefix + JAR_EXTENSION);
		} else {
			return CACHE_STALE;
		}
		long lastModifiedRemote = 0;
		try {
			lastModifiedRemote = getTransport().getLastModified(metadataLocation);
		} catch (ProvisionException e) {
			// cache is stale
			return CACHE_MISSING_REMOTE;
		}
		if (lastModifiedRemote <= 0)
			return CACHE_MISSING_REMOTE;
		if (lastModifiedRemote > lastModified)
			return name.endsWith(XML_EXTENSION) ? CACHE_STALE : CACHE_STALE_REMOTE_JAR;
		return CACHE_OK;
	}

	/**

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java (-2 / +3 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.metadata.repository;	12	package org.eclipse.equinox.internal.p2.metadata.repository;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15	import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
		16
14	import java.io.*;	17	import java.io.*;
15	import java.net.URI;	18	import java.net.URI;
16	import java.util.*;	19	import java.util.*;
Lines 21-28 Link Here
21	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;	24	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;	26	import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
25	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
27	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
28	import org.eclipse.equinox.internal.provisional.p2.query.Collector;	29	import org.eclipse.equinox.internal.provisional.p2.query.Collector;

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/mirror/MirrorApplication.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.metadata.mirror;	11	package org.eclipse.equinox.internal.p2.metadata.mirror;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.net.URISyntaxException;	16	import java.net.URISyntaxException;
15	import java.util.*;	17	import java.util.*;
Lines 20-26 Link Here
20	import org.eclipse.equinox.internal.p2.metadata.repository.Activator;	22	import org.eclipse.equinox.internal.p2.metadata.repository.Activator;
21	import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;	23	import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
26		27

Lines 10-21 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepositoryManager.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.metadata.repository;	11	package org.eclipse.equinox.internal.provisional.p2.metadata.repository;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.Map;	16	import java.util.Map;
15	import org.eclipse.core.runtime.IProgressMonitor;	17	import org.eclipse.core.runtime.IProgressMonitor;
16	import org.eclipse.core.runtime.IStatus;	18	import org.eclipse.core.runtime.IStatus;
17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
18	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
19	import org.eclipse.equinox.internal.provisional.p2.query.IQueryable;	20	import org.eclipse.equinox.internal.provisional.p2.query.IQueryable;
20		21
21	/**	22	/**

Lines 10-18 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepository.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.metadata.repository;	11	package org.eclipse.equinox.internal.provisional.p2.metadata.repository;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
15	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
16	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	17	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
17	import org.eclipse.equinox.internal.provisional.p2.query.IQueryable;	18	import org.eclipse.equinox.internal.provisional.p2.query.IQueryable;
18	import org.eclipse.equinox.internal.provisional.p2.query.Query;	19	import org.eclipse.equinox.internal.provisional.p2.query.Query;

Lines 10-21 Link Here

(-)src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/MetadataRepositoryFactory.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository;	11	package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.Map;	16	import java.util.Map;
15	import org.eclipse.core.runtime.IProgressMonitor;	17	import org.eclipse.core.runtime.IProgressMonitor;
16	import org.eclipse.core.runtime.IStatus;	18	import org.eclipse.core.runtime.IStatus;
17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
18	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
20		21
21	/**	22	/**

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/AbstractMetadataRepository.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository;	11	package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository;
12		12
		13	import org.eclipse.equinox.internal.provisional.spi.p2.repository.AbstractRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.Map;	16	import java.util.Map;
15	import org.eclipse.core.runtime.IProgressMonitor;	17	import org.eclipse.core.runtime.IProgressMonitor;
Lines 17-23 Link Here
17	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
18	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
19	import org.eclipse.equinox.internal.provisional.p2.query.Query;	21	import org.eclipse.equinox.internal.provisional.p2.query.Query;
20	import org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository;
21		22
22	/**	23	/**
23	* The common base class for all metadata repositories.	24	* The common base class for all metadata repositories.

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/SimpleMetadataRepositoryFactory.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository;	11	package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.io.*;	15	import java.io.*;
14	import java.net.URI;	16	import java.net.URI;
15	import java.util.Map;	17	import java.util.Map;
Lines 19-25 Link Here
19	import org.eclipse.equinox.internal.p2.core.helpers.Tracing;	21	import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
20	import org.eclipse.equinox.internal.p2.metadata.repository.*;	22	import org.eclipse.equinox.internal.p2.metadata.repository.*;
21	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	23	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
22	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
24	import org.eclipse.osgi.util.NLS;	25	import org.eclipse.osgi.util.NLS;
25		26
Lines 60-65 Link Here
60	localFile = Activator.getCacheManager().createCache(location, URLMetadataRepository.CONTENT_FILENAME, monitor);	61	localFile = Activator.getCacheManager().createCache(location, URLMetadataRepository.CONTENT_FILENAME, monitor);
61	if (localFile == null) {	62	if (localFile == null) {
62	//there is no remote file in either form	63	//there is no remote file in either form
		64	// TODO HENRIK: Cause of problem is unknown (can be Unknown Host, etc.) - this must be communicated.
63	String msg = NLS.bind(Messages.io_failedRead, location);	65	String msg = NLS.bind(Messages.io_failedRead, location);
64	throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));	66	throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
65	}	67	}

Lines 6-12 Link Here

(-)plugin.properties (-1 / +1 lines)
6	# http://www.eclipse.org/legal/epl-v10.html	6	# http://www.eclipse.org/legal/epl-v10.html
7	#	7	#
8	# Contributors:	8	# Contributors:
9	# IBM Corporation - initial API and implementation	9	# henrik.lindberg@cloudsmith.com
10	###############################################################################	10	###############################################################################
11	pluginName = Equinox Provisioning Metadata Repository	11	pluginName = Equinox Provisioning Metadata Repository
12	providerName = Eclipse.org - Equinox	12	providerName = Eclipse.org - Equinox

Lines 10-15 Link Here

(-)src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.metadata.repository.ant;	11	package org.eclipse.equinox.internal.p2.metadata.repository.ant;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.net.URISyntaxException;	16	import java.net.URISyntaxException;
15	import java.util.HashMap;	17	import java.util.HashMap;
Lines 21-27 Link Here
21	import org.eclipse.equinox.internal.p2.metadata.repository.Activator;	23	import org.eclipse.equinox.internal.p2.metadata.repository.Activator;
22	import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;	24	import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
23	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
27		28




 org.eclipse.equinox.internal.p2.core.helpers,
 org.eclipse.equinox.internal.p2.metadata,
 org.eclipse.equinox.internal.p2.persistence,
 org.eclipse.equinox.internal.p2.repository,
 org.eclipse.equinox.internal.p2.repository.helpers,
 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.core.eventbus,
 org.eclipse.equinox.internal.provisional.p2.core.location,
 org.eclipse.equinox.internal.provisional.p2.core.repository,
 org.eclipse.equinox.internal.provisional.p2.metadata,
 org.eclipse.equinox.internal.provisional.p2.metadata.query,
 org.eclipse.equinox.internal.provisional.p2.query,
 org.eclipse.equinox.internal.provisional.p2.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.repository,
 org.eclipse.equinox.security.storage,
 org.eclipse.osgi.service.resolver;version="1.1.0",
 org.eclipse.osgi.util;version="1.1.0",

Lines 20-26 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
20	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,	20	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
21	org.eclipse.equinox.internal.provisional.p2.core,	21	org.eclipse.equinox.internal.provisional.p2.core,
22	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	22	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
23	org.eclipse.equinox.internal.provisional.p2.core.repository,	23	org.eclipse.equinox.internal.provisional.p2.repository,
24	org.eclipse.equinox.internal.provisional.p2.metadata,	24	org.eclipse.equinox.internal.provisional.p2.metadata,
25	org.eclipse.equinox.internal.provisional.p2.metadata.query,	25	org.eclipse.equinox.internal.provisional.p2.metadata.query,
26	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	26	org.eclipse.equinox.internal.provisional.p2.metadata.repository,

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/publisher/Publisher.java (-2 / +3 lines)
10	******************************************************************************/	10	******************************************************************************/
11	package org.eclipse.equinox.p2.publisher;	11	package org.eclipse.equinox.p2.publisher;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		15
13	import java.net.URI;	16	import java.net.URI;
14	import java.util.Collection;	17	import java.util.Collection;
15	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
Lines 18-25 Link Here
18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	23	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
21	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
22	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;




import java.util.Map;
import java.util.zip.*;
import org.eclipse.core.runtime.*;
import org.eclipse.ecf.filetransfer.UserCancelledException;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.p2.publisher.eclipse.FeatureParser;
import org.eclipse.equinox.internal.p2.repository.AuthenticationFailedException;
import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.p2.publisher.eclipse.*;
import org.eclipse.osgi.util.NLS;

	 * Returns a local file containing the contents of the update site at the given location.
	 */
	private static File loadSiteFile(URI location, IProgressMonitor monitor) throws ProvisionException {
		SubMonitor submonitor = SubMonitor.convert(monitor, 1000);
		File siteFile = null;
		IStatus transferResult;
		boolean deleteSiteFile = false;
		try {
			File siteFile = null;
			IStatus transferResult = null;
			boolean deleteSiteFile = false;
			try {
				URI actualLocation = getSiteURI(location);
				if (PROTOCOL_FILE.equals(actualLocation.getScheme())) {
					siteFile = URIUtil.toFile(actualLocation);
					if (siteFile.exists())
						transferResult = Status.OK_STATUS;
					else {
						String msg = NLS.bind(Messages.ErrorReadingSite, location);
						transferResult = new Status(IStatus.ERROR, Activator.ID, ProvisionException.ARTIFACT_NOT_FOUND, msg, new FileNotFoundException(siteFile.getAbsolutePath()));
					}
				} else {
					// creating a temp file. In the event of an error we want to delete it.
					deleteSiteFile = true;
					OutputStream destination = null;
					try {
						siteFile = File.createTempFile("site", ".xml"); //$NON-NLS-1$//$NON-NLS-2$
						destination = new BufferedOutputStream(new FileOutputStream(siteFile));
					} catch (IOException e) {
						throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, // 
								"Can not create tempfile for site.xml", e)); //$NON-NLS-1$
					}
					transferResult = getTransport().download(actualLocation, destination, submonitor.newChild(999));
				}
				if (monitor.isCanceled())
					throw new OperationCanceledException();
				if (transferResult.isOK()) {
					// successful. If the siteFile is the download of a remote site.xml it will get cleaned up later
					deleteSiteFile = false;
					return siteFile;
				}
			} else {
				// creating a temp file. In the event of an error we want to delete it.
				deleteSiteFile = true;
				siteFile = File.createTempFile("site", ".xml"); //$NON-NLS-1$//$NON-NLS-2$
				OutputStream destination = new BufferedOutputStream(new FileOutputStream(siteFile));
				transferResult = getTransport().download(actualLocation.toString(), destination, monitor);
			}
			if (monitor.isCanceled())
				throw new OperationCanceledException();
			if (transferResult.isOK()) {
				// successful. If the siteFile is the download of a remote site.xml it will get cleaned up later
				deleteSiteFile = false;
				return siteFile;
			}
			// The transfer failed. Check if the file is not present
			if (0 == getTransport().getLastModified(actualLocation))
				throw new FileNotFoundException(actualLocation.toString());

				// The transferStatus from download has a well formatted message that should
				// be used as it contains useful feedback to the user.
				// The only thing needed is to translate the error code ARTIFACT_NOT_FOUND to
				// REPOSITORY_NOT_FOUND as the download does not know what the file represents.
				//
				// TODO: ? Tests dictate that REPOSITORY_NOT_FOUND is the correct response to 
				// issues like "unknown host", "malformed url" - it is almost impossible to differentiate
				// between "not found" and "error while reading something found" at this point.
				int code = transferResult.getCode();
				MultiStatus ms = new MultiStatus(Activator.ID, //
						ProvisionException.REPOSITORY_NOT_FOUND,
						// (code == ProvisionException.ARTIFACT_NOT_FOUND || code == ProvisionException.REPOSITORY_NOT_FOUND ? ProvisionException.REPOSITORY_NOT_FOUND : ProvisionException.REPOSITORY_FAILED_READ), //
						new IStatus[] {transferResult}, //
						NLS.bind(Messages.ErrorReadingSite, location), null);
				throw new ProvisionException(ms);

			} finally {
				if (deleteSiteFile && siteFile != null)
					siteFile.delete();
			}
		} finally {
			if (monitor != null)
				monitor.done();
		}
		int code = (failure instanceof FileNotFoundException) ? ProvisionException.REPOSITORY_NOT_FOUND : ProvisionException.REPOSITORY_FAILED_READ;
		String msg = NLS.bind(Messages.ErrorReadingSite, location);
		throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, code, msg, failure));
	}

	/*

				if (monitor.isCanceled())
					throw new OperationCanceledException();
				OutputStream destination = new BufferedOutputStream(new FileOutputStream(featureFile));
				transferResult = getTransport().download(featureURI, destination, monitor);
				if (transferResult.isOK())
					break;
			}

		return null;
	}

	/**
	 * Throw an exception if the site pointed to by the given URI is not valid.
	 * @param url the site file to check
	 * @param monitor a monitor
	 * @throws UserCancelledException if user canceled during authentication
	 * @throws AuthenticationFailedException if too many attempts made to login
	 * @throws FileNotFoundException if the remote file does not exist
	 * @throws CoreException on errors in communication (unknown host, connection refused, etc.)
	 */
	public static void validate(URI url, IProgressMonitor monitor) throws UserCancelledException, AuthenticationFailedException, FileNotFoundException, CoreException {
		URI siteURI = getSiteURI(url);
		long lastModified = getTransport().getLastModified(siteURI, monitor);
		if (lastModified == 0) {
			throw new FileNotFoundException(url.toString());
			//			String msg = NLS.bind(Messages.ErrorReadingSite, url);
			//			throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, null));
		}
	}


			} else {
				digestFile = File.createTempFile("digest", ".zip"); //$NON-NLS-1$ //$NON-NLS-2$
				BufferedOutputStream destination = new BufferedOutputStream(new FileOutputStream(digestFile));
				IStatus result = getTransport().download(digestURI, destination, monitor);
				if (result.getSeverity() == IStatus.CANCEL || monitor.isCanceled())
					throw new OperationCanceledException();
				if (!result.isOK())

		}
	}

	private static RepositoryTransport getTransport() {
		return RepositoryTransport.getInstance();
	}
}




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

import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
import java.net.*;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ecf.core.*;
import org.eclipse.ecf.core.security.ConnectContextFactory;
import org.eclipse.ecf.core.security.IConnectContext;
import org.eclipse.ecf.filetransfer.*;
import org.eclipse.ecf.filetransfer.events.*;
import org.eclipse.ecf.filetransfer.identity.FileCreateException;
import org.eclipse.ecf.filetransfer.identity.FileIDFactory;
import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IStateful;
import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI.AuthenticationInfo;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.security.storage.*;
import org.eclipse.osgi.util.NLS;
import org.osgi.util.tracker.ServiceTracker;

/**
 * TODO: Remove this class it is not used.
 * @deprecated Please use {@link RepositoryTransport} instead.
 */
public class ECFTransport {
	// TO BE REMOVED
	 * The number of password retry attempts allowed before failing.
	 */
	private static final int LOGIN_RETRIES = 3;

	private static final ProtocolException ERROR_401 = new ProtocolException();

	private static final String SERVER_REDIRECT = "Server redirected too many times"; //$NON-NLS-1$

	/**
	 * The singleton transport instance.
	 */
	private static ECFTransport instance;

	/**
	 * A job that waits on a barrier.
	 */
	static class WaitJob extends Job {
		private final Object[] barrier;

		/**
		 * Creates a wait job.
		 * @param location A location string that is used in the job name
		 * @param barrier The job will wait until the first entry in the barrier is non-null
		 */
		WaitJob(String location, Object[] barrier) {
			super(NLS.bind(Messages.repo_loading, location));
			this.barrier = barrier;
			setSystem(true);
		}

		/* (non-Javadoc)
		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
		 */
		protected IStatus run(IProgressMonitor monitor) {
			synchronized (barrier) {
				while (barrier[0] == null) {
					try {
						barrier.wait();
					} catch (InterruptedException e) {
						//ignore
					}
				}
			}
			return Status.OK_STATUS;
		}
	}

	private final ServiceTracker retrievalFactoryTracker;

	/**
	 * Returns an initialized instance of ECFTransport
	 */
	public static synchronized ECFTransport getInstance() {
		if (instance == null) {
			instance = new ECFTransport();
		}
		return instance;
	}

	/**
	 * Private to avoid client instantiation.
	 */
	private ECFTransport() {
		retrievalFactoryTracker = new ServiceTracker(Activator.getBundleContext(), IRetrieveFileTransferFactory.class.getName(), null);
		retrievalFactoryTracker.open();
	}

	/**
	 * Gets the last modified date for the specified file.
	 * @param location - The URL location of the file.
	 * @return A <code>long</code> representing the date. Returns <code>0</code> if the file is not found or an error occurred.
	 * @exception OperationCanceledException if the request was canceled.
	 */
	public long getLastModified(URI location) throws ProvisionException {
		String locationString = location.toString();
		try {
			IConnectContext context = getConnectionContext(locationString, false);
			for (int i = 0; i < LOGIN_RETRIES; i++) {
				try {
					return doGetLastModified(locationString, context);
				} catch (ProtocolException e) {
					if (ERROR_401 == e)
						context = getConnectionContext(locationString, true);
				} catch (Exception e) {
					e.getMessage();
				}
			}
		} catch (UserCancelledException e) {
			throw new OperationCanceledException();
		}
		//too many retries, so report as failure
		throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.io_failedRead, locationString), null));
	}

	/**
	 * Perform the ECF call to get the last modified time, failing if there is any
	 * protocol failure such as an authentication failure.
	 */
	private long doGetLastModified(String location, IConnectContext context) throws ProtocolException {
		IContainer container;
		try {
			container = ContainerFactory.getDefault().createContainer();
		} catch (ContainerCreateException e) {
			return 0;
		}
		IRemoteFileSystemBrowserContainerAdapter adapter = (IRemoteFileSystemBrowserContainerAdapter) container.getAdapter(IRemoteFileSystemBrowserContainerAdapter.class);
		if (adapter == null) {
			return 0;
		}
		IRemoteFile remoteFile = checkFile(adapter, location, context);
		if (remoteFile == null) {
			return 0;
		}
		return remoteFile.getInfo().getLastModified();
	}

	/**
	 * Downloads the contents of the given URL to the given output stream. The
	 * destination stream will be closed by this method whether it succeeds
	 * to download or not.
	 */
	public IStatus download(String url, OutputStream destination, IProgressMonitor monitor) {
		try {
			IConnectContext context = getConnectionContext(url, false);
			for (int i = 0; i < LOGIN_RETRIES; i++) {
				try {
					return performDownload(url, destination, context, monitor);
				} catch (ProtocolException e) {
					if (e == ERROR_401)
						context = getConnectionContext(url, true);
				}
			}
		} catch (UserCancelledException e) {
			return Status.CANCEL_STATUS;
		} catch (ProvisionException e) {
			return e.getStatus();
		} finally {
			try {
				destination.close();
			} catch (IOException e) {
				//ignore secondary failure
			}
		}
		//reached maximum number of retries without success
		return new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.io_failedRead, url), null);
	}

	public IStatus performDownload(String toDownload, OutputStream target, IConnectContext context, IProgressMonitor monitor) throws ProtocolException {
		IRetrieveFileTransferFactory factory = (IRetrieveFileTransferFactory) retrievalFactoryTracker.getService();
		if (factory == null)
			return statusOn(target, new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.ecf_configuration_error, toDownload)));

		return transfer(factory.newInstance(), toDownload, target, context, monitor);
	}

	private IRemoteFile checkFile(final IRemoteFileSystemBrowserContainerAdapter retrievalContainer, final String location, IConnectContext context) throws ProtocolException {
		final Object[] result = new Object[2];
		final Object FAIL = new Object();
		IRemoteFileSystemListener listener = new IRemoteFileSystemListener() {
			public void handleRemoteFileEvent(IRemoteFileSystemEvent event) {
				Exception exception = event.getException();
				if (exception != null) {
					synchronized (result) {
						result[0] = FAIL;
						result[1] = exception;
						result.notify();
					}
				} else if (event instanceof IRemoteFileSystemBrowseEvent) {
					IRemoteFileSystemBrowseEvent fsbe = (IRemoteFileSystemBrowseEvent) event;
					IRemoteFile[] remoteFiles = fsbe.getRemoteFiles();
					if (remoteFiles != null && remoteFiles.length > 0 && remoteFiles[0] != null) {
						synchronized (result) {
							result[0] = remoteFiles[0];
							result.notify();
						}
					} else {
						synchronized (result) {
							result[0] = FAIL;
							result.notify();
						}
					}
				}
			}
		};
		try {
			retrievalContainer.setConnectContextForAuthentication(context);
			retrievalContainer.sendBrowseRequest(FileIDFactory.getDefault().createFileID(retrievalContainer.getBrowseNamespace(), location), listener);
		} catch (RemoteFileSystemException e) {
			return null;
		} catch (FileCreateException e) {
			return null;
		}
		waitFor(location, result);
		if (result[0] == FAIL && result[1] instanceof IOException) {
			IOException ioException = (IOException) result[1];
			//throw a special exception for authentication failure so we know to prompt for username/password
			String message = ioException.getMessage();
			if (message != null && (message.indexOf(" 401 ") != -1 || message.indexOf(SERVER_REDIRECT) != -1)) //$NON-NLS-1$
				throw ERROR_401;
		}
		if (result[0] instanceof IRemoteFile)
			return (IRemoteFile) result[0];
		return null;
	}

	/**
	 * Check if the given exception represents a permission failure (401 for HTTP),
	 * and throw a special marker exception if a permission failure was encountered.
	 */
	private void checkPermissionDenied(Throwable t) throws ProtocolException {
		if (!(t instanceof IncomingFileTransferException))
			return;
		IncomingFileTransferException e = (IncomingFileTransferException) t;
		if (e.getErrorCode() == 401)
			throw ERROR_401;
		//try to figure out if we have a 401 by parsing the exception message
		IStatus status = e.getStatus();
		Throwable exception = status.getException();
		if (exception instanceof IOException)
			if (exception.getMessage() != null && (exception.getMessage().indexOf(" 401 ") != -1 || exception.getMessage().indexOf(SERVER_REDIRECT) != -1)) //$NON-NLS-1$
				throw ERROR_401;
	}

	private IStatus transfer(final IRetrieveFileTransferContainerAdapter retrievalContainer, final String toDownload, final OutputStream target, IConnectContext context, final IProgressMonitor monitor) throws ProtocolException {
		final IStatus[] result = new IStatus[1];
		IFileTransferListener listener = new IFileTransferListener() {
			public void handleTransferEvent(IFileTransferEvent event) {
				if (event instanceof IFileTransferConnectStartEvent) {
					IFileTransferConnectStartEvent cse = (IFileTransferConnectStartEvent) event;
					FileTransferJob connectJob = cse.prepareConnectJob(null);
					cse.connectUsingJob(connectJob);
				} else if (event instanceof IIncomingFileTransferReceiveStartEvent) {
					IIncomingFileTransferReceiveStartEvent rse = (IIncomingFileTransferReceiveStartEvent) event;
					try {
						if (target != null) {
							rse.receive(target);
						}
					} catch (IOException e) {
						IStatus status = convertToStatus(e);
						synchronized (result) {
							result[0] = status;
							result.notify();
						}
					}
				}
				if (event instanceof IIncomingFileTransferReceiveDataEvent) {
					IIncomingFileTransfer source = ((IIncomingFileTransferReceiveDataEvent) event).getSource();
					if (monitor != null) {
						if (monitor.isCanceled())
							source.cancel();
					}
				}
				if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
					Exception exception = ((IIncomingFileTransferReceiveDoneEvent) event).getException();
					IStatus status = convertToStatus(exception);
					synchronized (result) {
						result[0] = status;
						result.notify();
					}
				}
			}
		};

		try {
			retrievalContainer.setConnectContextForAuthentication(context);
			retrievalContainer.sendRetrieveRequest(FileIDFactory.getDefault().createFileID(retrievalContainer.getRetrieveNamespace(), toDownload), listener, null);
		} catch (IncomingFileTransferException e) {
			checkPermissionDenied(e);
			return statusOn(target, e.getStatus());
		} catch (FileCreateException e) {
			return statusOn(target, e.getStatus());
		}
		waitFor(toDownload, result);
		final Throwable exception = result[0].getException();
		checkPermissionDenied(exception);
		//if the transfer failed, return the underlying exception status, otherwise return top level DownloadStatus
		if (exception instanceof IncomingFileTransferException) {
			IStatus status = ((IncomingFileTransferException) exception).getStatus();
			if (!status.isOK())
				return statusOn(target, status);
		}
		return statusOn(target, result[0]);
	}

	/**
	 * Returns the connection context for the given URL. This may prompt the
	 * user for user name and password as required.
	 *
	 * @param xmlLocation - the file location requiring login details
	 * @param prompt - use <code>true</code> to prompt the user instead of
	 * looking at the secure preference store for login, use <code>false</code>
	 * to only try the secure preference store
	 * @throws UserCancelledException when the user cancels the login prompt
	 * @throws ProvisionException if the password cannot be read or saved
	 * @return The connection context
	 */
	public IConnectContext getConnectionContext(String xmlLocation, boolean prompt) throws UserCancelledException, ProvisionException {
		ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
		IPath hostLocation = new Path(xmlLocation).removeLastSegments(1);
		String nodeKey;
		try {
			nodeKey = URLEncoder.encode(hostLocation.toString(), "UTF-8"); //$NON-NLS-1$
		} catch (UnsupportedEncodingException e2) {
			//fall back to default platform encoding
			nodeKey = URLEncoder.encode(hostLocation.toString());
		}
		String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
		ISecurePreferences prefNode = null;
		if (securePreferences.nodeExists(nodeName))
			prefNode = securePreferences.node(nodeName);
		if (!prompt) {
			if (prefNode == null)
				return null;
			try {
				String username = prefNode.get(IRepository.PROP_USERNAME, null);
				String password = prefNode.get(IRepository.PROP_PASSWORD, null);
				//if we don't have stored connection data just return a null connection context
				if (username == null || password == null)
					return null;
				return ConnectContextFactory.createUsernamePasswordConnectContext(username, password);
			} catch (StorageException e) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			}
		}
		//need to prompt user for user name and password
		ServiceTracker adminUITracker = new ServiceTracker(Activator.getBundleContext(), IServiceUI.class.getName(), null);
		adminUITracker.open();
		IServiceUI adminUIService = (IServiceUI) adminUITracker.getService();
		AuthenticationInfo loginDetails = null;
		if (adminUIService != null)
			loginDetails = adminUIService.getUsernamePassword(hostLocation.toString());
		//null result means user canceled password dialog
		if (loginDetails == null)
			throw new UserCancelledException();
		//save user name and password if requested by user
		if (loginDetails.saveResult()) {
			if (prefNode == null)
				prefNode = securePreferences.node(nodeName);
			try {
				prefNode.put(IRepository.PROP_USERNAME, loginDetails.getUserName(), true);
				prefNode.put(IRepository.PROP_PASSWORD, loginDetails.getPassword(), true);
				prefNode.flush();
			} catch (StorageException e1) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			} catch (IOException e) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			}
		}
		return ConnectContextFactory.createUsernamePasswordConnectContext(loginDetails.getUserName(), loginDetails.getPassword());
	}

	protected IStatus convertToStatus(Exception e) {
		if (e == null)
			return Status.OK_STATUS;
		if (e instanceof UserCancelledException)
			return new Status(IStatus.CANCEL, Activator.ID, e.getMessage(), e);
		return new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e);
	}

	private static IStatus statusOn(OutputStream target, IStatus status) {
		if (target instanceof IStateful)
			((IStateful) target).setStatus(status);
		return status;
	}

	/**
	 * Waits until the first entry in the given array is non-null.
	 */
	private void waitFor(String location, Object[] barrier) {
		WaitJob wait = new WaitJob(location, barrier);
		wait.schedule();
		while (barrier[0] == null) {
			boolean logged = false;
			try {
				wait.join();
			} catch (InterruptedException e) {
				if (!logged)
					LogHelper.log(new Status(IStatus.WARNING, Activator.ID, "Unexpected interrupt while waiting on ECF transfer", e)); //$NON-NLS-1$
			}
		}
	}
}




 org.eclipse.equinox.app;version="1.0.0";resolution:=optional,
 org.eclipse.equinox.internal.p2.core.helpers,
 org.eclipse.equinox.internal.p2.publisher.eclipse,
 org.eclipse.equinox.internal.p2.repository,
 org.eclipse.equinox.internal.p2.repository.helpers,
 org.eclipse.equinox.internal.provisional.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.core.eventbus,
 org.eclipse.equinox.internal.provisional.p2.core.repository,
 org.eclipse.equinox.internal.provisional.p2.metadata,
 org.eclipse.equinox.internal.provisional.p2.metadata.query,
 org.eclipse.equinox.internal.provisional.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.p2.query,
 org.eclipse.equinox.internal.provisional.p2.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.core.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.repository,
 org.eclipse.equinox.p2.publisher,
 org.eclipse.equinox.p2.publisher.actions,
 org.eclipse.equinox.p2.publisher.eclipse,




package org.eclipse.equinox.internal.p2.updatesite.metadata;

import java.io.File;
import java.io.FileNotFoundException;
import java.net.URI;
import java.util.Map;
import org.eclipse.core.runtime.*;
import org.eclipse.ecf.filetransfer.UserCancelledException;
import org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository;
import org.eclipse.equinox.internal.p2.repository.AuthenticationFailedException;
import org.eclipse.equinox.internal.p2.updatesite.*;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;
import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory;
import org.eclipse.equinox.p2.publisher.*;
import org.eclipse.osgi.util.NLS;

public class UpdateSiteMetadataRepositoryFactory extends MetadataRepositoryFactory {
	private static final String PROP_SITE_CHECKSUM = "site.checksum"; //$NON-NLS-1$

			UpdateSite.validate(location, monitor);
		} catch (ProvisionException e) {
			return e.getStatus();
		} catch (UserCancelledException e) {
			return Status.CANCEL_STATUS;
		} catch (AuthenticationFailedException e) {
			return new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.getString("UpdateSiteMetadataRepositoryFactory.AuthenticationFailedFor_0"), location.toString()), e); //$NON-NLS-1$
		} catch (FileNotFoundException e) {
			return new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, NLS.bind(Messages.getString("UpdateSiteMetadataRepositoryFactory.RepositoryNotFound_0"), location.toString()), e); //$NON-NLS-1$
		} catch (CoreException e) {
			return e.getStatus();
		}
		return Status.OK_STATUS;
	}

Added Link Here

(-)src/org/eclipse/equinox/internal/p2/updatesite/metadata/messages.properties (+2 lines)
1	UpdateSiteMetadataRepositoryFactory.AuthenticationFailedFor_0=Authentication failed {0}
2	UpdateSiteMetadataRepositoryFactory.RepositoryNotFound_0=Repository not found {0}




package org.eclipse.equinox.internal.p2.updatesite.metadata;

import java.util.MissingResourceException;
import java.util.ResourceBundle;

public class Messages {
	private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.updatesite.metadata.messages"; //$NON-NLS-1$

	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);

	private Messages() {
	}

	public static String getString(String key) {
		try {
			return RESOURCE_BUNDLE.getString(key);
		} catch (MissingResourceException e) {
			return '!' + key + '!';
		}
	}
}

Lines 9-15 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
9	org.eclipse.equinox.internal.provisional.p2.core,	9	org.eclipse.equinox.internal.provisional.p2.core,
10	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	10	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
11	org.eclipse.equinox.internal.provisional.p2.core.location,	11	org.eclipse.equinox.internal.provisional.p2.core.location,
12	org.eclipse.equinox.internal.provisional.p2.core.repository,	12	org.eclipse.equinox.internal.provisional.p2.repository,
13	org.eclipse.equinox.internal.provisional.p2.engine,	13	org.eclipse.equinox.internal.provisional.p2.engine,
14	org.eclipse.equinox.internal.provisional.p2.metadata,	14	org.eclipse.equinox.internal.provisional.p2.metadata,
15	org.eclipse.equinox.internal.provisional.p2.metadata.query,	15	org.eclipse.equinox.internal.provisional.p2.metadata.query,

Lines 18-23 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
18	org.eclipse.equinox.internal.provisional.frameworkadmin,	18	org.eclipse.equinox.internal.provisional.frameworkadmin,
19	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	19	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
20	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,	20	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
		21	org.eclipse.equinox.internal.provisional.p2.repository,
21	org.eclipse.equinox.internal.provisional.p2.metadata,	22	org.eclipse.equinox.internal.provisional.p2.metadata,
22	org.eclipse.equinox.internal.provisional.p2.metadata.query,	23	org.eclipse.equinox.internal.provisional.p2.metadata.query,
23	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	24	org.eclipse.equinox.internal.provisional.p2.metadata.repository,

Lines 24-30 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
24	org.eclipse.equinox.internal.provisional.frameworkadmin,	24	org.eclipse.equinox.internal.provisional.frameworkadmin,
25	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	25	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
26	org.eclipse.equinox.internal.provisional.p2.core,	26	org.eclipse.equinox.internal.provisional.p2.core,
27	org.eclipse.equinox.internal.provisional.p2.core.repository,	27	org.eclipse.equinox.internal.provisional.p2.repository,
28	org.eclipse.equinox.internal.provisional.p2.director,	28	org.eclipse.equinox.internal.provisional.p2.director,
29	org.eclipse.equinox.internal.provisional.p2.engine,	29	org.eclipse.equinox.internal.provisional.p2.engine,
30	org.eclipse.equinox.internal.provisional.p2.metadata,	30	org.eclipse.equinox.internal.provisional.p2.metadata,

Lines 24-29 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
24	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	24	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
25	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,	25	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
26	org.eclipse.equinox.internal.provisional.p2.metadata,	26	org.eclipse.equinox.internal.provisional.p2.metadata,
		27	org.eclipse.equinox.internal.provisional.p2.repository,
27	org.osgi.framework;version="1.4.0"	28	org.osgi.framework;version="1.4.0"
28	Bundle-ActivationPolicy: lazy	29	Bundle-ActivationPolicy: lazy
29	Bundle-Activator: org.eclipse.equinox.p2.tests.optimizers.TestActivator	30	Bundle-Activator: org.eclipse.equinox.p2.tests.optimizers.TestActivator

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java (-1 / +2 lines)
10	******************************************************************************/	10	******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.directorywatcher;	11	package org.eclipse.equinox.internal.provisional.p2.directorywatcher;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.net.URI;	16	import java.net.URI;
15	import java.util.*;	17	import java.util.*;
Lines 18-24 Link Here
18	import org.eclipse.equinox.internal.p2.update.Site;	20	import org.eclipse.equinox.internal.p2.update.Site;
19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
21	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;

Lines 11-17 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
11	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	11	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
12	org.eclipse.equinox.internal.provisional.p2.core,	12	org.eclipse.equinox.internal.provisional.p2.core,
13	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	13	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
14	org.eclipse.equinox.internal.provisional.p2.core.repository,	14	org.eclipse.equinox.internal.provisional.p2.repository,
15	org.eclipse.equinox.internal.provisional.p2.metadata,	15	org.eclipse.equinox.internal.provisional.p2.metadata,
16	org.eclipse.equinox.internal.provisional.p2.metadata.query,	16	org.eclipse.equinox.internal.provisional.p2.metadata.query,
17	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	17	org.eclipse.equinox.internal.provisional.p2.metadata.repository,

Lines 12-18 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
12	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	12	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
13	org.eclipse.equinox.internal.provisional.p2.core,	13	org.eclipse.equinox.internal.provisional.p2.core,
14	org.eclipse.equinox.internal.provisional.p2.core.location,	14	org.eclipse.equinox.internal.provisional.p2.core.location,
15	org.eclipse.equinox.internal.provisional.p2.core.repository,	15	org.eclipse.equinox.internal.provisional.p2.repository,
16	org.eclipse.equinox.internal.provisional.p2.director,	16	org.eclipse.equinox.internal.provisional.p2.director,
17	org.eclipse.equinox.internal.provisional.p2.engine,	17	org.eclipse.equinox.internal.provisional.p2.engine,
18	org.eclipse.equinox.internal.provisional.p2.engine.phases,	18	org.eclipse.equinox.internal.provisional.p2.engine.phases,

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.ui.admin;	11	package org.eclipse.equinox.internal.p2.ui.admin;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddProfileDialog;	15	import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddProfileDialog;
14	import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants;	16	import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants;
15	import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;	17	import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;
16	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
17	import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;	18	import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;
18	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	19	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/admin/AddMetadataRepositoryOperation.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.ui.admin;	11	package org.eclipse.equinox.internal.p2.ui.admin;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
15	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
16	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
17	import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddRepositoryOperation;	18	import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddRepositoryOperation;
18	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;	19	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
19		20

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/admin/AddArtifactRepositoryOperation.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.ui.admin;	11	package org.eclipse.equinox.internal.p2.ui.admin;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
15	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
16	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
17	import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddRepositoryOperation;	18	import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddRepositoryOperation;
18	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;	19	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
19		20

Lines 11-22 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoriesView.java (-1 / +2 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.ui.admin;	12	package org.eclipse.equinox.internal.p2.ui.admin;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		15
14	import java.net.URI;	16	import java.net.URI;
15	import java.util.ArrayList;	17	import java.util.ArrayList;
16	import java.util.List;	18	import java.util.List;
17	import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddMetadataRepositoryDialog;	19	import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddMetadataRepositoryDialog;
18	import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants;	20	import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants;
19	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
20	import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner;	21	import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner;
21	import org.eclipse.equinox.internal.provisional.p2.ui.actions.InstallAction;	22	import org.eclipse.equinox.internal.provisional.p2.ui.actions.InstallAction;
22	import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement;	23	import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement;

Lines 10-18 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.ui.admin.dialogs;	11	package org.eclipse.equinox.internal.p2.ui.admin.dialogs;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		14
13	import java.util.Map;	15	import java.util.Map;
14	import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;	16	import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
15	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
16	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;	17	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
17	import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement;	18	import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement;
18	import org.eclipse.swt.SWT;	19	import org.eclipse.swt.SWT;

Lines 14-20 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
14	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	14	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
15	org.eclipse.equinox.internal.provisional.p2.core,	15	org.eclipse.equinox.internal.provisional.p2.core,
16	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	16	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
17	org.eclipse.equinox.internal.provisional.p2.core.repository,	17	org.eclipse.equinox.internal.provisional.p2.repository,
18	org.eclipse.equinox.internal.provisional.p2.director,	18	org.eclipse.equinox.internal.provisional.p2.director,
19	org.eclipse.equinox.internal.provisional.p2.engine,	19	org.eclipse.equinox.internal.provisional.p2.engine,
20	org.eclipse.equinox.internal.provisional.p2.metadata,	20	org.eclipse.equinox.internal.provisional.p2.metadata,

Lines 92-98 Link Here

(-)plugin.xml (-1 / +1 lines)
92	class="org.eclipse.equinox.internal.p2.ui.admin.dialogs.RepositoryImplementationPropertyPage"	92	class="org.eclipse.equinox.internal.p2.ui.admin.dialogs.RepositoryImplementationPropertyPage"
93	id="org.eclipse.equinox.internal.p2.ui.admin.dialogs.RepositoryImplementationPropertyPage">	93	id="org.eclipse.equinox.internal.p2.ui.admin.dialogs.RepositoryImplementationPropertyPage">
94	<enabledWhen>	94	<enabledWhen>
95	<adapt type="org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository"/>	95	<adapt type="org.eclipse.equinox.internal.provisional.p2.repository.IRepository"/>
96	</enabledWhen>	96	</enabledWhen>
97	</page>	97	</page>
98		98

Lines 13-19 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
13	org.eclipse.equinox.internal.provisional.configurator,	13	org.eclipse.equinox.internal.provisional.configurator,
14	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	14	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
15	org.eclipse.equinox.internal.provisional.p2.core,	15	org.eclipse.equinox.internal.provisional.p2.core,
16	org.eclipse.equinox.internal.provisional.p2.core.repository,	16	org.eclipse.equinox.internal.provisional.p2.repository,
17	org.eclipse.equinox.internal.provisional.p2.director,	17	org.eclipse.equinox.internal.provisional.p2.director,
18	org.eclipse.equinox.internal.provisional.p2.engine,	18	org.eclipse.equinox.internal.provisional.p2.engine,
19	org.eclipse.equinox.internal.provisional.p2.metadata,	19	org.eclipse.equinox.internal.provisional.p2.metadata,

Lines 10-16 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
10	org.eclipse.equinox.internal.p2.ui.query,	10	org.eclipse.equinox.internal.p2.ui.query,
11	org.eclipse.equinox.internal.provisional.p2.core,	11	org.eclipse.equinox.internal.provisional.p2.core,
12	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	12	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
13	org.eclipse.equinox.internal.provisional.p2.core.repository,	13	org.eclipse.equinox.internal.provisional.p2.repository,
14	org.eclipse.equinox.internal.provisional.p2.director,	14	org.eclipse.equinox.internal.provisional.p2.director,
15	org.eclipse.equinox.internal.provisional.p2.engine,	15	org.eclipse.equinox.internal.provisional.p2.engine,
16	org.eclipse.equinox.internal.provisional.p2.metadata,	16	org.eclipse.equinox.internal.provisional.p2.metadata,

Lines 18-24 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
18	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	18	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
19	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,	19	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
20	org.eclipse.equinox.internal.provisional.p2.core,	20	org.eclipse.equinox.internal.provisional.p2.core,
21	org.eclipse.equinox.internal.provisional.p2.core.repository,	21	org.eclipse.equinox.internal.provisional.p2.repository,
22	org.eclipse.equinox.internal.provisional.p2.metadata,	22	org.eclipse.equinox.internal.provisional.p2.metadata,
23	org.eclipse.equinox.internal.p2.sar,	23	org.eclipse.equinox.internal.p2.sar,
24	org.eclipse.internal.provisional.equinox.p2.jarprocessor	24	org.eclipse.internal.provisional.equinox.p2.jarprocessor

Lines 11-17 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java (-1 / +1 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.artifact.processors;	12	package org.eclipse.equinox.internal.p2.artifact.processors;
13		13
14	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
15		15
16	import java.net.URI;	16	import java.net.URI;
17	import org.eclipse.core.runtime.IStatus;	17	import org.eclipse.core.runtime.IStatus;

Lines 1-5 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/natives/Util.java (-1 / +2 lines)
1	package org.eclipse.equinox.internal.p2.touchpoint.natives;	1	package org.eclipse.equinox.internal.p2.touchpoint.natives;
2		2
		3	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		4
3	import java.net.URI;	5	import java.net.URI;
4	import java.util.HashMap;	6	import java.util.HashMap;
5	import java.util.Map;	7	import java.util.Map;
Lines 10-16 Link Here
10	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	12	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
11	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	13	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
12	import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;	14	import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
13	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
14	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
15	import org.eclipse.osgi.util.NLS;	16	import org.eclipse.osgi.util.NLS;
16		17

Lines 11-17 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
11	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	11	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
12	org.eclipse.equinox.internal.provisional.p2.core,	12	org.eclipse.equinox.internal.provisional.p2.core,
13	org.eclipse.equinox.internal.provisional.p2.core.location,	13	org.eclipse.equinox.internal.provisional.p2.core.location,
14	org.eclipse.equinox.internal.provisional.p2.core.repository,	14	org.eclipse.equinox.internal.provisional.p2.repository,
15	org.eclipse.equinox.internal.provisional.p2.engine,	15	org.eclipse.equinox.internal.provisional.p2.engine,
16	org.eclipse.equinox.internal.provisional.p2.metadata,	16	org.eclipse.equinox.internal.provisional.p2.metadata,
17	org.eclipse.osgi.service.datalocation;version="1.0.0",	17	org.eclipse.osgi.service.datalocation;version="1.0.0",




 org.eclipse.equinox.internal.p2.engine,
 org.eclipse.equinox.internal.p2.metadata,
 org.eclipse.equinox.internal.p2.metadata.repository,
 org.eclipse.equinox.internal.p2.repository.helpers,
 org.eclipse.equinox.internal.p2.updatechecker,
 org.eclipse.equinox.internal.provisional.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.core.eventbus,
 org.eclipse.equinox.internal.provisional.p2.core.repository,
 org.eclipse.equinox.internal.provisional.p2.metadata,
 org.eclipse.equinox.internal.provisional.p2.metadata.query,
 org.eclipse.equinox.internal.provisional.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.p2.query,
 org.eclipse.equinox.internal.provisional.p2.repository,
 org.eclipse.equinox.internal.provisional.p2.updatechecker,
 org.eclipse.osgi.service.resolver,
 org.osgi.framework;version="1.4.0",

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java (-1 / +2 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.tools.mirror;	12	package org.eclipse.equinox.internal.p2.tools.mirror;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		15
14	import java.io.IOException;	16	import java.io.IOException;
15	import java.io.OutputStream;	17	import java.io.OutputStream;
16	import java.net.URI;	18	import java.net.URI;
Lines 24-30 Link Here
24	import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;	26	import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;
25	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	27	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
26	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	28	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
27	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	29	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	30	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
30	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	31	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;




Bundle-Localization: plugin
Bundle-Version: 1.0.0.qualifier
Import-Package: org.eclipse.equinox.internal.p2.core,
 org.eclipse.equinox.internal.p2.core.helpers,
 org.eclipse.equinox.internal.p2.director,
 org.eclipse.equinox.internal.p2.engine,
 org.eclipse.equinox.internal.p2.garbagecollector,
 org.eclipse.equinox.internal.p2.metadata.repository,
 org.eclipse.equinox.internal.p2.repository.helpers,
 org.eclipse.equinox.internal.provisional.p2.core.eventbus,
 org.eclipse.equinox.internal.provisional.p2.core.location,
 org.eclipse.equinox.internal.provisional.p2.director,

Lines 23-29 Link Here

(-)src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/CreateCompositeArtifactRepositoryTask.java (-1 / +1 lines)
23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
26	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;	26	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
27		27
28	/**	28	/**
29	* Ant task for creating a new composite artifact repository.	29	* Ant task for creating a new composite artifact repository.




/*******************************************************************************
 * 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
 *		compeople AG (Stefan Liebig) - various ongoing maintenance
 *******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.repository;

import java.io.*;
import java.net.ProtocolException;
import java.net.URLEncoder;
import org.eclipse.core.runtime.*;
import org.eclipse.ecf.core.security.ConnectContextFactory;
import org.eclipse.ecf.core.security.IConnectContext;
import org.eclipse.ecf.filetransfer.*;
import org.eclipse.ecf.filetransfer.events.*;
import org.eclipse.ecf.filetransfer.identity.FileCreateException;
import org.eclipse.ecf.filetransfer.identity.FileIDFactory;
import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IStateful;
import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI.AuthenticationInfo;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.security.storage.*;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.util.tracker.ServiceTracker;

/**
 * A transport implementation that uses ECF file transfer API.
 */
public class ECFTransport extends Transport {
	/**
	 * The number of password retry attempts allowed before failing.
	 */
	private static final int LOGIN_RETRIES = 3;

	private static final ProtocolException ERROR_401 = new ProtocolException();

	private static final String SERVER_REDIRECT = "Server redirected too many times"; //$NON-NLS-1$

	/**
	 * The singleton transport instance.
	 */
	private static ECFTransport instance;

	private final ServiceTracker retrievalFactoryTracker;

	/**
	 * Returns an initialized instance of ECFTransport
	 */
	public static synchronized ECFTransport getInstance() {
		if (instance == null) {
			instance = new ECFTransport();
		}
		return instance;
	}

	/**
	 * Private to avoid client instantiation.
	 */
	private ECFTransport() {
		retrievalFactoryTracker = new ServiceTracker(Activator.getContext(), IRetrieveFileTransferFactory.class.getName(), null);
		retrievalFactoryTracker.open();
		startBundle("org.eclipse.ecf.provider.filetransfer"); //$NON-NLS-1$
	}

	private boolean startBundle(String bundleId) {
		PackageAdmin packageAdmin = (PackageAdmin) ServiceHelper.getService(Activator.getContext(), PackageAdmin.class.getName());
		if (packageAdmin == null)
			return false;

		Bundle[] bundles = packageAdmin.getBundles(bundleId, null);
		if (bundles != null && bundles.length > 0) {
			for (int i = 0; i < bundles.length; i++) {
				try {
					if ((bundles[0].getState() & Bundle.INSTALLED) == 0) {
						bundles[0].start();
						return true;
					}
				} catch (BundleException e) {
					// failed, try next bundle
				}
			}
		}
		return false;
	}

	/**
	 * Check if the given exception represents a permission failure (401 for HTTP),
	 * and throw a special marker exception if a permission failure was encountered.
	 */
	private void checkPermissionDenied(Throwable t) throws ProtocolException {
		if (!(t instanceof IncomingFileTransferException))
			return;
		IncomingFileTransferException e = (IncomingFileTransferException) t;
		if (e.getErrorCode() == 401)
			throw ERROR_401;
		//try to figure out if we have a 401 by parsing the exception message
		IStatus status = e.getStatus();
		Throwable exception = status.getException();
		if (exception instanceof IOException)
			if (exception.getMessage() != null && (exception.getMessage().indexOf(" 401 ") != -1 || exception.getMessage().indexOf(SERVER_REDIRECT) != -1)) //$NON-NLS-1$
				throw ERROR_401;
	}

	protected IStatus convertToStatus(IFileTransferEvent event, Exception failure, long startTime, String location) {
		long speed = DownloadStatus.UNKNOWN_RATE;
		if (event instanceof IIncomingFileTransferEvent) {
			long bytes = ((IIncomingFileTransferEvent) event).getSource().getBytesReceived();
			if (bytes > 0) {
				long elapsed = (System.currentTimeMillis() - startTime) / 1000;//in seconds
				if (elapsed == 0)
					elapsed = 1;
				speed = bytes / elapsed;
			}
		}
		DownloadStatus result = null;
		if (failure == null)
			result = new DownloadStatus(IStatus.OK, Activator.ID, Status.OK_STATUS.getMessage());
		else if (failure instanceof UserCancelledException)
			result = new DownloadStatus(IStatus.CANCEL, Activator.ID, failure.getMessage(), failure);
		else
			result = new DownloadStatus(IStatus.ERROR, Activator.ID, NLS.bind(Messages.io_failedRead, location), failure);
		result.setTransferRate(speed);
		return result;
	}

	public IStatus download(String url, OutputStream destination, IProgressMonitor monitor) {
		try {
			IConnectContext context = getConnectionContext(url, false);
			for (int i = 0; i < LOGIN_RETRIES; i++) {
				try {
					return performDownload(url, destination, context, monitor);
				} catch (ProtocolException e) {
					if (e == ERROR_401)
						context = getConnectionContext(url, true);
				}
			}
		} catch (UserCancelledException e) {
			return Status.CANCEL_STATUS;
		} catch (ProvisionException e) {
			return e.getStatus();
		}
		//reached maximum number of retries without success
		return new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.io_failedRead, url), null);
	}

	public IStatus performDownload(String toDownload, OutputStream target, IConnectContext context, IProgressMonitor monitor) throws ProtocolException {
		IRetrieveFileTransferFactory factory = (IRetrieveFileTransferFactory) retrievalFactoryTracker.getService();
		if (factory == null)
			return statusOn(target, new Status(IStatus.ERROR, Activator.ID, Messages.ecf_configuration_error));

		return transfer(factory.newInstance(), toDownload, target, context, monitor);
	}

	private IStatus transfer(final IRetrieveFileTransferContainerAdapter retrievalContainer, final String toDownload, final OutputStream target, IConnectContext context, final IProgressMonitor monitor) throws ProtocolException {
		final IStatus[] result = new IStatus[1];
		final long startTime = System.currentTimeMillis();
		IFileTransferListener listener = new IFileTransferListener() {
			public void handleTransferEvent(IFileTransferEvent event) {
				if (event instanceof IFileTransferConnectStartEvent) {
					IFileTransferConnectStartEvent cse = (IFileTransferConnectStartEvent) event;
					FileTransferJob connectJob = cse.prepareConnectJob(null);
					cse.connectUsingJob(connectJob);
				} else if (event instanceof IIncomingFileTransferReceiveStartEvent) {
					IIncomingFileTransferReceiveStartEvent rse = (IIncomingFileTransferReceiveStartEvent) event;
					try {
						if (target != null) {
							rse.receive(target);
						}
					} catch (IOException e) {
						IStatus status = convertToStatus(event, e, startTime, toDownload);
						synchronized (result) {
							result[0] = status;
							result.notify();
						}
					}
				}
				if (event instanceof IIncomingFileTransferReceiveDataEvent) {
					IIncomingFileTransfer source = ((IIncomingFileTransferReceiveDataEvent) event).getSource();
					if (monitor != null) {
						if (monitor.isCanceled()) {
							synchronized (result) {
								result[0] = Status.CANCEL_STATUS;
								source.cancel();
								result.notify();
							}
						}
					}
				}
				if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
					Exception exception = ((IIncomingFileTransferReceiveDoneEvent) event).getException();
					IStatus status = convertToStatus(event, exception, startTime, toDownload);
					synchronized (result) {
						result[0] = status;
						result.notify();
					}
				}
			}
		};

		try {
			retrievalContainer.setConnectContextForAuthentication(context);
			retrievalContainer.sendRetrieveRequest(FileIDFactory.getDefault().createFileID(retrievalContainer.getRetrieveNamespace(), toDownload), listener, null);
		} catch (IncomingFileTransferException e) {
			checkPermissionDenied(e);
			return statusOn(target, e.getStatus());
		} catch (FileCreateException e) {
			return statusOn(target, e.getStatus());
		}
		synchronized (result) {
			while (result[0] == null) {
				boolean logged = false;
				try {
					result.wait();
				} catch (InterruptedException e) {
					if (!logged)
						LogHelper.log(new Status(IStatus.WARNING, Activator.ID, "Unexpected interrupt while waiting on ECF transfer", e)); //$NON-NLS-1$
				}
			}
		}
		final Throwable exception = result[0].getException();
		checkPermissionDenied(exception);
		//if the transfer failed, return the underlying exception status, otherwise return top level DownloadStatus
		if (exception instanceof IncomingFileTransferException) {
			IStatus cause = ((IncomingFileTransferException) exception).getStatus();
			if (!cause.isOK())
				return statusOn(target, cause);
		}
		return statusOn(target, result[0]);
	}

	/**
	 * Returns the connection context for the given URL. This may prompt the
	 * user for user name and password as required.
	 *
	 * @param xmlLocation - the file location requiring login details
	 * @param prompt - use <code>true</code> to prompt the user instead of
	 * looking at the secure preference store for login, use <code>false</code>
	 * to only try the secure preference store
	 * @throws UserCancelledException when the user cancels the login prompt
	 * @throws ProvisionException if the password cannot be read or saved
	 * @return The connection context
	 */
	public IConnectContext getConnectionContext(String xmlLocation, boolean prompt) throws UserCancelledException, ProvisionException {
		ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
		IPath hostLocation = new Path(xmlLocation).removeLastSegments(1);
		String nodeKey;
		try {
			nodeKey = URLEncoder.encode(hostLocation.toString(), "UTF-8"); //$NON-NLS-1$
		} catch (UnsupportedEncodingException e2) {
			//fall back to default platform encoding
			nodeKey = URLEncoder.encode(hostLocation.toString());
		}
		String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
		ISecurePreferences prefNode = null;
		if (securePreferences.nodeExists(nodeName))
			prefNode = securePreferences.node(nodeName);
		if (!prompt) {
			if (prefNode == null)
				return null;
			try {
				String username = prefNode.get(IRepository.PROP_USERNAME, null);
				String password = prefNode.get(IRepository.PROP_PASSWORD, null);
				//if we don't have stored connection data just return a null connection context
				if (username == null || password == null)
					return null;
				return ConnectContextFactory.createUsernamePasswordConnectContext(username, password);
			} catch (StorageException e) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			}
		}
		//need to prompt user for user name and password
		ServiceTracker adminUITracker = new ServiceTracker(Activator.getContext(), IServiceUI.class.getName(), null);
		adminUITracker.open();
		IServiceUI adminUIService = (IServiceUI) adminUITracker.getService();
		AuthenticationInfo loginDetails = null;
		if (adminUIService != null)
			loginDetails = adminUIService.getUsernamePassword(hostLocation.toString());
		//null result means user canceled password dialog
		if (loginDetails == null)
			throw new UserCancelledException();
		//save user name and password if requested by user
		if (loginDetails.saveResult()) {
			if (prefNode == null)
				prefNode = securePreferences.node(nodeName);
			try {
				prefNode.put(IRepository.PROP_USERNAME, loginDetails.getUserName(), true);
				prefNode.put(IRepository.PROP_PASSWORD, loginDetails.getPassword(), true);
				prefNode.flush();
			} catch (StorageException e1) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			} catch (IOException e) {
				String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
				throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
			}
		}
		return ConnectContextFactory.createUsernamePasswordConnectContext(loginDetails.getUserName(), loginDetails.getPassword());
	}

	private static IStatus statusOn(OutputStream target, IStatus status) {
		if (target instanceof IStateful)
			((IStateful) target).setStatus(status);
		return status;
	}
}




import java.net.URI;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.ArtifactRepositoryFactory;

/**

		return IRepository.TYPE_ARTIFACT;
	}

	/**
	 * @deprecated see {@link #loadRepository(URI, int, IProgressMonitor)}
	 */
	public IArtifactRepository loadRepository(URI location, IProgressMonitor monitor) throws ProvisionException {
		return loadRepository(location, 0, monitor);
	}

Lines 20-25 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java (+1 lines)
20	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler;	20	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler;
21	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	21	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
		23	import org.eclipse.equinox.internal.provisional.p2.repository.IStateful;
23	import org.eclipse.osgi.util.NLS;	24	import org.eclipse.osgi.util.NLS;
24		25
25	/**	26	/**

Lines 18-24 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java (-1 / +1 lines)
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
19	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;	19	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
20	import org.eclipse.equinox.internal.p2.core.helpers.Tracing;	20	import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
21	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;	21	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
22	import org.w3c.dom.*;	22	import org.w3c.dom.*;
23		23
24	/**	24	/**




/*******************************************************************************
 * Copyright (c) 2007 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.p2.artifact.repository;

import java.io.OutputStream;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;

public abstract class Transport {
	public abstract IStatus download(String toDownload, OutputStream target, IProgressMonitor pm);
}

Lines 23-30 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java (-2 / +2 lines)
23	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryState;	23	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryState;
24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
26	import org.eclipse.equinox.internal.provisional.p2.core.repository.ICompositeRepository;	26	import org.eclipse.equinox.internal.provisional.p2.repository.ICompositeRepository;
27	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;	27	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
29	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository;	29	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository;
30		30

Lines 19-27 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepositoryFactory.java (-2 / +4 lines)
19	import org.eclipse.equinox.internal.p2.core.helpers.Tracing;	19	import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
20	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryIO;	20	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryIO;
21	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryState;	21	import org.eclipse.equinox.internal.p2.persistence.CompositeRepositoryState;
		22	import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
		23	import org.eclipse.equinox.internal.p2.repository.Transport;
22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
23	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	26	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
25	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.ArtifactRepositoryFactory;	27	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.ArtifactRepositoryFactory;
26	import org.eclipse.osgi.util.NLS;	28	import org.eclipse.osgi.util.NLS;
27		29
Lines 120-125 Link Here
120	}	122	}
121		123
122	private Transport getTransport() {	124	private Transport getTransport() {
123	return ECFTransport.getInstance();	125	return RepositoryTransport.getInstance();
124	}	126	}
125	}	127	}

Lines 17-23 Link Here

(-)src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/AbstractArtifactRepository.java (-1 / +1 lines)
17	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	17	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
18	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	18	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
20	import org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository;	20	import org.eclipse.equinox.internal.provisional.spi.p2.repository.AbstractRepository;
21		21
22	public abstract class AbstractArtifactRepository extends AbstractRepository implements IArtifactRepository {	22	public abstract class AbstractArtifactRepository extends AbstractRepository implements IArtifactRepository {
23		23




import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
import org.eclipse.equinox.internal.p2.artifact.repository.Messages;
import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository;
import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepositoryIO;
import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
import org.eclipse.equinox.internal.p2.repository.Transport;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
import org.eclipse.osgi.util.NLS;

public class SimpleArtifactRepositoryFactory extends ArtifactRepositoryFactory {

	}

	private Transport getTransport() {
		return RepositoryTransport.getInstance();
	}
}

Lines 15-21 Link Here

(-)src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/ArtifactRepositoryFactory.java (-1 / +1 lines)
15	import org.eclipse.core.runtime.IProgressMonitor;	15	import org.eclipse.core.runtime.IProgressMonitor;
16	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	16	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
18	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	18	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
19		19
20	/**	20	/**
21	* An artifact repository factory is responsible for creating and loading instances	21	* An artifact repository factory is responsible for creating and loading instances

Lines 22-32 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java (-2 / +5 lines)
22	import org.eclipse.equinox.internal.p2.artifact.repository.Messages;	22	import org.eclipse.equinox.internal.p2.artifact.repository.Messages;
23	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;	23	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
24	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;	24	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
		25	import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
		26	import org.eclipse.equinox.internal.p2.repository.Transport;
25	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	27	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
26	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.*;	28	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.*;
27	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	29	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
28	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	30	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
		31	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
		32	import org.eclipse.equinox.internal.provisional.p2.repository.IStateful;
30	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository;	33	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository;
31	import org.eclipse.osgi.util.NLS;	34	import org.eclipse.osgi.util.NLS;
32		35
Lines 755-761 Link Here
755	}	758	}
756		759
757	private Transport getTransport() {	760	private Transport getTransport() {
758	return ECFTransport.getInstance();	761	return RepositoryTransport.getInstance();
759	}	762	}
760		763
761	// use this method to setup any transient fields etc after the object has been restored from a stream	764	// use this method to setup any transient fields etc after the object has been restored from a stream

Lines 24-30 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java (-1 / +1 lines)
24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
25	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	25	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
26	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	26	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
27	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	27	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
28	import org.eclipse.osgi.framework.log.FrameworkLog;	28	import org.eclipse.osgi.framework.log.FrameworkLog;
29	import org.eclipse.osgi.util.NLS;	29	import org.eclipse.osgi.util.NLS;
30		30

Lines 14-20 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepository.java (-1 / +1 lines)
14	import org.eclipse.core.runtime.IProgressMonitor;	14	import org.eclipse.core.runtime.IProgressMonitor;
15	import org.eclipse.core.runtime.IStatus;	15	import org.eclipse.core.runtime.IStatus;
16	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	16	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
17	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;	17	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
18	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	18	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
19	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository;	19	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository;
20		20

Lines 15-21 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepositoryManager.java (-1 / +1 lines)
15	import java.util.Properties;	15	import java.util.Properties;
16	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
18	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	18	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
20		20
21	/**	21	/**




/*******************************************************************************
 * Copyright (c) 2007 compeople AG 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:
 * 	compeople AG (Stefan Liebig) - initial API and implementation
 *******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.artifact.repository;

import org.eclipse.core.runtime.IStatus;

/**
 * Implementing <code>IStateful</code> adds the ability to store status information.
 */
public interface IStateful {

	/**
	 * Set the status.
	 * 
	 * @param status if status equals null => getStatus().isOK
	 */
	void setStatus(IStatus status);

	/**
	 * Get status.
	 * @return status
	 */
	public IStatus getStatus();

}

Lines 17-23 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java (-1 / +2 lines)
17	import org.eclipse.equinox.internal.p2.artifact.repository.Activator;	17	import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
18	import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.ArtifactOutputStream;	18	import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.ArtifactOutputStream;
19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;	19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
20	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IStateful;	20	import org.eclipse.equinox.internal.provisional.p2.repository.IStateful;
21		21
22	/**	22	/**
23	* Creates processing step instances from extensions and executes them.	23	* Creates processing step instances from extensions and executes them.
Lines 25-30 Link Here
25	public class ProcessingStepHandler {	25	public class ProcessingStepHandler {
26		26
27	private static final String PROCESSING_STEPS_EXTENSION_ID = "org.eclipse.equinox.p2.artifact.repository.processingSteps"; //$NON-NLS-1$	27	private static final String PROCESSING_STEPS_EXTENSION_ID = "org.eclipse.equinox.p2.artifact.repository.processingSteps"; //$NON-NLS-1$
		28
28	//TODO This method can go	29	//TODO This method can go
29	public static IStatus checkStatus(OutputStream output) {	30	public static IStatus checkStatus(OutputStream output) {
30	return getStatus(output, true);	31	return getStatus(output, true);

Lines 15-21 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java (-1 / +1 lines)
15	import java.io.OutputStream;	15	import java.io.OutputStream;
16	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
17	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;	17	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IStateful;	18	import org.eclipse.equinox.internal.provisional.p2.repository.IStateful;
19		19
20	/**	20	/**
21	* ProcessingSteps process the data written to them and pass the resultant data on	21	* ProcessingSteps process the data written to them and pass the resultant data on




 org.eclipse.equinox.internal.p2.update,
 org.eclipse.equinox.internal.provisional.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.core.repository,
 org.eclipse.equinox.internal.provisional.p2.directorywatcher,
 org.eclipse.equinox.internal.provisional.p2.engine,
 org.eclipse.equinox.internal.provisional.p2.metadata,
 org.eclipse.equinox.internal.provisional.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.p2.query,
 org.eclipse.equinox.internal.provisional.p2.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.core.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,
 org.eclipse.equinox.internal.provisional.spi.p2.repository,
 org.eclipse.equinox.p2.publisher.eclipse,
 org.eclipse.osgi.service.datalocation;version="1.1.0",
 org.eclipse.osgi.service.resolver;version="1.2.0",

Lines 172-178 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java (-1 / +1 lines)
172	}	172	}
173		173
174	/* (non-Javadoc)	174	/* (non-Javadoc)
175	* @see org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository#getProperties()	175	* @see org.eclipse.equinox.internal.provisional.spi.p2.repository.AbstractRepository#getProperties()
176	*/	176	*/
177	public Map getProperties() {	177	public Map getProperties() {
178	ensureInitialized();	178	ensureInitialized();

Lines 18-24 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java (-1 / +1 lines)
18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
20	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
21	import org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository;	21	import org.eclipse.equinox.internal.provisional.spi.p2.repository.AbstractRepository;
22	import org.eclipse.osgi.util.NLS;	22	import org.eclipse.osgi.util.NLS;
23	import org.osgi.framework.BundleContext;	23	import org.osgi.framework.BundleContext;
24		24

Lines 10-22 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepositoryFactory.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.extensionlocation;	11	package org.eclipse.equinox.internal.p2.extensionlocation;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.Map;	16	import java.util.Map;
15	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
17	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;	19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
18	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
19	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
20	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.ArtifactRepositoryFactory;	21	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.ArtifactRepositoryFactory;
21	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.SimpleArtifactRepositoryFactory;	22	import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.SimpleArtifactRepositoryFactory;
22	import org.eclipse.osgi.util.NLS;	23	import org.eclipse.osgi.util.NLS;

Lines 10-20 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepositoryFactory.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.extensionlocation;	11	package org.eclipse.equinox.internal.p2.extensionlocation;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.Map;	16	import java.util.Map;
15	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	18	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
17	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
18	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
19	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;	20	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.MetadataRepositoryFactory;
20	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory;	21	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory;

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.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.internal.provisional.p2.repository.RepositoryEvent;
		14
13	import java.util.Map;	15	import java.util.Map;
14	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
15	import org.eclipse.equinox.internal.p2.engine.Profile;	17	import org.eclipse.equinox.internal.p2.engine.Profile;
16	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
17		18
18	/**	19	/**
19	* An action that adds a repository to the list of known repositories.	20	* An action that adds a repository to the list of known repositories.

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.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.internal.provisional.p2.repository.RepositoryEvent;
		14
13	import java.util.Map;	15	import java.util.Map;
14	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
15	import org.eclipse.equinox.internal.p2.engine.Profile;	17	import org.eclipse.equinox.internal.p2.engine.Profile;
16	import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
17		18
18	/**	19	/**
19	* An action that adds a repository to the list of known repositories.	20	* An action that adds a repository to the list of known repositories.

Lines 20-28 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java (-1 / +1 lines)
20	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Activator;	20	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Activator;
21	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;	21	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
23	import org.eclipse.equinox.internal.provisional.p2.core.repository.*;
24	import org.eclipse.equinox.internal.provisional.p2.engine.*;	23	import org.eclipse.equinox.internal.provisional.p2.engine.*;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
		25	import org.eclipse.equinox.internal.provisional.p2.repository.*;
26	import org.eclipse.osgi.util.NLS;	26	import org.eclipse.osgi.util.NLS;
27	import org.osgi.service.prefs.BackingStoreException;	27	import org.osgi.service.prefs.BackingStoreException;
28	import org.osgi.service.prefs.Preferences;	28	import org.osgi.service.prefs.Preferences;

Lines 21-29 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java (-1 / +1 lines)
21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;	21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
23	import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;	23	import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
25	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	24	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
		26	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
27	import org.eclipse.osgi.service.datalocation.Location;	27	import org.eclipse.osgi.service.datalocation.Location;
28	import org.eclipse.osgi.service.environment.EnvironmentInfo;	28	import org.eclipse.osgi.service.environment.EnvironmentInfo;
29	import org.eclipse.osgi.util.ManifestElement;	29	import org.eclipse.osgi.util.ManifestElement;

Lines 15-21 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
15	org.eclipse.equinox.internal.provisional.p2.core,	15	org.eclipse.equinox.internal.provisional.p2.core,
16	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	16	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
17	org.eclipse.equinox.internal.provisional.p2.core.location,	17	org.eclipse.equinox.internal.provisional.p2.core.location,
18	org.eclipse.equinox.internal.provisional.p2.core.repository,	18	org.eclipse.equinox.internal.provisional.p2.repository,
19	org.eclipse.equinox.internal.provisional.p2.engine,	19	org.eclipse.equinox.internal.provisional.p2.engine,
20	org.eclipse.equinox.internal.provisional.p2.metadata,	20	org.eclipse.equinox.internal.provisional.p2.metadata,
21	org.eclipse.equinox.internal.provisional.p2.metadata.query,	21	org.eclipse.equinox.internal.provisional.p2.metadata.query,

Return to bug 216278

Removed Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/core/repository/RepositoryEvent.java (-149 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 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.internal.provisional.p2.core.repository;
12
13	import java.net.URI;
14	import java.util.EventObject;
15
16	/**
17	* An event indicating a repository was added, removed, changed,
18	* or discovered.
19	*
20	* @noextend This class is not intended to be subclassed by clients.
21	*/
22	public class RepositoryEvent extends EventObject {
23	private static final long serialVersionUID = 3082402920617281765L;
24
25	/**
26	* A change kind constant (value 0), indicating a repository was added to the
27	* list of repositories known to a repository manager.
28	*/
29	public static final int ADDED = 0;
30
31	/**
32	* A change kind constant (value 1), indicating a repository was removed from
33	* the list of repositories known to a repository manager.
34	*/
35	public static final int REMOVED = 1;
36
37	/**
38	* A change kind constant (value 2), indicating a repository known to a
39	* repository manager was modified.
40	*/
41	public static final int CHANGED = 2;
42
43	/**
44	* A change kind constant (value 4), indicating a new repository was discovered.
45	* This event is a way to notify repository managers in a generic way about
46	* a newly discovered repository. The repository manager will typically receive
47	* this event, add the repository to its list of known repositories, and issue
48	* a subsequent {@link #ADDED} event. Other clients should not typically
49	* listen for this kind of event.
50	*/
51	public static final int DISCOVERED = 4;
52
53	/**
54	* A change kind constant (value 8), indicating the repository's enablement
55	* was changed. The {{@link #isRepositoryEnabled()} method can be used
56	* to find out the new enablement state of the repository, and to deduce
57	* the previous enablement state.
58	*/
59	public static final int ENABLEMENT = 8;
60
61	private final int kind, type;
62	private boolean isEnabled;
63	private String nickname;
64
65	/**
66	* Creates and returns a new repository discovery event.
67	* @param location the location of the repository that changed.
68	* @param nickname the repository nickname
69	* @param repositoryType the type of repository that was changed
70	* @param enabled whether the repository is enabled
71	* @return A new repository discovery event
72	* @see IRepository#PROP_NICKNAME
73	*/
74	public static RepositoryEvent newDiscoveryEvent(URI location, String nickname, int repositoryType, boolean enabled) {
75	RepositoryEvent event = new RepositoryEvent(location, repositoryType, DISCOVERED, enabled);
76	event.nickname = nickname;
77	return event;
78	}
79
80	/**
81	* Creates a new repository event.
82	*
83	* @param location the location of the repository that changed.
84	* @param repositoryType the type of repository that was changed
85	* @param kind the kind of change that occurred.
86	* @param enabled whether the repository is enabled
87	*/
88	public RepositoryEvent(URI location, int repositoryType, int kind, boolean enabled) {
89	super(location);
90	this.kind = kind;
91	this.type = repositoryType;
92	isEnabled = enabled;
93	}
94
95	/**
96	* Returns the kind of change that occurred.
97	*
98	* @return the kind of change that occurred.
99	* @see #ADDED
100	* @see #REMOVED
101	* @see #CHANGED
102	* @see #DISCOVERED
103	* @see #ENABLEMENT
104	*/
105	public int getKind() {
106	return kind;
107	}
108
109	/**
110	* Returns the nickname of the repository. This method is only applicable
111	* for the {@link #DISCOVERED} event type. For other event types this
112	* method returns <code>null</code>.
113	*/
114	public String getRepositoryNickname() {
115	return nickname;
116	}
117
118	/**
119	* Returns the location of the repository associated with this event.
120	*
121	* @return the location of the repository associated with this event.
122	*/
123	public URI getRepositoryLocation() {
124	return (URI) getSource();
125	}
126
127	/**
128	* Returns the type of repository associated with this event. Clients
129	* should not assume that the set of possible repository types is closed;
130	* clients should ignore events from repository types they don't know about.
131	*
132	* @return the type of repository associated with this event.
133	* ({@link IRepository#TYPE_METADATA} or {@link IRepository#TYPE_ARTIFACT}).
134	*/
135	public int getRepositoryType() {
136	return type;
137	}
138
139	/**
140	* Returns whether the affected repository is enabled.
141	*
142	* @return <code>true</code> if the repository is enabled,
143	* and <code>false</code> otherwise.
144	*/
145	public boolean isRepositoryEnabled() {
146	return isEnabled;
147	}
148
149	}

Removed Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/core/repository/IRepository.java (-188 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 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.internal.provisional.p2.core.repository;
12
13	import java.net.URI;
14	import java.util.Map;
15	import org.eclipse.core.runtime.IAdaptable;
16
17	/**
18	* Base interface that defines common properties that may be provided by
19	* various kinds of repositories.
20	*
21	* @noimplement This interface is not intended to be implemented by clients.
22	*/
23	public interface IRepository extends IAdaptable {
24	/**
25	* The key for a boolean property indicating that the repository
26	* is a system repository. System repositories are implementation details
27	* that are not subject to general access, hidden from the typical user, etc.
28	*/
29	public static final String PROP_SYSTEM = "p2.system"; //$NON-NLS-1$
30
31	/**
32	* The key for a boolean property indicating that repository metadata is
33	* stored in compressed form. A compressed repository will have lower
34	* bandwidth cost to read when remote, but higher processing cost to
35	* uncompress when reading.
36	*/
37	public static final String PROP_COMPRESSED = "p2.compressed"; //$NON-NLS-1$
38
39	/**
40	* The key for a string property providing a human-readable name for the repository.
41	*/
42	public static final String PROP_NAME = "name"; //$NON-NLS-1$
43
44	/**
45	* The key for a string property providing a user-defined name for the repository.
46	* This property is never stored in the repository itself, but is instead tracked and managed
47	* by an {@link IRepositoryManager}.
48	*/
49	public static final String PROP_NICKNAME = "p2.nickname"; //$NON-NLS-1$
50
51	/**
52	* The key for a string property providing a human-readable description for the repository.
53	*/
54	public static final String PROP_DESCRIPTION = "description"; //$NON-NLS-1$
55
56	/**
57	* The key for a string property providing the common base URL that should
58	* be replaced with the mirror URL.
59	*/
60	public static final String PROP_MIRRORS_BASE_URL = "p2.mirrorsBaseURL"; //$NON-NLS-1$
61
62	/**
63	* The key for a string property providing a URL that can return mirrors of this
64	* repository.
65	*/
66	public static final String PROP_MIRRORS_URL = "p2.mirrorsURL"; //$NON-NLS-1$
67
68	/**
69	* The key for a string property containing the time when the repository was last modified.
70	*/
71	public static final String PROP_TIMESTAMP = "p2.timestamp"; //$NON-NLS-1$
72
73	/**
74	* The key for a string property providing the user name to an authenticated
75	* URL. This key is used in the secure preference store for repository data.
76	* @see #PREFERENCE_NODE
77	*/
78	public static final String PROP_USERNAME = "username"; //$NON-NLS-1$
79
80	/**
81	* The key for a string property providing the password to an authenticated
82	* URL. This key is used in the secure preference store for repository data.
83	* @see #PREFERENCE_NODE
84	*/
85	public static final String PROP_PASSWORD = "password"; //$NON-NLS-1$
86
87	/**
88	* The node identifier for repository secure preference store.
89	*/
90	public static final String PREFERENCE_NODE = "org.eclipse.equinox.p2.repository"; //$NON-NLS-1$
91
92	/**
93	* A repository type constant (value 0) representing a metadata repository.
94	*/
95	public static final int TYPE_METADATA = 0;
96
97	/**
98	* A repository type constant (value 1) representing an artifact repository.
99	*/
100	public static final int TYPE_ARTIFACT = 1;
101
102	/**
103	* General purpose zero-valued bit mask constant. Useful whenever you need to
104	* supply a bit mask with no bits set.
105	*/
106	public static final int NONE = 0;
107
108	/**
109	* An option flag constant (value 1) indicating an enabled repository.
110	*/
111	public static final int ENABLED = 1;
112
113	/**
114	* Returns the URL of the repository.
115	* TODO: Should we use URL or URI? URL requires a protocol handler
116	* to be installed in Java. Can the URL have any protocol?
117	* @return the URL of the repository.
118	*/
119	public URI getLocation();
120
121	/**
122	* Returns the name of the repository.
123	* @return the name of the repository.
124	*/
125	public String getName();
126
127	/**
128	* Returns a string representing the type of the repository.
129	* @return the type of the repository.
130	*/
131	public String getType();
132
133	/**
134	* Returns a string representing the version for the repository type.
135	* @return the version of the type of the repository.
136	*/
137	public String getVersion();
138
139	/**
140	* Returns a brief description of the repository.
141	* @return the description of the repository.
142	*/
143	public String getDescription();
144
145	/**
146	* Returns the name of the provider of the repository.
147	* @return the provider of this repository.
148	*/
149	public String getProvider();
150
151	/**
152	* Returns a read-only collection of the properties of the repository.
153	* @return the properties of this repository.
154	*/
155	public Map getProperties();
156
157	/**
158	* Returns <code>true</code> if this repository can be modified.
159	* @return whether or not this repository can be modified
160	*/
161	public boolean isModifiable();
162
163	/**
164	* Set the name of the repository.
165	*/
166	public void setName(String name);
167
168	/**
169	* Sets the description of the repository.
170	*/
171	public void setDescription(String description);
172
173	/**
174	* Sets the value of the property with the given key. Returns the old property
175	* associated with that key, if any. Setting a value of <code>null</code> will
176	* remove the corresponding key from the properties of this repository.
177	*
178	* @param key The property key
179	* @param value The new property value, or <code>null</code> to remove the key
180	* @return The old property value, or <code>null</code> if there was no old value
181	*/
182	public String setProperty(String key, String value);
183
184	/**
185	* Sets the name of the provider of the repository.
186	*/
187	public void setProvider(String provider);
188	}

Removed Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/core/repository/IRepositoryManager.java (-207 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008, 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.internal.provisional.p2.core.repository;
12
13	import java.net.URI;
14
15	/**
16	* The common base class for metadata and artifact repository managers.
17	* <p>
18	* A repository manager keeps track of a set of known repositories, and provides
19	* caching of these known repositories to avoid unnecessary loading of repositories
20	* from the disk or network. The manager fires {@link RepositoryEvent}s when the
21	* set of known repositories changes.
22	*
23	* @noimplement This interface is not intended to be implemented by clients.
24	*/
25	public interface IRepositoryManager {
26	/**
27	* Constant used to indicate that all enabled repositories are of interest.
28	*/
29	public static final int REPOSITORIES_ALL = 0;
30
31	/**
32	* Constant used to indicate that disabled repositories are of interest.
33	* @see #getKnownRepositories(int)
34	*/
35	public static final int REPOSITORIES_DISABLED = 1 << 3;
36
37	/**
38	* Constant used to indicate that local repositories are of interest.
39	* @see #getKnownRepositories(int)
40	*/
41	public static final int REPOSITORIES_LOCAL = 1 << 2;
42
43	/**
44	* Constant used to indicate that non-system repositories are of interest.
45	* @see IRepository#PROP_SYSTEM
46	* @see #getKnownRepositories(int)
47	*/
48	public static final int REPOSITORIES_NON_SYSTEM = 1 << 1;
49
50	/**
51	* Constant used to indicate that system repositories are of interest.
52	* @see IRepository#PROP_SYSTEM
53	* @see #getKnownRepositories(int)
54	*/
55	public static final int REPOSITORIES_SYSTEM = 1 << 0;
56
57	/**
58	* Constant used to indicate that a repository manager should only load the
59	* repository if the repository is modifiable.
60	* @see IRepository#isModifiable()
61	*/
62	public static final int REPOSITORY_HINT_MODIFIABLE = 1 << 0;
63
64	/**
65	* Adds the repository at the given location to the list of repositories tracked by
66	* this repository manager.
67	* <p>
68	* If there is a known disabled repository at the given location, it will become
69	* enabled as a result of this method. Thus the caller can be guaranteed that
70	* there is a known, enabled repository at the given location when this method returns.
71	*
72	* @param location The location of the repository to add
73	* @see #isEnabled(URI)
74	*/
75	public void addRepository(URI location);
76
77	/**
78	* Returns whether a repository at the given location is in the list of repositories
79	* tracked by this repository manager.
80	*
81	* @param location The location of the repository to look for
82	* @return <code>true</code> if the repository is known to this manager,
83	* and <code>false</code> otherwise
84	*/
85	public boolean contains(URI location);
86
87	/**
88	* Returns the artifact repository locations known to the repository manager.
89	* <p>
90	* Note that the repository manager does not guarantee that a valid repository
91	* exists at any of the returned locations at any particular moment in time.
92	* A subsequent attempt to load a repository at any of the given locations may
93	* or may not succeed.
94	*
95	* @param flags an integer bit-mask indicating which repositories should be
96	* returned. <code>REPOSITORIES_ALL</code> can be used as the mask when
97	* all enabled repositories should be returned.
98	* @return the locations of the repositories managed by this repository manager.
99	*
100	* @see #REPOSITORIES_ALL
101	* @see #REPOSITORIES_SYSTEM
102	* @see #REPOSITORIES_NON_SYSTEM
103	* @see #REPOSITORIES_LOCAL
104	* @see #REPOSITORIES_DISABLED
105	*/
106	public URI[] getKnownRepositories(int flags);
107
108	/**
109	* Returns the property associated with the repository at the given URI,
110	* without loading the repository.
111	* <p>
112	* Note that some properties for a repository can only be
113	* determined when that repository is loaded. This method will return <code>null</code>
114	* for such properties. Only values for the properties that are already
115	* known by a repository manager will be returned.
116	* <p>
117	* If a client wishes to retrieve a property value from a repository
118	* regardless of the cost of retrieving it, the client should load the
119	* repository and then retrieve the property from the repository itself.
120	*
121	* @param location the URI of the repository in question
122	* @param key the String key of the property desired
123	* @return the value of the property, or <code>null</code> if the repository
124	* does not exist, the value does not exist, or the property value
125	* could not be determined without loading the repository.
126	*
127	* @see IRepository#getProperties()
128	* @see #setRepositoryProperty(URI, String, String)
129	*/
130	public String getRepositoryProperty(URI location, String key);
131
132	/**
133	* Sets the property associated with the repository at the given URI,
134	* without loading the repository.
135	* <p>
136	* This method stores properties in a cache in the repository manager and does
137	* not write the property to the backing repository. This is useful for making
138	* repository properties available without incurring the cost of loading the repository.
139	* When the repository is loaded, it will overwrite any conflicting properties that
140	* have been set using this method.
141	* </p>
142	* <p>
143	* To persistently set a property on a repository, clients must load
144	* the repository and call {@link IRepository#setProperty(String, String)}.
145	* </p>
146	*
147	* @param location the URI of the repository in question
148	* @param key the String key of the property desired
149	* @param value the value to set the property to
150	* @see #getRepositoryProperty(URI, String)
151	* @see IRepository#setProperty(String, String)
152	*/
153	public void setRepositoryProperty(URI location, String key, String value);
154
155	/**
156	* Returns the enablement value of a repository. Disabled repositories are known
157	* to the repository manager, but are never used in the context of provisioning
158	* operations. Disabled repositories are useful as a form of bookmark to indicate that a
159	* repository location is of interest, but not currently used.
160	* <p>
161	* Note that enablement is a property of the repository manager and not a property
162	* of the affected repository. The enablement of the repository is discarded when
163	* a repository is removed from the repository manager.
164	*
165	* @param location The location of the repository whose enablement is requested
166	* @return <code>true</code> if the repository is enabled, and
167	* <code>false</code> if it is not enabled, or if the repository location
168	* is not known to the repository manager.
169	* @see #REPOSITORIES_DISABLED
170	* @see #setEnabled(URI, boolean)
171	*/
172	public boolean isEnabled(URI location);
173
174	/**
175	* Removes the repository at the given location from the list of
176	* repositories known to this repository manager. The underlying
177	* repository is not deleted. This method has no effect if the given
178	* repository is not already known to this repository manager.
179	*
180	* @param location The location of the repository to remove
181	* @return <code>true</code> if a repository was removed, and
182	* <code>false</code> otherwise.
183	*/
184	public boolean removeRepository(URI location);
185
186	/**
187	* Sets the enablement of a repository. Disabled repositories are known
188	* to the repository manager, but are never used in the context of provisioning
189	* operation. Disabled repositories are useful as a form of bookmark to indicate that a
190	* repository location is of interest, but not currently used.
191	* <p>
192	* Note that enablement is a property of the repository manager and not a property
193	* of the affected repository. The enablement of the repository is discarded when
194	* a repository is removed from the repository manager.
195	* <p>
196	* This method has no effect if the given repository location is not known to the
197	* repository manager.
198	*
199	* @param location The location of the repository to enable or disable
200	* @param enablement <code>true</code>to enable the repository, and
201	* <code>false</code> to disable the repository
202	* @see #REPOSITORIES_DISABLED
203	* @see #isEnabled(URI)
204	*/
205	public void setEnabled(URI location, boolean enablement);
206
207	}

Lines 9-21 Link Here

(-)src/org/eclipse/equinox/internal/p2/core/helpers/messages.properties (-8 lines)
9	# IBM Corporation - initial API and implementation	9	# IBM Corporation - initial API and implementation
10	###############################################################################	10	###############################################################################
11		11
12	repoMan_adding = Adding repository {0}
13	repoMan_exists=Repository already exists at {0}.
14	repoMan_failedRead=The repository could not be read: {0}.
15	repoMan_internalError=Internal error.
16	repoMan_notExists=No repository found at {0}.
17	repoMan_save=Saving repository settings
18	repoMan_unknownType=Unknown repository type at {0}.
19
20	Util_Invalid_Zip_File_Format=Invalid zip file format	12	Util_Invalid_Zip_File_Format=Invalid zip file format
21	Util_Error_Unzipping=Error unzipping {0}: {1}	13	Util_Error_Unzipping=Error unzipping {0}: {1}

Removed Link Here

(-)src/org/eclipse/equinox/internal/p2/persistence/XMLConstants.java (-63 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 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	* Genuitec, LLC - added license support
11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.persistence;
13
14	public interface XMLConstants {
15
16	// Constants used in defining a default processing instruction
17	// including a class name and a version of the associated XML
18	// for some category of objects.
19	// e.g. <?category class='a.b.c.SomeClass' version='1.2.3'?>
20	//
21	public static final String PI_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
22	public static final String PI_VERSION_ATTRIBUTE = "version"; //$NON-NLS-1$
23
24	// Element and attribute names for a standard property collection.
25	// e.g. <properties size='1'>
26	// <property name='some_name' value='some_value'/>
27	// </properties>
28	public static final String PROPERTIES_ELEMENT = "properties"; //$NON-NLS-1$
29	public static final String PROPERTY_ELEMENT = "property"; //$NON-NLS-1$
30	public static final String PROPERTY_NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
31	public static final String PROPERTY_VALUE_ATTRIBUTE = "value"; //$NON-NLS-1$
32
33	// Constants for the names of common general attributes
34	public static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$
35	public static final String PARENT_ID_ATTRIBUTE = "parentId"; //$NON-NLS-1$
36	public static final String TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
37	public static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
38	public static final String VERSION_ATTRIBUTE = "version"; //$NON-NLS-1$
39	public static final String VERSION_RANGE_ATTRIBUTE = "range"; //$NON-NLS-1$
40	public static final String NAMESPACE_ATTRIBUTE = "namespace"; //$NON-NLS-1$
41	public static final String CLASSIFIER_ATTRIBUTE = "classifier"; //$NON-NLS-1$
42	public static final String DESCRIPTION_ATTRIBUTE = "description"; //$NON-NLS-1$
43	public static final String PROVIDER_ATTRIBUTE = "provider"; //$NON-NLS-1$
44	public static final String URL_ATTRIBUTE = "url"; //$NON-NLS-1$
45	public static final String URI_ATTRIBUTE = "uri"; //$NON-NLS-1$
46
47	// Constants for the license and copyright elements
48	public static final String LICENSES_ELEMENT = "licenses"; //$NON-NLS-1$
49	public static final String LICENSE_ELEMENT = "license"; //$NON-NLS-1$
50	public static final String COPYRIGHT_ELEMENT = "copyright"; //$NON-NLS-1$
51
52	// A constant for the name of an attribute of a collection or array element
53	// specifying the size or length
54	public static final String COLLECTION_SIZE_ATTRIBUTE = "size"; //$NON-NLS-1$
55
56	// A constant for an empty array of attribute names
57	public static String[] noAttributes = new String[0];
58
59	//Constants for attributes of a composite repository
60	public static final String CHILDREN_ELEMENT = "children"; //$NON-NLS-1$
61	public static final String CHILD_ELEMENT = "child"; //$NON-NLS-1$
62	public static final String LOCATION_ELEMENT = "location"; //$NON-NLS-1$
63	}

Removed Link Here

(-)src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java (-307 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 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.internal.p2.persistence;
12
13	import java.io.*;
14	import java.util.*;
15	import org.eclipse.equinox.internal.provisional.p2.core.Version;
16
17	public class XMLWriter implements XMLConstants {
18
19	public static class ProcessingInstruction {
20
21	private String target;
22	private String[] data;
23
24	// The standard UTF-8 processing instruction
25	public static final String XML_UTF8 = "<?xml version='1.0' encoding='UTF-8'?>"; //$NON-NLS-1$
26
27	public ProcessingInstruction(String target, String[] attrs, String[] values) {
28	// Lengths of attributes and values must be the same
29	this.target = target;
30	this.data = new String[attrs.length];
31	for (int i = 0; i < attrs.length; i++) {
32	data[i] = attributeImage(attrs[i], values[i]);
33	}
34	}
35
36	public static ProcessingInstruction makeClassVersionInstruction(String target, Class clazz, Version version) {
37	return new ProcessingInstruction(target, new String[] {PI_CLASS_ATTRIBUTE, PI_VERSION_ATTRIBUTE}, new String[] {clazz.getName(), version.toString()});
38	}
39
40	public String toString() {
41	StringBuffer sb = new StringBuffer("<?"); //$NON-NLS-1$
42	sb.append(this.target).append(' ');
43	for (int i = 0; i < data.length; i++) {
44	sb.append(this.data[i]);
45	if (i < data.length - 1) {
46	sb.append(' ');
47	}
48	}
49	sb.append("?>"); //$NON-NLS-1$
50	return sb.toString();
51	}
52	}
53
54	private Stack elements; // XML elements that have not yet been closed
55	private boolean open; // Can attributes be added to the current element?
56	private String indent; // used for each level of indentation
57
58	private PrintWriter pw;
59
60	public XMLWriter(OutputStream output, ProcessingInstruction[] piElements) throws UnsupportedEncodingException {
61	this.pw = new PrintWriter(new OutputStreamWriter(output, "UTF8"), false); //$NON-NLS-1$
62	println(ProcessingInstruction.XML_UTF8);
63	this.elements = new Stack();
64	this.open = false;
65	this.indent = " "; //$NON-NLS-1$
66	if (piElements != null) {
67	for (int i = 0; i < piElements.length; i++) {
68	println(piElements[i].toString());
69	}
70	}
71	}
72
73	// start a new element
74	public void start(String name) {
75	if (this.open) {
76	println('>');
77	}
78	indent();
79	print('<');
80	print(name);
81	this.elements.push(name);
82	this.open = true;
83	}
84
85	// end the most recent element with this name
86	public void end(String name) {
87	if (this.elements.empty()) {
88	throw new EndWithoutStartError();
89	}
90	int index = this.elements.search(name);
91	if (index == -1) {
92	throw new EndWithoutStartError(name);
93	}
94	for (int i = 0; i < index; i += 1) {
95	end();
96	}
97	}
98
99	// end the current element
100	public void end() {
101	if (this.elements.empty()) {
102	throw new EndWithoutStartError();
103	}
104	String name = (String) this.elements.pop();
105	if (this.open) {
106	println("/>"); //$NON-NLS-1$
107	} else {
108	printlnIndented("</" + name + '>', false); //$NON-NLS-1$
109	}
110	this.open = false;
111	}
112
113	public static String escape(String txt) {
114	StringBuffer buffer = null;
115	for (int i = 0; i < txt.length(); ++i) {
116	String replace;
117	char c = txt.charAt(i);
118	switch (c) {
119	case '<' :
120	replace = "<"; //$NON-NLS-1$
121	break;
122	case '>' :
123	replace = ">"; //$NON-NLS-1$
124	break;
125	case '"' :
126	replace = """; //$NON-NLS-1$
127	break;
128	case '\'' :
129	replace = "'"; //$NON-NLS-1$
130	break;
131	case '&' :
132	replace = "&"; //$NON-NLS-1$
133	break;
134	case '\t' :
135	replace = " "; //$NON-NLS-1$
136	break;
137	case '\n' :
138	replace = " "; //$NON-NLS-1$
139	break;
140	case '\r' :
141	replace = " "; //$NON-NLS-1$
142	break;
143	default :
144	// this is the set of legal xml scharacters in unicode excluding high surrogates since they cannot be represented with a char
145	// see http://www.w3.org/TR/REC-xml/#charsets
146	if ((c >= '\u0020' && c <= '\uD7FF') \|\| (c >= '\uE000' && c <= '\uFFFD')) {
147	if (buffer != null)
148	buffer.append(c);
149	continue;
150	}
151	replace = Character.isWhitespace(c) ? " " : null; //$NON-NLS-1$
152	}
153	if (buffer == null) {
154	buffer = new StringBuffer(txt.length() + 16);
155	buffer.append(txt.substring(0, i));
156	}
157	if (replace != null)
158	buffer.append(replace);
159	}
160
161	if (buffer == null)
162	return txt;
163
164	return buffer.toString();
165	}
166
167	// write a boolean attribute if it doesn't have the default value
168	public void attribute(String name, boolean value, boolean defaultValue) {
169	if (value != defaultValue) {
170	attribute(name, value);
171	}
172	}
173
174	public void attribute(String name, boolean value) {
175	attribute(name, Boolean.toString(value));
176	}
177
178	public void attribute(String name, int value) {
179	attribute(name, Integer.toString(value));
180	}
181
182	public void attributeOptional(String name, String value) {
183	if (value != null && value.length() > 0) {
184	attribute(name, value);
185	}
186	}
187
188	public void attribute(String name, Object value) {
189	if (!this.open) {
190	throw new AttributeAfterNestedContentError();
191	}
192	if (value == null) {
193	return; // optional attribute with no value
194	}
195	print(' ');
196	print(name);
197	print("='"); //$NON-NLS-1$
198	print(escape(value.toString()));
199	print('\'');
200	}
201
202	public void cdata(String data) {
203	cdata(data, true);
204	}
205
206	public void cdata(String data, boolean escape) {
207	if (this.open) {
208	println('>');
209	this.open = false;
210	}
211	if (data != null) {
212	printlnIndented(data, escape);
213	}
214	}
215
216	public void flush() {
217	this.pw.flush();
218	}
219
220	public void writeProperties(Map properties) {
221	writeProperties(PROPERTIES_ELEMENT, properties);
222	}
223
224	public void writeProperties(String propertiesElement, Map properties) {
225	if (properties != null && properties.size() > 0) {
226	start(propertiesElement);
227	attribute(COLLECTION_SIZE_ATTRIBUTE, properties.size());
228	for (Iterator iter = properties.keySet().iterator(); iter.hasNext();) {
229	String name = (String) iter.next();
230	writeProperty(name, (String) properties.get(name));
231	}
232	end(propertiesElement);
233	}
234	}
235
236	public void writeProperty(String name, String value) {
237	start(PROPERTY_ELEMENT);
238	attribute(PROPERTY_NAME_ATTRIBUTE, name);
239	attribute(PROPERTY_VALUE_ATTRIBUTE, value);
240	end();
241	}
242
243	protected static String attributeImage(String name, String value) {
244	if (value == null) {
245	return ""; // optional attribute with no value
246	}
247	return name + "='" + escape(value) + '\''; //$NON-NLS-1$
248	}
249
250	private void println(char c) {
251	this.pw.println(c);
252	}
253
254	private void println(String s) {
255	this.pw.println(s);
256	}
257
258	private void println() {
259	this.pw.println();
260	}
261
262	private void print(char c) {
263	this.pw.print(c);
264	}
265
266	private void print(String s) {
267	this.pw.print(s);
268	}
269
270	private void printlnIndented(String s, boolean escape) {
271	if (s.length() == 0) {
272	println();
273	} else {
274	indent();
275	println(escape ? escape(s) : s);
276	}
277	}
278
279	private void indent() {
280	for (int i = this.elements.size(); i > 0; i -= 1) {
281	print(this.indent);
282	}
283	}
284
285	public static class AttributeAfterNestedContentError extends Error {
286	private static final long serialVersionUID = 1L; // not serialized
287	}
288
289	public static class EndWithoutStartError extends Error {
290	private static final long serialVersionUID = 1L; // not serialized
291	private String name;
292
293	public EndWithoutStartError() {
294	super();
295	}
296
297	public EndWithoutStartError(String name) {
298	super();
299	this.name = name;
300	}
301
302	public String getName() {
303	return this.name;
304	}
305	}
306
307	}

Removed Link Here

(-)src/org/eclipse/equinox/internal/p2/persistence/CompositeRepositoryState.java (-93 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.persistence;
12
13	import java.net.URI;
14	import java.util.Map;
15
16	/*
17	* Instances of this class represent a composite repository (either metadata
18	* or artifact) and are used in persisting or retrieving the repository to/from disk.
19	*/
20	public class CompositeRepositoryState {
21	private String name;
22	private String type;
23	private String version;
24	private String provider;
25	private String description;
26	private URI location;
27	private Map properties;
28	private URI[] children;
29
30	public void setName(String value) {
31	name = value;
32	}
33
34	public String getName() {
35	return name;
36	}
37
38	public void setType(String value) {
39	type = value;
40	}
41
42	public String getType() {
43	return type;
44	}
45
46	public void setVersion(String value) {
47	version = value;
48	}
49
50	public String getVersion() {
51	return version;
52	}
53
54	public void setProvider(String value) {
55	provider = value;
56	}
57
58	public String getProvider() {
59	return provider;
60	}
61
62	public void setDescription(String value) {
63	description = value;
64	}
65
66	public String getDescription() {
67	return description;
68	}
69
70	public void setLocation(URI value) {
71	location = value;
72	}
73
74	public URI getLocation() {
75	return location;
76	}
77
78	public void setProperties(Map value) {
79	properties = value;
80	}
81
82	public Map getProperties() {
83	return properties;
84	}
85
86	public void setChildren(URI[] value) {
87	children = value;
88	}
89
90	public URI[] getChildren() {
91	return children;
92	}
93	}

Lines 18-24 Link Here

(-)META-INF/MANIFEST.MF (-41 / +8 lines)
18	org.osgi.util.tracker;version="1.3.3",	18	org.osgi.util.tracker;version="1.3.3",
19	org.xml.sax,	19	org.xml.sax,
20	org.xml.sax.helpers	20	org.xml.sax.helpers
21	Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.publisher",	21	Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository",
22	org.eclipse.equinox.internal.p2.core.helpers;	22	org.eclipse.equinox.internal.p2.core.helpers;
23	x-friends:="org.eclipse.equinox.p2.director,	23	x-friends:="org.eclipse.equinox.p2.director,
24	org.eclipse.equinox.p2.artifact.processors,	24	org.eclipse.equinox.p2.artifact.processors,
Lines 47-54 Link Here
47	org.eclipse.equinox.p2.reconciler.dropins,	47	org.eclipse.equinox.p2.reconciler.dropins,
48	org.eclipse.equinox.p2.extensionlocation,	48	org.eclipse.equinox.p2.extensionlocation,
49	org.eclipse.equinox.p2.publisher,	49	org.eclipse.equinox.p2.publisher,
50	org.eclipse.equinox.p2.repository.tools",	50	org.eclipse.equinox.p2.repository.tools,
51	org.eclipse.equinox.internal.p2.persistence;x-friends:="org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.metadata.repository",	51	org.eclipse.equinox.p2.repository",
52	org.eclipse.equinox.internal.provisional.p2.core;	52	org.eclipse.equinox.internal.provisional.p2.core;
53	x-friends:="org.eclipse.equinox.p2.artifact.optimizers,	53	x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
54	org.eclipse.equinox.p2.artifact.processors,	54	org.eclipse.equinox.p2.artifact.processors,
Lines 74-80 Link Here
74	org.eclipse.equinox.p2.updatesite,	74	org.eclipse.equinox.p2.updatesite,
75	org.eclipse.pde.ui,	75	org.eclipse.pde.ui,
76	org.eclipse.equinox.p2.metadata,	76	org.eclipse.equinox.p2.metadata,
77	org.eclipse.equinox.p2.repository.tools",	77	org.eclipse.equinox.p2.repository.tools,
		78	org.eclipse.equinox.p2.repository",
78	org.eclipse.equinox.internal.provisional.p2.core.eventbus;	79	org.eclipse.equinox.internal.provisional.p2.core.eventbus;
79	x-friends:="org.eclipse.equinox.p2.metadata,	80	x-friends:="org.eclipse.equinox.p2.metadata,
80	org.eclipse.equinox.p2.metadata.generator,	81	org.eclipse.equinox.p2.metadata.generator,
Lines 90-96 Link Here
90	org.eclipse.equinox.p2.artifact.repository,	91	org.eclipse.equinox.p2.artifact.repository,
91	org.eclipse.equinox.p2.touchpoint.eclipse,	92	org.eclipse.equinox.p2.touchpoint.eclipse,
92	org.eclipse.equinox.p2.touchpoint.natives,	93	org.eclipse.equinox.p2.touchpoint.natives,
93	org.eclipse.equinox.p2.publisher",	94	org.eclipse.equinox.p2.publisher,
		95	org.eclipse.equinox.p2.repository",
94	org.eclipse.equinox.internal.provisional.p2.core.location;	96	org.eclipse.equinox.internal.provisional.p2.core.location;
95	x-friends:="org.eclipse.equinox.p2.artifact.repository,	97	x-friends:="org.eclipse.equinox.p2.artifact.repository,
96	org.eclipse.equinox.p2.touchpoint.natives,	98	org.eclipse.equinox.p2.touchpoint.natives,
Lines 98-132 Link Here
98	org.eclipse.equinox.p2.director,	100	org.eclipse.equinox.p2.director,
99	org.eclipse.equinox.p2.engine,	101	org.eclipse.equinox.p2.engine,
100	org.eclipse.equinox.p2.touchpoint.eclipse",	102	org.eclipse.equinox.p2.touchpoint.eclipse",
101	org.eclipse.equinox.internal.provisional.p2.core.repository;
102	x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
103	org.eclipse.equinox.p2.artifact.processors,
104	org.eclipse.equinox.p2.artifact.repository,
105	org.eclipse.equinox.p2.core,
106	org.eclipse.equinox.p2.director,
107	org.eclipse.equinox.p2.engine,
108	org.eclipse.equinox.p2.exemplarysetup,
109	org.eclipse.equinox.p2.extensionlocation,
110	org.eclipse.equinox.p2.garbagecollector,
111	org.eclipse.equinox.p2.installer,
112	org.eclipse.equinox.p2.jarprocessor,
113	org.eclipse.equinox.p2.metadata,
114	org.eclipse.equinox.p2.metadata.generator,
115	org.eclipse.equinox.p2.metadata.repository,
116	org.eclipse.equinox.p2.reconciler.dropins,
117	org.eclipse.equinox.p2.touchpoint.eclipse,
118	org.eclipse.equinox.p2.touchpoint.natives,
119	org.eclipse.equinox.p2.ui,
120	org.eclipse.equinox.p2.ui.admin,
121	org.eclipse.equinox.p2.ui.admin.rcp,
122	org.eclipse.equinox.p2.ui.sdk,
123	org.eclipse.equinox.p2.updatechecker,
124	org.eclipse.equinox.p2.updatesite,
125	org.eclipse.equinox.p2.console,
126	org.eclipse.equinox.p2.directorywatcher,
127	org.eclipse.equinox.p2.publisher,
128	org.eclipse.equinox.p2.director.app,
129	org.eclipse.equinox.p2.repository.tools",
130	org.eclipse.equinox.internal.provisional.p2.query;	103	org.eclipse.equinox.internal.provisional.p2.query;
131	x-friends:="org.eclipse.equinox.p2.artifact.optimizers,	104	x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
132	org.eclipse.equinox.p2.artifact.processors,	105	org.eclipse.equinox.p2.artifact.processors,
Lines 156-168 Link Here
156	org.eclipse.equinox.p2.console,	129	org.eclipse.equinox.p2.console,
157	org.eclipse.equinox.p2.publisher,	130	org.eclipse.equinox.p2.publisher,
158	org.eclipse.pde.ui,	131	org.eclipse.pde.ui,
159	org.eclipse.equinox.p2.repository.tools",	132	org.eclipse.equinox.p2.repository.tools"
160	org.eclipse.equinox.internal.provisional.spi.p2.core.repository;
161	x-friends:="org.eclipse.equinox.p2.artifact.repository,
162	org.eclipse.equinox.p2.metadata.repository,
163	org.eclipse.equinox.p2.extensionlocation,
164	org.eclipse.equinox.p2.updatesite,
165	org.eclipse.equinox.p2.engine"
166	Eclipse-LazyStart: true	133	Eclipse-LazyStart: true
167	Bundle-ClassPath: .	134	Bundle-ClassPath: .
168	Bundle-RequiredExecutionEnvironment: J2SE-1.4,	135	Bundle-RequiredExecutionEnvironment: J2SE-1.4,

Lines 15-27 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java (-1 / +1 lines)
15	import org.eclipse.core.runtime.SubMonitor;	15	import org.eclipse.core.runtime.SubMonitor;
16	import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;	16	import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	17	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
18	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
19	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;	18	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
20	import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;	19	import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;
21	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	20	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
22	import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;	21	import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		24	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
25	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;	25	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
26	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;	26	import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
27	import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;	27	import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;

Lines 16-22 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
16	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,	16	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
17	org.eclipse.equinox.internal.provisional.p2.core,	17	org.eclipse.equinox.internal.provisional.p2.core,
18	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	18	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
19	org.eclipse.equinox.internal.provisional.p2.core.repository,	19	org.eclipse.equinox.internal.provisional.p2.repository,
20	org.eclipse.equinox.internal.provisional.p2.director,	20	org.eclipse.equinox.internal.provisional.p2.director,
21	org.eclipse.equinox.internal.provisional.p2.engine,	21	org.eclipse.equinox.internal.provisional.p2.engine,
22	org.eclipse.equinox.internal.provisional.p2.engine.phases,	22	org.eclipse.equinox.internal.provisional.p2.engine.phases,
Lines 24-30 Link Here
24	org.eclipse.equinox.internal.provisional.p2.metadata.query,	24	org.eclipse.equinox.internal.provisional.p2.metadata.query,
25	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	25	org.eclipse.equinox.internal.provisional.p2.metadata.repository,
26	org.eclipse.equinox.internal.provisional.p2.query,	26	org.eclipse.equinox.internal.provisional.p2.query,
27	org.eclipse.equinox.internal.provisional.spi.p2.core.repository,	27	org.eclipse.equinox.internal.provisional.spi.p2.repository,
28	org.eclipse.osgi.service.resolver;version="1.1.0",	28	org.eclipse.osgi.service.resolver;version="1.1.0",
29	org.eclipse.osgi.util;version="1.1.0",	29	org.eclipse.osgi.util;version="1.1.0",
30	org.osgi.framework;version="1.3.0",	30	org.osgi.framework;version="1.3.0",

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.ui;	11	package org.eclipse.equinox.p2.tests.ui;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.net.URI;	16	import java.net.URI;
15	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
Lines 17-23 Link Here
17	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
18	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
19	import org.eclipse.equinox.internal.provisional.p2.core.Version;	21	import org.eclipse.equinox.internal.provisional.p2.core.Version;
20	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
21	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;	22	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
22	import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;	23	import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;
23	import org.eclipse.equinox.internal.provisional.p2.engine.*;	24	import org.eclipse.equinox.internal.provisional.p2.engine.*;

Lines 21-33 Link Here

(-)src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java (-1 / +1 lines)
21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	21	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;	22	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
23	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	23	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
24	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
25	import org.eclipse.equinox.internal.provisional.p2.director.*;	24	import org.eclipse.equinox.internal.provisional.p2.director.*;
26	import org.eclipse.equinox.internal.provisional.p2.engine.*;	25	import org.eclipse.equinox.internal.provisional.p2.engine.*;
27	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
30	import org.eclipse.equinox.internal.provisional.p2.query.Collector;	29	import org.eclipse.equinox.internal.provisional.p2.query.Collector;
		30	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
31	import org.eclipse.osgi.service.environment.EnvironmentInfo;	31	import org.eclipse.osgi.service.environment.EnvironmentInfo;
32	import org.osgi.framework.BundleContext;	32	import org.osgi.framework.BundleContext;
33	import org.osgi.framework.ServiceReference;	33	import org.osgi.framework.ServiceReference;

Lines 9-23 Link Here

(-)META-INF/MANIFEST.MF (-3 / +3 lines)
9	Bundle-RequiredExecutionEnvironment: J2SE-1.4,	9	Bundle-RequiredExecutionEnvironment: J2SE-1.4,
10	CDC-1.1/Foundation-1.1	10	CDC-1.1/Foundation-1.1
11	Import-Package: org.eclipse.equinox.app;version="1.0.0",	11	Import-Package: org.eclipse.equinox.app;version="1.0.0",
		12	org.eclipse.equinox.internal.p2.artifact.repository,
12	org.eclipse.equinox.internal.p2.core.helpers,	13	org.eclipse.equinox.internal.p2.core.helpers,
13	org.eclipse.equinox.internal.p2.extensionlocation,	14	org.eclipse.equinox.internal.p2.extensionlocation,
14	org.eclipse.equinox.internal.p2.artifact.repository,
15	org.eclipse.equinox.internal.p2.metadata.repository,	15	org.eclipse.equinox.internal.p2.metadata.repository,
16	org.eclipse.equinox.internal.p2.update,	16	org.eclipse.equinox.internal.p2.update,
17	org.eclipse.equinox.internal.provisional.configurator,	17	org.eclipse.equinox.internal.provisional.configurator,
18	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	18	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
19	org.eclipse.equinox.internal.provisional.p2.core,	19	org.eclipse.equinox.internal.provisional.p2.core,
20	org.eclipse.equinox.internal.provisional.p2.core.repository,	20	org.eclipse.equinox.internal.provisional.p2.repository,
21	org.eclipse.equinox.internal.provisional.p2.director,	21	org.eclipse.equinox.internal.provisional.p2.director,
22	org.eclipse.equinox.internal.provisional.p2.directorywatcher,	22	org.eclipse.equinox.internal.provisional.p2.directorywatcher,
23	org.eclipse.equinox.internal.provisional.p2.engine,	23	org.eclipse.equinox.internal.provisional.p2.engine,
Lines 26-33 Link Here
26	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	26	org.eclipse.equinox.internal.provisional.p2.metadata.repository,
27	org.eclipse.equinox.internal.provisional.p2.query,	27	org.eclipse.equinox.internal.provisional.p2.query,
28	org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,	28	org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,
29	org.eclipse.equinox.internal.provisional.spi.p2.core.repository,
30	org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,	29	org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,
		30	org.eclipse.equinox.internal.provisional.spi.p2.repository,
31	org.eclipse.osgi.service.datalocation;version="1.0.0",	31	org.eclipse.osgi.service.datalocation;version="1.0.0",
32	org.eclipse.osgi.service.environment;version="1.1.0",	32	org.eclipse.osgi.service.environment;version="1.1.0",
33	org.eclipse.osgi.util;version="1.1.0",	33	org.eclipse.osgi.util;version="1.1.0",

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.updatesite;	11	package org.eclipse.equinox.p2.tests.updatesite;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		14
13	import java.io.ByteArrayOutputStream;	15	import java.io.ByteArrayOutputStream;
14	import java.io.File;	16	import java.io.File;
15	import java.net.URI;	17	import java.net.URI;
Lines 24-30 Link Here
24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	26	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
25	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	27	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
26	import org.eclipse.equinox.internal.provisional.p2.core.*;	28	import org.eclipse.equinox.internal.provisional.p2.core.*;
27	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	29	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	30	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
30	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	31	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/director/DirectorAppTest.java (-1 / +2 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.director;	9	package org.eclipse.equinox.p2.tests.director;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		12
11	import java.io.*;	13	import java.io.*;
12	import java.lang.reflect.InvocationTargetException;	14	import java.lang.reflect.InvocationTargetException;
13	import java.lang.reflect.Method;	15	import java.lang.reflect.Method;
Lines 22-28 Link Here
22	import org.eclipse.equinox.internal.p2.director.app.Application;	24	import org.eclipse.equinox.internal.p2.director.app.Application;
23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	25	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	26	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
25	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
27	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
28	import org.eclipse.equinox.internal.provisional.p2.query.*;	29	import org.eclipse.equinox.internal.provisional.p2.query.*;

Lines 5-11 Link Here

(-)META-INF/MANIFEST.MF (-5 / +6 lines)
5	Bundle-Vendor: %providerName	5	Bundle-Vendor: %providerName
6	Bundle-Localization: plugin	6	Bundle-Localization: plugin
7	Bundle-Version: 1.1.0.qualifier	7	Bundle-Version: 1.1.0.qualifier
8	Import-Package: javax.xml.parsers,	8	Import-Package: javax.xml.parsers,
9	org.eclipse.equinox.internal.p2.artifact.mirror,	9	org.eclipse.equinox.internal.p2.artifact.mirror,
10	org.eclipse.equinox.internal.p2.artifact.processors.md5,	10	org.eclipse.equinox.internal.p2.artifact.processors.md5,
11	org.eclipse.equinox.internal.p2.artifact.processors.pack200,	11	org.eclipse.equinox.internal.p2.artifact.processors.pack200,
Lines 38-44 Link Here
38	org.eclipse.equinox.internal.provisional.p2.core,	38	org.eclipse.equinox.internal.provisional.p2.core,
39	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	39	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
40	org.eclipse.equinox.internal.provisional.p2.core.location,	40	org.eclipse.equinox.internal.provisional.p2.core.location,
41	org.eclipse.equinox.internal.provisional.p2.core.repository,	41	org.eclipse.equinox.internal.provisional.p2.repository,
42	org.eclipse.equinox.internal.provisional.p2.director,	42	org.eclipse.equinox.internal.provisional.p2.director,
43	org.eclipse.equinox.internal.provisional.p2.directorywatcher,	43	org.eclipse.equinox.internal.provisional.p2.directorywatcher,
44	org.eclipse.equinox.internal.provisional.p2.engine,	44	org.eclipse.equinox.internal.provisional.p2.engine,
Lines 48-55 Link Here
48	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	48	org.eclipse.equinox.internal.provisional.p2.metadata.repository,
49	org.eclipse.equinox.internal.provisional.p2.query,	49	org.eclipse.equinox.internal.provisional.p2.query,
50	org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,	50	org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,
51	org.eclipse.equinox.internal.provisional.spi.p2.core.repository,
52	org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,	51	org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,
		52	org.eclipse.equinox.internal.provisional.spi.p2.repository,
53	org.eclipse.equinox.spi.p2.publisher,	53	org.eclipse.equinox.spi.p2.publisher,
54	org.eclipse.internal.provisional.equinox.p2.jarprocessor,	54	org.eclipse.internal.provisional.equinox.p2.jarprocessor,
55	org.eclipse.osgi.service.datalocation,	55	org.eclipse.osgi.service.datalocation,
Lines 75-83 Link Here
75	org.sat4j.core;bundle-version="2.0.0",	75	org.sat4j.core;bundle-version="2.0.0",
76	org.sat4j.pb;bundle-version="2.0.0",	76	org.sat4j.pb;bundle-version="2.0.0",
77	org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",	77	org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",
78	org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",	78	org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",
79	org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",	79	org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",
80	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="1.0.100"	80	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="1.0.100",
		81	org.eclipse.equinox.p2.repository;bundle-version="1.0.0"
81	Bundle-ActivationPolicy: lazy	82	Bundle-ActivationPolicy: lazy
82	Eclipse-RegisterBuddy: org.eclipse.equinox.p2.artifact.repository	83	Eclipse-RegisterBuddy: org.eclipse.equinox.p2.artifact.repository
83	Bundle-RequiredExecutionEnvironment: J2SE-1.5	84	Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 6-11 Link Here

(-)All p2 Tests.launch (-1 / +2 lines)
6	<booleanAttribute key="automaticAdd" value="true"/>	6	<booleanAttribute key="automaticAdd" value="true"/>
7	<booleanAttribute key="automaticValidate" value="false"/>	7	<booleanAttribute key="automaticValidate" value="false"/>
8	<stringAttribute key="bootstrap" value=""/>	8	<stringAttribute key="bootstrap" value=""/>
		9	<stringAttribute key="checked" value="[NONE]"/>
9	<booleanAttribute key="clearConfig" value="true"/>	10	<booleanAttribute key="clearConfig" value="true"/>
10	<booleanAttribute key="clearws" value="true"/>	11	<booleanAttribute key="clearws" value="true"/>
11	<booleanAttribute key="clearwslog" value="false"/>	12	<booleanAttribute key="clearwslog" value="false"/>
Lines 41-47 Link Here
41	<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>	42	<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
42	<booleanAttribute key="default" value="true"/>	43	<booleanAttribute key="default" value="true"/>
43	<booleanAttribute key="includeOptional" value="true"/>	44	<booleanAttribute key="includeOptional" value="true"/>
44	<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>	45	<stringAttribute key="location" value="${workspace_loc}/../junit2-workspace"/>
45	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">	46	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
46	<listEntry value="/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java"/>	47	<listEntry value="/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java"/>
47	</listAttribute>	48	</listAttribute>

Added Link Here

(-)src/org/eclipse/equinox/p2/tests/artifact/repository/TransferExceptionsTest.java (+75 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 Cloudsmith Inc. 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	* Cloudsmith Inc. - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.artifact.repository;
12
13	import java.io.*;
14	import java.net.URI;
15	import java.net.URISyntaxException;
16	import org.eclipse.core.runtime.*;
17	import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
18	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
19	import org.osgi.framework.BundleException;
20
21	/**
22	* Test supposed to be used interactivly to monitor the error message output.
23	* @author henrik.lindberg@cloudsmith.com
24	*
25	*/
26	public class TransferExceptionsTest extends AbstractProvisioningTest {
27
28	public void testErrorMessages() {
29	FileOutputStream fos = null;
30	File f = null;
31	try {
32	f = File.createTempFile("TransferTest", "dummy.txt");
33	fos = new FileOutputStream(f);
34	Platform.getBundle("org.eclipse.ecf.provider.filetransfer").start();
35	} catch (IOException e) {
36	fail("1.0", e);
37	} catch (BundleException e) {
38	fail("1.5", e);
39	}
40	try {
41	IStatus s = RepositoryTransport.getInstance().download(new URI("bogus!bogus"), fos, new NullProgressMonitor());
42	assertNotOK(s);
43	printStatus("1", s);
44	s = RepositoryTransport.getInstance().download(new URI("bogus://somewhere.else"), fos, new NullProgressMonitor());
45	assertNotOK(s);
46	printStatus("2", s);
47	s = RepositoryTransport.getInstance().download(new URI("http:bogusURL"), fos, new NullProgressMonitor());
48	assertNotOK(s);
49	printStatus("3", s);
50	s = RepositoryTransport.getInstance().download(new URI("http://bogusURL:80/"), fos, new NullProgressMonitor());
51	assertNotOK(s);
52	printStatus("4", s);
53	s = RepositoryTransport.getInstance().download(new URI("http:/bogusURL:999999999999/"), fos, new NullProgressMonitor());
54	assertNotOK(s);
55	printStatus("5", s);
56	s = RepositoryTransport.getInstance().download(new URI("http://bogus.nowhere"), fos, new NullProgressMonitor());
57	assertNotOK(s);
58	printStatus("6", s);
59	s = RepositoryTransport.getInstance().download(new URI("http://www.eclipse.org/AFileThatDoesNotExist.foo"), fos, new NullProgressMonitor());
60	assertNotOK(s);
61	printStatus("7", s);
62	} catch (URISyntaxException e) {
63	fail("URI syntax exception where none was expected: " + e.getMessage());
64	}
65	}
66
67	private static void printStatus(String msg, IStatus s) {
68	System.err.print("TEST OUTPUT: " + msg + "\n");
69	System.err.print(" ");
70	System.err.print("Message [" + s.getMessage() + "] Exception Class[" + s.getException().getClass().getName() + "] ExceptionMessage[ ");
71	System.err.print(s.getException().getMessage() + "]\n");
72
73	}
74
75	}

Lines 39-52 Link Here

(-)META-INF/MANIFEST.MF (-2 / +4 lines)
39	org.eclipse.equinox.internal.p2.core.helpers,	39	org.eclipse.equinox.internal.p2.core.helpers,
40	org.eclipse.equinox.internal.p2.metadata,	40	org.eclipse.equinox.internal.p2.metadata,
41	org.eclipse.equinox.internal.p2.persistence,	41	org.eclipse.equinox.internal.p2.persistence,
		42	org.eclipse.equinox.internal.p2.repository,
		43	org.eclipse.equinox.internal.p2.repository.helpers,
42	org.eclipse.equinox.internal.provisional.p2.core,	44	org.eclipse.equinox.internal.provisional.p2.core,
43	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	45	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
44	org.eclipse.equinox.internal.provisional.p2.core.location,	46	org.eclipse.equinox.internal.provisional.p2.core.location,
45	org.eclipse.equinox.internal.provisional.p2.core.repository,
46	org.eclipse.equinox.internal.provisional.p2.metadata,	47	org.eclipse.equinox.internal.provisional.p2.metadata,
47	org.eclipse.equinox.internal.provisional.p2.metadata.query,	48	org.eclipse.equinox.internal.provisional.p2.metadata.query,
48	org.eclipse.equinox.internal.provisional.p2.query,	49	org.eclipse.equinox.internal.provisional.p2.query,
49	org.eclipse.equinox.internal.provisional.spi.p2.core.repository,	50	org.eclipse.equinox.internal.provisional.p2.repository,
		51	org.eclipse.equinox.internal.provisional.spi.p2.repository,
50	org.eclipse.equinox.security.storage,	52	org.eclipse.equinox.security.storage,
51	org.eclipse.osgi.service.resolver;version="1.1.0",	53	org.eclipse.osgi.service.resolver;version="1.1.0",
52	org.eclipse.osgi.util;version="1.1.0",	54	org.eclipse.osgi.util;version="1.1.0",

Lines 12-28 Link Here

(-)META-INF/MANIFEST.MF (-2 / +4 lines)
12	org.eclipse.equinox.app;version="1.0.0";resolution:=optional,	12	org.eclipse.equinox.app;version="1.0.0";resolution:=optional,
13	org.eclipse.equinox.internal.p2.core.helpers,	13	org.eclipse.equinox.internal.p2.core.helpers,
14	org.eclipse.equinox.internal.p2.publisher.eclipse,	14	org.eclipse.equinox.internal.p2.publisher.eclipse,
		15	org.eclipse.equinox.internal.p2.repository,
		16	org.eclipse.equinox.internal.p2.repository.helpers,
15	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	17	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
16	org.eclipse.equinox.internal.provisional.p2.core,	18	org.eclipse.equinox.internal.provisional.p2.core,
17	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	19	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
18	org.eclipse.equinox.internal.provisional.p2.core.repository,
19	org.eclipse.equinox.internal.provisional.p2.metadata,	20	org.eclipse.equinox.internal.provisional.p2.metadata,
20	org.eclipse.equinox.internal.provisional.p2.metadata.query,	21	org.eclipse.equinox.internal.provisional.p2.metadata.query,
21	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	22	org.eclipse.equinox.internal.provisional.p2.metadata.repository,
22	org.eclipse.equinox.internal.provisional.p2.query,	23	org.eclipse.equinox.internal.provisional.p2.query,
		24	org.eclipse.equinox.internal.provisional.p2.repository,
23	org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,	25	org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,
24	org.eclipse.equinox.internal.provisional.spi.p2.core.repository,
25	org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,	26	org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository,
		27	org.eclipse.equinox.internal.provisional.spi.p2.repository,
26	org.eclipse.equinox.p2.publisher,	28	org.eclipse.equinox.p2.publisher,
27	org.eclipse.equinox.p2.publisher.actions,	29	org.eclipse.equinox.p2.publisher.actions,
28	org.eclipse.equinox.p2.publisher.eclipse,	30	org.eclipse.equinox.p2.publisher.eclipse,

Added Link Here

(-)src/org/eclipse/equinox/internal/p2/updatesite/metadata/Messages.java (+21 lines)
1	package org.eclipse.equinox.internal.p2.updatesite.metadata;
2
3	import java.util.MissingResourceException;
4	import java.util.ResourceBundle;
5
6	public class Messages {
7	private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.updatesite.metadata.messages"; //$NON-NLS-1$
8
9	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
10
11	private Messages() {
12	}
13
14	public static String getString(String key) {
15	try {
16	return RESOURCE_BUNDLE.getString(key);
17	} catch (MissingResourceException e) {
18	return '!' + key + '!';
19	}
20	}
21	}

Lines 17-23 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java (-1 / +1 lines)
17	import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper;	17	import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper;
18	import org.eclipse.equinox.internal.p2.rollback.FormerState;	18	import org.eclipse.equinox.internal.p2.rollback.FormerState;
19	import org.eclipse.equinox.internal.provisional.p2.core.*;	19	import org.eclipse.equinox.internal.provisional.p2.core.*;
20	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
21	import org.eclipse.equinox.internal.provisional.p2.director.*;	20	import org.eclipse.equinox.internal.provisional.p2.director.*;
22	import org.eclipse.equinox.internal.provisional.p2.engine.*;	21	import org.eclipse.equinox.internal.provisional.p2.engine.*;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
Lines 27-32 Link Here
27	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
29	import org.eclipse.equinox.internal.provisional.p2.query.*;	28	import org.eclipse.equinox.internal.provisional.p2.query.*;
		29	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
30		30
31	public class SimplePlanner implements IPlanner {	31	public class SimplePlanner implements IPlanner {
32	private static boolean DEBUG = Tracing.DEBUG_PLANNER_OPERANDS;	32	private static boolean DEBUG = Tracing.DEBUG_PLANNER_OPERANDS;

Lines 16-30 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
16	org.eclipse.equinox.internal.p2.engine,	16	org.eclipse.equinox.internal.p2.engine,
17	org.eclipse.equinox.internal.p2.metadata,	17	org.eclipse.equinox.internal.p2.metadata,
18	org.eclipse.equinox.internal.p2.metadata.repository,	18	org.eclipse.equinox.internal.p2.metadata.repository,
		19	org.eclipse.equinox.internal.p2.repository.helpers,
19	org.eclipse.equinox.internal.p2.updatechecker,	20	org.eclipse.equinox.internal.p2.updatechecker,
20	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	21	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
21	org.eclipse.equinox.internal.provisional.p2.core,	22	org.eclipse.equinox.internal.provisional.p2.core,
22	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	23	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
23	org.eclipse.equinox.internal.provisional.p2.core.repository,
24	org.eclipse.equinox.internal.provisional.p2.metadata,	24	org.eclipse.equinox.internal.provisional.p2.metadata,
25	org.eclipse.equinox.internal.provisional.p2.metadata.query,	25	org.eclipse.equinox.internal.provisional.p2.metadata.query,
26	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	26	org.eclipse.equinox.internal.provisional.p2.metadata.repository,
27	org.eclipse.equinox.internal.provisional.p2.query,	27	org.eclipse.equinox.internal.provisional.p2.query,
		28	org.eclipse.equinox.internal.provisional.p2.repository,
28	org.eclipse.equinox.internal.provisional.p2.updatechecker,	29	org.eclipse.equinox.internal.provisional.p2.updatechecker,
29	org.eclipse.osgi.service.resolver,	30	org.eclipse.osgi.service.resolver,
30	org.osgi.framework;version="1.4.0",	31	org.osgi.framework;version="1.4.0",

Lines 6-15 Link Here

(-)META-INF/MANIFEST.MF (+2 lines)
6	Bundle-Localization: plugin	6	Bundle-Localization: plugin
7	Bundle-Version: 1.0.0.qualifier	7	Bundle-Version: 1.0.0.qualifier
8	Import-Package: org.eclipse.equinox.internal.p2.core,	8	Import-Package: org.eclipse.equinox.internal.p2.core,
		9	org.eclipse.equinox.internal.p2.core.helpers,
9	org.eclipse.equinox.internal.p2.director,	10	org.eclipse.equinox.internal.p2.director,
10	org.eclipse.equinox.internal.p2.engine,	11	org.eclipse.equinox.internal.p2.engine,
11	org.eclipse.equinox.internal.p2.garbagecollector,	12	org.eclipse.equinox.internal.p2.garbagecollector,
12	org.eclipse.equinox.internal.p2.metadata.repository,	13	org.eclipse.equinox.internal.p2.metadata.repository,
		14	org.eclipse.equinox.internal.p2.repository.helpers,
13	org.eclipse.equinox.internal.provisional.p2.core.eventbus,	15	org.eclipse.equinox.internal.provisional.p2.core.eventbus,
14	org.eclipse.equinox.internal.provisional.p2.core.location,	16	org.eclipse.equinox.internal.provisional.p2.core.location,
15	org.eclipse.equinox.internal.provisional.p2.director,	17	org.eclipse.equinox.internal.provisional.p2.director,

Lines 10-22 Link Here

(-)META-INF/MANIFEST.MF (-2 / +3 lines)
10	org.eclipse.equinox.app;version="1.0.0",	10	org.eclipse.equinox.app;version="1.0.0",
11	org.eclipse.equinox.internal.p2.core.helpers,	11	org.eclipse.equinox.internal.p2.core.helpers,
12	org.eclipse.equinox.internal.p2.metadata,	12	org.eclipse.equinox.internal.p2.metadata,
		13	org.eclipse.equinox.internal.p2.repository.helpers,
		14	org.eclipse.equinox.internal.p2.sar,
13	org.eclipse.equinox.internal.provisional.p2.artifact.repository,	15	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
14	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,	16	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
15	org.eclipse.equinox.internal.provisional.p2.core,	17	org.eclipse.equinox.internal.provisional.p2.core,
16	org.eclipse.equinox.internal.provisional.p2.core.repository,
17	org.eclipse.equinox.internal.provisional.p2.metadata,	18	org.eclipse.equinox.internal.provisional.p2.metadata,
18	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	19	org.eclipse.equinox.internal.provisional.p2.metadata.repository,
19	org.eclipse.equinox.internal.p2.sar,	20	org.eclipse.equinox.internal.provisional.p2.repository,
20	org.eclipse.internal.provisional.equinox.p2.jarprocessor,	21	org.eclipse.internal.provisional.equinox.p2.jarprocessor,
21	org.eclipse.osgi.util;version="1.1.0",	22	org.eclipse.osgi.util;version="1.1.0",
22	org.osgi.framework;version="1.3.0"	23	org.osgi.framework;version="1.3.0"

Removed Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/repository/ECFTransport.java (-319 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	* compeople AG (Stefan Liebig) - various ongoing maintenance
11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.artifact.repository;
13
14	import java.io.*;
15	import java.net.ProtocolException;
16	import java.net.URLEncoder;
17	import org.eclipse.core.runtime.*;
18	import org.eclipse.ecf.core.security.ConnectContextFactory;
19	import org.eclipse.ecf.core.security.IConnectContext;
20	import org.eclipse.ecf.filetransfer.*;
21	import org.eclipse.ecf.filetransfer.events.*;
22	import org.eclipse.ecf.filetransfer.identity.FileCreateException;
23	import org.eclipse.ecf.filetransfer.identity.FileIDFactory;
24	import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory;
25	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
26	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
27	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IStateful;
28	import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;
29	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
30	import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI.AuthenticationInfo;
31	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
32	import org.eclipse.equinox.security.storage.*;
33	import org.eclipse.osgi.util.NLS;
34	import org.osgi.framework.Bundle;
35	import org.osgi.framework.BundleException;
36	import org.osgi.service.packageadmin.PackageAdmin;
37	import org.osgi.util.tracker.ServiceTracker;
38
39	/**
40	* A transport implementation that uses ECF file transfer API.
41	*/
42	public class ECFTransport extends Transport {
43	/**
44	* The number of password retry attempts allowed before failing.
45	*/
46	private static final int LOGIN_RETRIES = 3;
47
48	private static final ProtocolException ERROR_401 = new ProtocolException();
49
50	private static final String SERVER_REDIRECT = "Server redirected too many times"; //$NON-NLS-1$
51
52	/**
53	* The singleton transport instance.
54	*/
55	private static ECFTransport instance;
56
57	private final ServiceTracker retrievalFactoryTracker;
58
59	/**
60	* Returns an initialized instance of ECFTransport
61	*/
62	public static synchronized ECFTransport getInstance() {
63	if (instance == null) {
64	instance = new ECFTransport();
65	}
66	return instance;
67	}
68
69	/**
70	* Private to avoid client instantiation.
71	*/
72	private ECFTransport() {
73	retrievalFactoryTracker = new ServiceTracker(Activator.getContext(), IRetrieveFileTransferFactory.class.getName(), null);
74	retrievalFactoryTracker.open();
75	startBundle("org.eclipse.ecf.provider.filetransfer"); //$NON-NLS-1$
76	}
77
78	private boolean startBundle(String bundleId) {
79	PackageAdmin packageAdmin = (PackageAdmin) ServiceHelper.getService(Activator.getContext(), PackageAdmin.class.getName());
80	if (packageAdmin == null)
81	return false;
82
83	Bundle[] bundles = packageAdmin.getBundles(bundleId, null);
84	if (bundles != null && bundles.length > 0) {
85	for (int i = 0; i < bundles.length; i++) {
86	try {
87	if ((bundles[0].getState() & Bundle.INSTALLED) == 0) {
88	bundles[0].start();
89	return true;
90	}
91	} catch (BundleException e) {
92	// failed, try next bundle
93	}
94	}
95	}
96	return false;
97	}
98
99	/**
100	* Check if the given exception represents a permission failure (401 for HTTP),
101	* and throw a special marker exception if a permission failure was encountered.
102	*/
103	private void checkPermissionDenied(Throwable t) throws ProtocolException {
104	if (!(t instanceof IncomingFileTransferException))
105	return;
106	IncomingFileTransferException e = (IncomingFileTransferException) t;
107	if (e.getErrorCode() == 401)
108	throw ERROR_401;
109	//try to figure out if we have a 401 by parsing the exception message
110	IStatus status = e.getStatus();
111	Throwable exception = status.getException();
112	if (exception instanceof IOException)
113	if (exception.getMessage() != null && (exception.getMessage().indexOf(" 401 ") != -1 \|\| exception.getMessage().indexOf(SERVER_REDIRECT) != -1)) //$NON-NLS-1$
114	throw ERROR_401;
115	}
116
117	protected IStatus convertToStatus(IFileTransferEvent event, Exception failure, long startTime, String location) {
118	long speed = DownloadStatus.UNKNOWN_RATE;
119	if (event instanceof IIncomingFileTransferEvent) {
120	long bytes = ((IIncomingFileTransferEvent) event).getSource().getBytesReceived();
121	if (bytes > 0) {
122	long elapsed = (System.currentTimeMillis() - startTime) / 1000;//in seconds
123	if (elapsed == 0)
124	elapsed = 1;
125	speed = bytes / elapsed;
126	}
127	}
128	DownloadStatus result = null;
129	if (failure == null)
130	result = new DownloadStatus(IStatus.OK, Activator.ID, Status.OK_STATUS.getMessage());
131	else if (failure instanceof UserCancelledException)
132	result = new DownloadStatus(IStatus.CANCEL, Activator.ID, failure.getMessage(), failure);
133	else
134	result = new DownloadStatus(IStatus.ERROR, Activator.ID, NLS.bind(Messages.io_failedRead, location), failure);
135	result.setTransferRate(speed);
136	return result;
137	}
138
139	public IStatus download(String url, OutputStream destination, IProgressMonitor monitor) {
140	try {
141	IConnectContext context = getConnectionContext(url, false);
142	for (int i = 0; i < LOGIN_RETRIES; i++) {
143	try {
144	return performDownload(url, destination, context, monitor);
145	} catch (ProtocolException e) {
146	if (e == ERROR_401)
147	context = getConnectionContext(url, true);
148	}
149	}
150	} catch (UserCancelledException e) {
151	return Status.CANCEL_STATUS;
152	} catch (ProvisionException e) {
153	return e.getStatus();
154	}
155	//reached maximum number of retries without success
156	return new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.io_failedRead, url), null);
157	}
158
159	public IStatus performDownload(String toDownload, OutputStream target, IConnectContext context, IProgressMonitor monitor) throws ProtocolException {
160	IRetrieveFileTransferFactory factory = (IRetrieveFileTransferFactory) retrievalFactoryTracker.getService();
161	if (factory == null)
162	return statusOn(target, new Status(IStatus.ERROR, Activator.ID, Messages.ecf_configuration_error));
163
164	return transfer(factory.newInstance(), toDownload, target, context, monitor);
165	}
166
167	private IStatus transfer(final IRetrieveFileTransferContainerAdapter retrievalContainer, final String toDownload, final OutputStream target, IConnectContext context, final IProgressMonitor monitor) throws ProtocolException {
168	final IStatus[] result = new IStatus[1];
169	final long startTime = System.currentTimeMillis();
170	IFileTransferListener listener = new IFileTransferListener() {
171	public void handleTransferEvent(IFileTransferEvent event) {
172	if (event instanceof IFileTransferConnectStartEvent) {
173	IFileTransferConnectStartEvent cse = (IFileTransferConnectStartEvent) event;
174	FileTransferJob connectJob = cse.prepareConnectJob(null);
175	cse.connectUsingJob(connectJob);
176	} else if (event instanceof IIncomingFileTransferReceiveStartEvent) {
177	IIncomingFileTransferReceiveStartEvent rse = (IIncomingFileTransferReceiveStartEvent) event;
178	try {
179	if (target != null) {
180	rse.receive(target);
181	}
182	} catch (IOException e) {
183	IStatus status = convertToStatus(event, e, startTime, toDownload);
184	synchronized (result) {
185	result[0] = status;
186	result.notify();
187	}
188	}
189	}
190	if (event instanceof IIncomingFileTransferReceiveDataEvent) {
191	IIncomingFileTransfer source = ((IIncomingFileTransferReceiveDataEvent) event).getSource();
192	if (monitor != null) {
193	if (monitor.isCanceled()) {
194	synchronized (result) {
195	result[0] = Status.CANCEL_STATUS;
196	source.cancel();
197	result.notify();
198	}
199	}
200	}
201	}
202	if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
203	Exception exception = ((IIncomingFileTransferReceiveDoneEvent) event).getException();
204	IStatus status = convertToStatus(event, exception, startTime, toDownload);
205	synchronized (result) {
206	result[0] = status;
207	result.notify();
208	}
209	}
210	}
211	};
212
213	try {
214	retrievalContainer.setConnectContextForAuthentication(context);
215	retrievalContainer.sendRetrieveRequest(FileIDFactory.getDefault().createFileID(retrievalContainer.getRetrieveNamespace(), toDownload), listener, null);
216	} catch (IncomingFileTransferException e) {
217	checkPermissionDenied(e);
218	return statusOn(target, e.getStatus());
219	} catch (FileCreateException e) {
220	return statusOn(target, e.getStatus());
221	}
222	synchronized (result) {
223	while (result[0] == null) {
224	boolean logged = false;
225	try {
226	result.wait();
227	} catch (InterruptedException e) {
228	if (!logged)
229	LogHelper.log(new Status(IStatus.WARNING, Activator.ID, "Unexpected interrupt while waiting on ECF transfer", e)); //$NON-NLS-1$
230	}
231	}
232	}
233	final Throwable exception = result[0].getException();
234	checkPermissionDenied(exception);
235	//if the transfer failed, return the underlying exception status, otherwise return top level DownloadStatus
236	if (exception instanceof IncomingFileTransferException) {
237	IStatus cause = ((IncomingFileTransferException) exception).getStatus();
238	if (!cause.isOK())
239	return statusOn(target, cause);
240	}
241	return statusOn(target, result[0]);
242	}
243
244	/**
245	* Returns the connection context for the given URL. This may prompt the
246	* user for user name and password as required.
247	*
248	* @param xmlLocation - the file location requiring login details
249	* @param prompt - use <code>true</code> to prompt the user instead of
250	* looking at the secure preference store for login, use <code>false</code>
251	* to only try the secure preference store
252	* @throws UserCancelledException when the user cancels the login prompt
253	* @throws ProvisionException if the password cannot be read or saved
254	* @return The connection context
255	*/
256	public IConnectContext getConnectionContext(String xmlLocation, boolean prompt) throws UserCancelledException, ProvisionException {
257	ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
258	IPath hostLocation = new Path(xmlLocation).removeLastSegments(1);
259	String nodeKey;
260	try {
261	nodeKey = URLEncoder.encode(hostLocation.toString(), "UTF-8"); //$NON-NLS-1$
262	} catch (UnsupportedEncodingException e2) {
263	//fall back to default platform encoding
264	nodeKey = URLEncoder.encode(hostLocation.toString());
265	}
266	String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
267	ISecurePreferences prefNode = null;
268	if (securePreferences.nodeExists(nodeName))
269	prefNode = securePreferences.node(nodeName);
270	if (!prompt) {
271	if (prefNode == null)
272	return null;
273	try {
274	String username = prefNode.get(IRepository.PROP_USERNAME, null);
275	String password = prefNode.get(IRepository.PROP_PASSWORD, null);
276	//if we don't have stored connection data just return a null connection context
277	if (username == null \|\| password == null)
278	return null;
279	return ConnectContextFactory.createUsernamePasswordConnectContext(username, password);
280	} catch (StorageException e) {
281	String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
282	throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
283	}
284	}
285	//need to prompt user for user name and password
286	ServiceTracker adminUITracker = new ServiceTracker(Activator.getContext(), IServiceUI.class.getName(), null);
287	adminUITracker.open();
288	IServiceUI adminUIService = (IServiceUI) adminUITracker.getService();
289	AuthenticationInfo loginDetails = null;
290	if (adminUIService != null)
291	loginDetails = adminUIService.getUsernamePassword(hostLocation.toString());
292	//null result means user canceled password dialog
293	if (loginDetails == null)
294	throw new UserCancelledException();
295	//save user name and password if requested by user
296	if (loginDetails.saveResult()) {
297	if (prefNode == null)
298	prefNode = securePreferences.node(nodeName);
299	try {
300	prefNode.put(IRepository.PROP_USERNAME, loginDetails.getUserName(), true);
301	prefNode.put(IRepository.PROP_PASSWORD, loginDetails.getPassword(), true);
302	prefNode.flush();
303	} catch (StorageException e1) {
304	String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
305	throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
306	} catch (IOException e) {
307	String msg = NLS.bind(Messages.repoMan_internalError, xmlLocation.toString());
308	throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.INTERNAL_ERROR, msg, null));
309	}
310	}
311	return ConnectContextFactory.createUsernamePasswordConnectContext(loginDetails.getUserName(), loginDetails.getPassword());
312	}
313
314	private static IStatus statusOn(OutputStream target, IStatus status) {
315	if (target instanceof IStateful)
316	((IStateful) target).setStatus(status);
317	return status;
318	}
319	}

Lines 16-28 Link Here

(-)src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java (-3 / +6 lines)
16	import java.util.jar.JarEntry;	16	import java.util.jar.JarEntry;
17	import java.util.jar.JarInputStream;	17	import java.util.jar.JarInputStream;
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
19	import org.eclipse.equinox.internal.p2.artifact.repository.*;	19	import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
		20	import org.eclipse.equinox.internal.p2.artifact.repository.Messages;
20	import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository;	21	import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository;
21	import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepositoryIO;	22	import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepositoryIO;
22	import org.eclipse.equinox.internal.p2.core.helpers.Tracing;	23	import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
		24	import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
		25	import org.eclipse.equinox.internal.p2.repository.Transport;
23	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	26	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	27	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
25	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	28	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
26	import org.eclipse.osgi.util.NLS;	29	import org.eclipse.osgi.util.NLS;
27		30
28	public class SimpleArtifactRepositoryFactory extends ArtifactRepositoryFactory {	31	public class SimpleArtifactRepositoryFactory extends ArtifactRepositoryFactory {
Lines 117-122 Link Here
117	}	120	}
118		121
119	private Transport getTransport() {	122	private Transport getTransport() {
120	return ECFTransport.getInstance();	123	return RepositoryTransport.getInstance();
121	}	124	}
122	}	125	}

Removed Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IStateful.java (-33 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 compeople AG 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	* compeople AG (Stefan Liebig) - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.artifact.repository;
12
13	import org.eclipse.core.runtime.IStatus;
14
15	/**
16	* Implementing <code>IStateful</code> adds the ability to store status information.
17	*/
18	public interface IStateful {
19
20	/**
21	* Set the status.
22	*
23	* @param status if status equals null => getStatus().isOK
24	*/
25	void setStatus(IStatus status);
26
27	/**
28	* Get status.
29	* @return status
30	*/
31	public IStatus getStatus();
32
33	}

Lines 10-15 Link Here

(-)META-INF/MANIFEST.MF (-2 / +5 lines)
10	org.eclipse.equinox.internal.p2.artifact.processors.md5;x-internal:=true,	10	org.eclipse.equinox.internal.p2.artifact.processors.md5;x-internal:=true,
11	org.eclipse.equinox.internal.p2.artifact.processors.pack200;x-friends:="org.eclipse.equinox.p2.artifact.processors,org.eclipse.equinox.p2.artifact.optimizers",	11	org.eclipse.equinox.internal.p2.artifact.processors.pack200;x-friends:="org.eclipse.equinox.p2.artifact.processors,org.eclipse.equinox.p2.artifact.optimizers",
12	org.eclipse.equinox.internal.p2.artifact.repository;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.reconciler.dropins",	12	org.eclipse.equinox.internal.p2.artifact.repository;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.reconciler.dropins",
		13	org.eclipse.equinox.internal.p2.artifact.repository.ant,
13	org.eclipse.equinox.internal.p2.artifact.repository.simple;x-friends:="org.eclipse.equinox.p2.selfhosting,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.tests",	14	org.eclipse.equinox.internal.p2.artifact.repository.simple;x-friends:="org.eclipse.equinox.p2.selfhosting,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.tests",
14	org.eclipse.equinox.internal.provisional.p2.artifact.repository;	15	org.eclipse.equinox.internal.provisional.p2.artifact.repository;
15	x-friends:="org.eclipse.equinox.p2.artifact.optimizers,	16	x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
Lines 51-61 Link Here
51	org.eclipse.equinox.internal.p2.jarprocessor,	52	org.eclipse.equinox.internal.p2.jarprocessor,
52	org.eclipse.equinox.internal.p2.metadata,	53	org.eclipse.equinox.internal.p2.metadata,
53	org.eclipse.equinox.internal.p2.persistence,	54	org.eclipse.equinox.internal.p2.persistence,
		55	org.eclipse.equinox.internal.p2.repository,
		56	org.eclipse.equinox.internal.p2.repository.helpers,
54	org.eclipse.equinox.internal.provisional.p2.core,	57	org.eclipse.equinox.internal.provisional.p2.core,
55	org.eclipse.equinox.internal.provisional.p2.core.location,	58	org.eclipse.equinox.internal.provisional.p2.core.location,
56	org.eclipse.equinox.internal.provisional.p2.core.repository,
57	org.eclipse.equinox.internal.provisional.p2.metadata,	59	org.eclipse.equinox.internal.provisional.p2.metadata,
58	org.eclipse.equinox.internal.provisional.spi.p2.core.repository,	60	org.eclipse.equinox.internal.provisional.p2.repository,
		61	org.eclipse.equinox.internal.provisional.spi.p2.repository,
59	org.eclipse.equinox.security.storage,	62	org.eclipse.equinox.security.storage,
60	org.eclipse.internal.provisional.equinox.p2.jarprocessor;resolution:=optional,	63	org.eclipse.internal.provisional.equinox.p2.jarprocessor;resolution:=optional,
61	org.eclipse.osgi.framework.log;version="1.0.0",	64	org.eclipse.osgi.framework.log;version="1.0.0",