Attachment #130616 for bug #264110

Lines 53-58 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties (+1 lines)
53	Mirroring_compareAndDownload=Compare and download of {0} from baseline.	53	Mirroring_compareAndDownload=Compare and download of {0} from baseline.
54	MirrorLog_Console_Log=Logging to the console instead.	54	MirrorLog_Console_Log=Logging to the console instead.
55	MirrorLog_Exception_Occurred=An exception occurred while writing to the log:	55	MirrorLog_Exception_Occurred=An exception occurred while writing to the log:
		56	Mirroring_DestinationNotModifiable=Destination repository must be modifiable: {0}
56		57
57	exception_unsupportedAddToComposite = Cannot add descriptors to a composite repository.	58	exception_unsupportedAddToComposite = Cannot add descriptors to a composite repository.
58	exception_unsupportedGetOutputStream=Cannot write artifacts to a composite repository.	59	exception_unsupportedGetOutputStream=Cannot write artifacts to a composite repository.

Lines 56-61 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java (+1 lines)
56	public static String Mirroring_NO_MATCHING_DESCRIPTOR;	56	public static String Mirroring_NO_MATCHING_DESCRIPTOR;
57	public static String Mirroring_MISSING_DESCRIPTOR;	57	public static String Mirroring_MISSING_DESCRIPTOR;
58	public static String Mirroring_DIFFERENT_DESCRIPTOR_PROPERTY;	58	public static String Mirroring_DIFFERENT_DESCRIPTOR_PROPERTY;
		59	public static String Mirroring_DestinationNotModifiable;
59		60
60	public static String Mirroring_ValidationError;	61	public static String Mirroring_ValidationError;
61	public static String Mirroring_compareAndDownload;	62	public static String Mirroring_compareAndDownload;




import org.eclipse.equinox.internal.p2.artifact.repository.*;
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.RepositoryHelper;
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.repository.IRepositoryManager;
import org.eclipse.osgi.framework.log.FrameworkLog;

	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
	 */
	public Object start(IApplicationContext context) throws Exception {
		try {
			Map args = context.getArguments();
			initializeFromArguments((String[]) args.get(IApplicationContext.APPLICATION_ARGS));
			setupRepositories();

			Mirroring mirroring = new Mirroring(source, destination, raw);
			mirroring.setCompare(compare);
			mirroring.setComparatorId(comparatorID);
			mirroring.setBaseline(baseline);
			mirroring.setValidate(validate);
			if (comparatorLog != null)
				mirroring.setComparatorLog(comparatorLog);

			IStatus result = mirroring.run(failOnError, verbose);
			if (!result.isOK()) {
				//only noteworthy statuses should be resulted from mirroring.run
				if (result.matches(IStatus.INFO))
					System.err.println("Mirroring completed. Please check log file for more information."); //$NON-NLS-1$
				else
					System.err.println("Mirroring completed with warnings and/or errors. Please check log file for more information."); //$NON-NLS-1$
				log(result);
			}
			return IApplication.EXIT_OK;
		} catch (Exception e) {
			// Display the error the user
			System.err.println(e.getMessage());
			// Throw the exception so it can be logged
			throw e;
		} finally {
			cleanup();
		}

		cleanup();

		return IApplication.EXIT_OK;
	}

	/*

		return result;
	}

	private void setupRepositories() throws Exception {
		if (destinationLocation == null || sourceLocation == null)
			throw new IllegalStateException(Messages.exception_needSourceDestination);

		// Attempt to load the source repository
		sourceLoaded = getManager().contains(sourceLocation);
		destinationLoaded = getManager().contains(destinationLocation);

		//must execute before initializeDestination is called
		try {
			sourceLoaded = getManager().contains(sourceLocation);
			source = getManager().loadRepository(sourceLocation, 0, null);
		} catch (Exception e) {
			// Attempt to help the user with the repository location
			sourceLocation = RepositoryHelper.fileURIHelper(sourceLocation);
			sourceLoaded = getManager().contains(sourceLocation);
			try {
				source = getManager().loadRepository(sourceLocation, 0, null);
			} catch (Exception e2) {
				// throw original error to avoid confusion
				throw e;
			}
		}

		// Attempt to load the destination repository
		try {
			destinationLoaded = getManager().contains(destinationLocation);
			destination = initializeDestination();
		} catch (Exception e) {
			// Attempt to help the user with repository location
			destinationLocation = RepositoryHelper.fileURIHelper(destinationLocation);
			destinationLoaded = getManager().contains(destinationLocation);
			try {
				destination = initializeDestination();
			} catch (Exception e2) {
				// throw original error to avoid confusion
				throw e;
			}
		}

		if (baselineLocation != null) {
			baselineLoaded = getManager().contains(baselineLocation);
			try {
				baseline = getManager().loadRepository(baselineLocation, 0, null);
			} catch (Exception e) {
				baselineLocation = RepositoryHelper.fileURIHelper(baselineLocation);
				baselineLoaded = getManager().contains(baselineLocation);
				try {
					baseline = getManager().loadRepository(baselineLocation, 0, null);
				} catch (Exception e2) {
					// catch the exception and log it. we will continue without doing a baseline comparison
					System.err.println("Error occurred while trying to load baseline repository.");
					e.printStackTrace();
				}
			}
		}
	}

	private IArtifactRepository initializeDestination() throws ProvisionException {
		IArtifactRepository repository;
		try {
			repository = getManager().loadRepository(destinationLocation, IRepositoryManager.REPOSITORY_HINT_MODIFIABLE, null);
			if (repository != null && repository.isModifiable()) {
				if (destinationName != null)
					repository.setName(destinationName);

		//This code assumes source has been successfully loaded before this point
		//No existing repository; create a new repository at destinationLocation but with source's attributes.
		// TODO for now create a Simple repo by default.
		repository = getManager().createRepository(destinationLocation, destinationName == null ? source.getName() : destinationName, IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, source.getProperties());
		if (!repository.isModifiable())
			throw new IllegalStateException(NLS.bind(Messages.Mirroring_DestinationNotModifiable, destinationLocation));
		return repository;
	}

	/* (non-Javadoc)

			String arg = args[++i];

			if (args[i - 1].equalsIgnoreCase("-comparator")) //$NON-NLS-1$
				setComparator(arg);
			if (args[i - 1].equalsIgnoreCase("-comparatorLog")) //$NON-NLS-1$
				comparatorLogLocation = arg;
			if (args[i - 1].equalsIgnoreCase("-destinationName")) //$NON-NLS-1$

			comparatorLog = getLog(comparatorLogLocation, comparatorID);
	}

	public void setComparator(String comparator) {
		// If the factory fails to load the comparator an exception will be thrown
		ArtifactComparatorFactory.getArtifactComparator(comparator);
		comparatorID = comparator;
	}

	public void setLog(IArtifactMirrorLog log) {
		mirrorLog = log;
	}

	 */
	private void cleanup() {
		//if the repository was not already loaded before the mirror application started, close it.
		if (!sourceLoaded && sourceLocation != null)
			getManager().removeRepository(sourceLocation);
		if (!destinationLoaded && destinationLocation != null)
			getManager().removeRepository(destinationLocation);
		if (baselineLocation != null && !baselineLoaded)
			getManager().removeRepository(baselineLocation);




package org.eclipse.equinox.internal.p2.repository.helpers;

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

public class RepositoryHelper {

	private static final String FILE_SCHEME = "file"; //$NON-NLS-1$

	/**
	 * Creates a new URI representing a local file from one with a null scheme, 
	 * or a one character scheme. (eg. C:\myfile, or /var/myfile)
	 * @param location the URI to convert
	 * @return the converted URI, or the original
	 */
	public static URI fileURIHelper(URI location) {
		if (location == null)
			return null;
		URI result = location;
		if (location.getScheme() == null)
			// Probably a local path:  /home/user/repo
			result = (new File(location.getPath())).getAbsoluteFile().toURI();
		else if (location.getScheme().length() == 1)
			// Likely a windows path:  C:\repo
			result = (new File(URIUtil.toUnencodedString(location))).toURI();
		else if (!FILE_SCHEME.equalsIgnoreCase(location.getScheme()))
			return result;

		// Zipped repository?
		String lowerCase = result.toString().toLowerCase();
		if (lowerCase.endsWith(".jar") || lowerCase.endsWith(".zip")) //$NON-NLS-1$//$NON-NLS-2$
			return URIUtil.toJarURI(result, null);
		return result;
	}
}

Lines 21-24 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/messages.properties (-1 / +2 lines)
21	repoMan_invalidLocation={0} is not a valid repository location	21	repoMan_invalidLocation={0} is not a valid repository location
22	CacheManager_Neither_0_nor_1_found=Neither {0} nor {1} found.	22	CacheManager_Neither_0_nor_1_found=Neither {0} nor {1} found.
23	CacheManager_AuthenticationFaileFor_0=Authentication failed for {0}	23	CacheManager_AuthenticationFaileFor_0=Authentication failed for {0}
24	CacheManager_FailedCommunicationWithRepo_0=Communication with repository at {0} failed.	24	CacheManager_FailedCommunicationWithRepo_0=Communication with repository at {0} failed.
		25	Mirroring_DestinationNotModifiable=Destination repository must be modifiable: {0}

Lines 38-41 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/Messages.java (+1 lines)
38	public static String repoMan_notExists;	38	public static String repoMan_notExists;
39	public static String repoMan_invalidLocation;	39	public static String repoMan_invalidLocation;
40		40
		41	public static String Mirroring_DestinationNotModifiable;
41	}	42	}




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

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

import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;

import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.metadata.repository.*;
import org.eclipse.equinox.internal.p2.repository.helpers.RepositoryHelper;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
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.repository.IRepositoryManager;
import org.eclipse.osgi.util.NLS;

/**
 * An application that performs mirroring of artifacts between repositories.

	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
	 */
	public Object start(IApplicationContext context) throws Exception {
		try {
			initializeFromArguments((String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS));
			setupRepositories();
			new Mirroring().mirror(source, destination, rootSpecs, transitive);

			return IApplication.EXIT_OK;
		} catch (Exception e) {
			// Display the error to the user
			System.err.println(e.getMessage());
			// Throw the exception so it can be logged
			throw e;
		} finally {
			//if the repository was not already loaded before the mirror application started, close it.
			if (!sourceLoaded && sourceLocation != null)
				getManager().removeRepository(sourceLocation);
			if (!destinationLoaded && destinationLocation != null)
				getManager().removeRepository(destinationLocation);
		}
	}

	private void setupRepositories() throws Exception {
		if (destinationLocation == null || sourceLocation == null)
			throw new IllegalStateException("Must specify a source and destination"); //$NON-NLS-1$

		// Load the source repository
		//TODO modify the contains statement once the API is available
		sourceLoaded = getManager().contains(sourceLocation);
		//TODO modify the contains statement once the API is available
		destinationLoaded = getManager().contains(destinationLocation);

		//must execute before initializeDestination is called
		try {
			sourceLoaded = getManager().contains(sourceLocation);
			source = getManager().loadRepository(sourceLocation, 0, null);
		} catch (Exception e) {
			// Retry but this time help the user
			sourceLocation = RepositoryHelper.fileURIHelper(sourceLocation);
			sourceLoaded = getManager().contains(sourceLocation);
			try {
				source = getManager().loadRepository(sourceLocation, 0, null);
			} catch (Exception e2) {
				// throw original error to avoid confusion
				throw e;
			}
		}

		try {
			destinationLoaded = getManager().contains(destinationLocation);
			destination = initializeDestination();
		} catch (Exception e) {
			// Attempt to help the user & retry
			destinationLocation = RepositoryHelper.fileURIHelper(destinationLocation);
			destinationLoaded = getManager().contains(destinationLocation);
			try {
				destination = initializeDestination();
			} catch (Exception e2) {
				// throw original error to avoid confusion
				throw e;
			}
		}
	}

	/*

	}

	private IMetadataRepository initializeDestination() throws ProvisionException {
		IMetadataRepository repository;
		try {
			repository = getManager().loadRepository(destinationLocation, IRepositoryManager.REPOSITORY_HINT_MODIFIABLE, null);
			if (repository != null && repository.isModifiable()) {
				if (destinationName != null)
					repository.setName(destinationName);

		//This code assumes source has been successfully loaded before this point
		//No existing repository; create a new repository at destinationLocation but with source's attributes.
		// TODO for now create a Simple repo by default.
		repository = getManager().createRepository(destinationLocation, destinationName == null ? source.getName() : destinationName, IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, source.getProperties());
		if (!repository.isModifiable())
			throw new IllegalStateException(NLS.bind(Messages.Mirroring_DestinationNotModifiable, destinationLocation));
		return repository;
	}

	/* (non-Javadoc)




 org.eclipse.equinox.internal.p2.core.helpers,
 org.eclipse.equinox.internal.p2.director,
 org.eclipse.equinox.internal.p2.metadata.repository,
 org.eclipse.equinox.internal.p2.repository.helpers,
 org.eclipse.equinox.internal.provisional.p2.artifact.repository,
 org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
 org.eclipse.equinox.internal.provisional.p2.core,
 org.eclipse.equinox.internal.provisional.p2.repository,
 org.eclipse.equinox.internal.provisional.p2.engine,
 org.eclipse.equinox.internal.provisional.p2.engine.phases,
 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.internal.provisional.equinox.p2.jarprocessor,
 org.eclipse.osgi.util;version="1.1.0",
 org.osgi.framework;version="1.5.0",

Lines 11-14 Link Here

(-)src/org/eclipse/equinox/p2/internal/repository/tools/messages.properties (-1 / +2 lines)
11	exception_destinationNotModifiable = The destination repository must be modifiable: {0}.	11	exception_destinationNotModifiable = The destination repository must be modifiable: {0}.
12		12
13	exception_unableToRemoveRepo=Unable to remove artifact repository file: {0}.	13	exception_unableToRemoveRepo=Unable to remove artifact repository file: {0}.
14	exception_notLocalFileRepo= {0} is not a local file based repository.	14	exception_notLocalFileRepo= {0} is not a local file based repository.
		15	Mirroring_DestinationNotModifiable=Destination repository must be modifiable: {0}




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

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

import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository;
import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
import org.eclipse.equinox.internal.p2.repository.helpers.RepositoryHelper;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
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.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
import org.eclipse.osgi.util.NLS;

public abstract class AbstractApplication {


	public void initializeRepos(IProgressMonitor progress) throws ProvisionException {
		IArtifactRepositoryManager artifactRepositoryManager = Activator.getArtifactRepositoryManager();
		if (sourceArtifactRepositories != null && !sourceArtifactRepositories.isEmpty()) {
			for (Iterator iter = sourceArtifactRepositories.iterator(); iter.hasNext();)
				loadArtifactRepo((URI) iter.next(), artifactRepositoryManager, progress);
		}

		IMetadataRepositoryManager metadataRepositoryManager = Activator.getMetadataRepositoryManager();
		if (sourceMetadataRepositories != null && !sourceMetadataRepositories.isEmpty()) {
			for (Iterator iter = sourceMetadataRepositories.iterator(); iter.hasNext();)
				loadMetadataRepo((URI) iter.next(), metadataRepositoryManager, progress);
		}

		processDestinationRepos(artifactRepositoryManager, metadataRepositoryManager);
	}

	private void loadArtifactRepo(URI repoLocation, IArtifactRepositoryManager artifactRepositoryManager, IProgressMonitor progress) throws ProvisionException {
		try {
			if (!artifactRepositoryManager.contains(repoLocation))
				artifactReposToRemove.add(repoLocation);
			artifactRepositoryManager.loadRepository(repoLocation, 0, progress);
		} catch (ProvisionException e) {
			// Wasn't added, remove from the list
			artifactReposToRemove.remove(repoLocation);
			try {
				// Attempt to help the user
				repoLocation = RepositoryHelper.fileURIHelper(repoLocation);
				if (!artifactRepositoryManager.contains(repoLocation))
					artifactReposToRemove.add(repoLocation);
				artifactRepositoryManager.loadRepository(repoLocation, 0, progress);
			} catch (ProvisionException e2) {
				throw e;
			}
		}
	}

	private void loadMetadataRepo(URI repoLocation, IMetadataRepositoryManager metadataRepositoryManager, IProgressMonitor progress) throws ProvisionException {
		// If the repository is unknown it should be removed before exiting
		try {
			if (!metadataRepositoryManager.contains(repoLocation))
				metadataReposToRemove.add(repoLocation);
			metadataRepositoryManager.loadRepository(repoLocation, 0, progress);
		} catch (ProvisionException e) {
			// Wasn't added, remove from the list
			metadataReposToRemove.remove(repoLocation);
			try {
				// Attempt to help the user by modifying the URI
				repoLocation = RepositoryHelper.fileURIHelper(repoLocation);
				if (!metadataRepositoryManager.contains(repoLocation))
					metadataReposToRemove.add(repoLocation);
				metadataRepositoryManager.loadRepository(repoLocation, 0, progress);
			} catch (ProvisionException e2) {
				// Throw original exception to avoid confusion
				throw e;
			}
		}

		processDestinationRepos(artifactRepositoryManager, metadataRepositoryManager);

	}

	private void processDestinationRepos(IArtifactRepositoryManager artifactRepositoryManager, IMetadataRepositoryManager metadataRepositoryManager) throws ProvisionException {

		}
		RepositoryDescriptor artifactRepoDescriptor = ((RepositoryDescriptor) destinationRepos.get(0)).getKind() == IRepository.TYPE_ARTIFACT ? ((RepositoryDescriptor) destinationRepos.get(0)) : ((RepositoryDescriptor) destinationRepos.get(1));
		RepositoryDescriptor metadataRepoDescriptor = ((RepositoryDescriptor) destinationRepos.get(0)).getKind() == IRepository.TYPE_METADATA ? ((RepositoryDescriptor) destinationRepos.get(0)) : ((RepositoryDescriptor) destinationRepos.get(1));

		try {
			destinationArtifactRepository = initializeDestination(artifactRepoDescriptor, artifactRepositoryManager);
		} catch (ProvisionException e) {
			try {
				// Assist the user with the URI
				artifactRepoDescriptor.setLocation(RepositoryHelper.fileURIHelper(artifactRepoDescriptor.getRepoLocation()));
				destinationArtifactRepository = initializeDestination(artifactRepoDescriptor, artifactRepositoryManager);
			} catch (Exception e2) {
				throw e;
			}
		} catch (UnsupportedOperationException e) {
			try {
				// Assist the user with the URI
				artifactRepoDescriptor.setLocation(RepositoryHelper.fileURIHelper(artifactRepoDescriptor.getRepoLocation()));
				destinationArtifactRepository = initializeDestination(artifactRepoDescriptor, artifactRepositoryManager);
			} catch (Exception e2) {
				throw e;
			}
		}

		try {
			destinationMetadataRepository = initializeDestination(metadataRepoDescriptor, metadataRepositoryManager);
		} catch (ProvisionException e) {
			try {
				// Assist the user with the URI
				metadataRepoDescriptor.setLocation(RepositoryHelper.fileURIHelper(metadataRepoDescriptor.getRepoLocation()));
				destinationMetadataRepository = initializeDestination(metadataRepoDescriptor, metadataRepositoryManager);
			} catch (Exception e2) {
				throw e;
			}
		} catch (UnsupportedOperationException e) {
			try {
				// Assist the user with the URI
				metadataRepoDescriptor.setLocation(RepositoryHelper.fileURIHelper(metadataRepoDescriptor.getRepoLocation()));
				destinationMetadataRepository = initializeDestination(metadataRepoDescriptor, metadataRepositoryManager);
			} catch (Exception e2) {
				throw e;
			}
		}
	}

	private IMetadataRepository initializeDestination(RepositoryDescriptor toInit, IMetadataRepositoryManager mgr) throws ProvisionException {

		//This code assumes source has been successfully loaded before this point
		//No existing repository; create a new repository at destinationLocation but with source's attributes.
		IMetadataRepository result = mgr.createRepository(toInit.getRepoLocation(), toInit.getName() != null ? toInit.getName() : (source != null ? source.getName() : toInit.getRepoLocation().toString()), IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, source != null ? source.getProperties() : null);
		// Ensure destination is modifiable
		if (!result.isModifiable())
			throw new IllegalStateException(NLS.bind(Messages.Mirroring_DestinationNotModifiable, toInit.getRepoLocation()));
		if (toInit.isCompressed() && !result.getProperties().containsKey(IRepository.PROP_COMPRESSED))
			result.setProperty(IRepository.PROP_COMPRESSED, "true"); //$NON-NLS-1$
		return result;

		//No existing repository; create a new repository at destinationLocation but with source's attributes.
		// TODO for now create a Simple repo by default.
		IArtifactRepository result = mgr.createRepository(toInit.getRepoLocation(), toInit.getName() != null ? toInit.getName() : (source != null ? source.getName() : toInit.getRepoLocation().toString()), IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, source != null ? source.getProperties() : null);

		// Ensure destination is modifiable
		if (!result.isModifiable())
			throw new IllegalStateException(NLS.bind(Messages.Mirroring_DestinationNotModifiable, toInit.getRepoLocation()));

		if (toInit.isCompressed() && !result.getProperties().containsKey(IRepository.PROP_COMPRESSED))
			result.setProperty(IRepository.PROP_COMPRESSED, "true"); //$NON-NLS-1$
		return result;

Lines 17-22 Link Here

(-)src/org/eclipse/equinox/p2/internal/repository/tools/Messages.java (+2 lines)
17	public static String exception_destinationNotModifiable;	17	public static String exception_destinationNotModifiable;
18	public static String exception_unableToRemoveRepo;	18	public static String exception_unableToRemoveRepo;
19	public static String exception_notLocalFileRepo;	19	public static String exception_notLocalFileRepo;
		20	public static String Mirroring_DestinationNotModifiable;
		21
20	static {	22	static {
21	// initialize resource bundles	23	// initialize resource bundles
22	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	24	NLS.initializeMessages(BUNDLE_NAME, Messages.class);




 *******************************************************************************/
package org.eclipse.equinox.p2.tests.mirror;

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

import java.io.*;
import java.net.*;
import java.util.*;

import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
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.IRepository;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.p2.tests.TestActivator;
import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;

			fail("Error verifying log", e);
		}
	}

	/**
	 * Test how the mirror application handles a repository specified without a scheme (eg: /usr/ or C:/usr)
	 */
	public void testArtifactMirrorNonURIDest() {
		String[] args = new String[] {"-destination", destRepoLocation.toString(), "-source", sourceRepoLocation.toString()};

		try {
			runMirrorApplication("Mirroring", args);
			assertContentEquals("2.1", getArtifactRepositoryManager().loadRepository(sourceRepoLocation.toURI(), null), getArtifactRepositoryManager().loadRepository(destRepoLocation.toURI(), null));
		} catch (Exception e) {
			fail("Error mirroring", e);
		}
	}
}




 *******************************************************************************/
package org.eclipse.equinox.p2.tests.mirror;

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

import java.io.File;
import java.net.*;
import java.util.HashMap;

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.IRepository;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.osgi.framework.Bundle;


			fail("Could not load destination", e);
		}
	}

	/**
	 * Test how the mirror application handles a repository specified without a scheme (eg: /usr/ or C:/usr)
	 */
	public void testMetadataMirrorNonURIDest() {
		String[] args = new String[] {"-destination", destRepoLocation.toString(), "-source", sourceRepoLocation.toString()};

		try {
			runMirrorApplication("Mirroring", args);
			assertContentEquals("2.1", getMetadataRepositoryManager().loadRepository(sourceRepoLocation.toURI(), null), getMetadataRepositoryManager().loadRepository(destRepoLocation.toURI(), null));
		} catch (Exception e) {
			fail("Error mirroring", e);
		}
	}
}

Return to bug 264110

Lines 21-28 Link Here

(-)src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java (-42 / +89 lines)
21	import org.eclipse.equinox.internal.p2.artifact.repository.*;	21	import org.eclipse.equinox.internal.p2.artifact.repository.*;
22	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;	22	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
23	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;	23	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
24	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	24	import org.eclipse.equinox.internal.p2.repository.helpers.RepositoryHelper;
25	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	25	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
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.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;
Lines 58-88 Link Here
58	* @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)	58	* @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
59	*/	59	*/
60	public Object start(IApplicationContext context) throws Exception {	60	public Object start(IApplicationContext context) throws Exception {
61	Map args = context.getArguments();	61	try {
62	initializeFromArguments((String[]) args.get(IApplicationContext.APPLICATION_ARGS));	62	Map args = context.getArguments();
63	setupRepositories();	63	initializeFromArguments((String[]) args.get(IApplicationContext.APPLICATION_ARGS));
64		64	setupRepositories();
65	Mirroring mirroring = new Mirroring(source, destination, raw);	65
66	mirroring.setCompare(compare);	66	Mirroring mirroring = new Mirroring(source, destination, raw);
67	mirroring.setComparatorId(comparatorID);	67	mirroring.setCompare(compare);
68	mirroring.setBaseline(baseline);	68	mirroring.setComparatorId(comparatorID);
69	mirroring.setValidate(validate);	69	mirroring.setBaseline(baseline);
70	if (comparatorLog != null)	70	mirroring.setValidate(validate);
71	mirroring.setComparatorLog(comparatorLog);	71	if (comparatorLog != null)
72		72	mirroring.setComparatorLog(comparatorLog);
73	IStatus result = mirroring.run(failOnError, verbose);	73
74	if (!result.isOK()) {	74	IStatus result = mirroring.run(failOnError, verbose);
75	//only noteworthy statuses should be resulted from mirroring.run	75	if (!result.isOK()) {
76	if (result.matches(IStatus.INFO))	76	//only noteworthy statuses should be resulted from mirroring.run
77	System.err.println("Mirroring completed. Please check log file for more information."); //$NON-NLS-1$	77	if (result.matches(IStatus.INFO))
78	else	78	System.err.println("Mirroring completed. Please check log file for more information."); //$NON-NLS-1$
79	System.err.println("Mirroring completed with warnings and/or errors. Please check log file for more information."); //$NON-NLS-1$	79	else
80	log(result);	80	System.err.println("Mirroring completed with warnings and/or errors. Please check log file for more information."); //$NON-NLS-1$
		81	log(result);
		82	}
		83	return IApplication.EXIT_OK;
		84	} catch (Exception e) {
		85	// Display the error the user
		86	System.err.println(e.getMessage());
		87	// Throw the exception so it can be logged
		88	throw e;
		89	} finally {
		90	cleanup();
81	}	91	}
82
83	cleanup();
84
85	return IApplication.EXIT_OK;
86	}	92	}
87		93
88	/*	94	/*
Lines 102-134 Link Here
102	return result;	108	return result;
103	}	109	}
104		110
105	private void setupRepositories() throws ProvisionException {	111	private void setupRepositories() throws Exception {
106	if (destinationLocation == null \|\| sourceLocation == null)	112	if (destinationLocation == null \|\| sourceLocation == null)
107	throw new IllegalStateException(Messages.exception_needSourceDestination);	113	throw new IllegalStateException(Messages.exception_needSourceDestination);
108		114
109	//Check if repositories are already loaded	115	// Attempt to load the source repository
110	sourceLoaded = getManager().contains(sourceLocation);
111	destinationLoaded = getManager().contains(destinationLocation);
112
113	//must execute before initializeDestination is called	116	//must execute before initializeDestination is called
114	source = getManager().loadRepository(sourceLocation, 0, null);	117	try {
115	destination = initializeDestination();	118	sourceLoaded = getManager().contains(sourceLocation);
		119	source = getManager().loadRepository(sourceLocation, 0, null);
		120	} catch (Exception e) {
		121	// Attempt to help the user with the repository location
		122	sourceLocation = RepositoryHelper.fileURIHelper(sourceLocation);
		123	sourceLoaded = getManager().contains(sourceLocation);
		124	try {
		125	source = getManager().loadRepository(sourceLocation, 0, null);
		126	} catch (Exception e2) {
		127	// throw original error to avoid confusion
		128	throw e;
		129	}
		130	}
		131
		132	// Attempt to load the destination repository
		133	try {
		134	destinationLoaded = getManager().contains(destinationLocation);
		135	destination = initializeDestination();
		136	} catch (Exception e) {
		137	// Attempt to help the user with repository location
		138	destinationLocation = RepositoryHelper.fileURIHelper(destinationLocation);
		139	destinationLoaded = getManager().contains(destinationLocation);
		140	try {
		141	destination = initializeDestination();
		142	} catch (Exception e2) {
		143	// throw original error to avoid confusion
		144	throw e;
		145	}
		146	}
116		147
117	if (baselineLocation != null) {	148	if (baselineLocation != null) {
118	baselineLoaded = getManager().contains(baselineLocation);	149	baselineLoaded = getManager().contains(baselineLocation);
119	try {	150	try {
120	baseline = getManager().loadRepository(baselineLocation, 0, null);	151	baseline = getManager().loadRepository(baselineLocation, 0, null);
121	} catch (ProvisionException e) {	152	} catch (Exception e) {
122	// catch the exception and log it. we will continue without doing a baseline comparison	153	baselineLocation = RepositoryHelper.fileURIHelper(baselineLocation);
123	System.err.println("Error occurred while trying to load baseline repository.");	154	baselineLoaded = getManager().contains(baselineLocation);
124	e.printStackTrace();	155	try {
		156	baseline = getManager().loadRepository(baselineLocation, 0, null);
		157	} catch (Exception e2) {
		158	// catch the exception and log it. we will continue without doing a baseline comparison
		159	System.err.println("Error occurred while trying to load baseline repository.");
		160	e.printStackTrace();
		161	}
125	}	162	}
126	}	163	}
127	}	164	}
128		165
129	private IArtifactRepository initializeDestination() throws ProvisionException {	166	private IArtifactRepository initializeDestination() throws ProvisionException {
		167	IArtifactRepository repository;
130	try {	168	try {
131	IArtifactRepository repository = getManager().loadRepository(destinationLocation, IRepositoryManager.REPOSITORY_HINT_MODIFIABLE, null);	169	repository = getManager().loadRepository(destinationLocation, IRepositoryManager.REPOSITORY_HINT_MODIFIABLE, null);
132	if (repository != null && repository.isModifiable()) {	170	if (repository != null && repository.isModifiable()) {
133	if (destinationName != null)	171	if (destinationName != null)
134	repository.setName(destinationName);	172	repository.setName(destinationName);
Lines 142-148 Link Here
142	//This code assumes source has been successfully loaded before this point	180	//This code assumes source has been successfully loaded before this point
143	//No existing repository; create a new repository at destinationLocation but with source's attributes.	181	//No existing repository; create a new repository at destinationLocation but with source's attributes.
144	// TODO for now create a Simple repo by default.	182	// TODO for now create a Simple repo by default.
145	return getManager().createRepository(destinationLocation, destinationName == null ? source.getName() : destinationName, IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, source.getProperties());	183	repository = getManager().createRepository(destinationLocation, destinationName == null ? source.getName() : destinationName, IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, source.getProperties());
		184	if (!repository.isModifiable())
		185	throw new IllegalStateException(NLS.bind(Messages.Mirroring_DestinationNotModifiable, destinationLocation));
		186	return repository;
146	}	187	}
147		188
148	/* (non-Javadoc)	189	/* (non-Javadoc)
Lines 180-186 Link Here
180	String arg = args[++i];	221	String arg = args[++i];
181		222
182	if (args[i - 1].equalsIgnoreCase("-comparator")) //$NON-NLS-1$	223	if (args[i - 1].equalsIgnoreCase("-comparator")) //$NON-NLS-1$
183	comparatorID = arg;	224	setComparator(arg);
184	if (args[i - 1].equalsIgnoreCase("-comparatorLog")) //$NON-NLS-1$	225	if (args[i - 1].equalsIgnoreCase("-comparatorLog")) //$NON-NLS-1$
185	comparatorLogLocation = arg;	226	comparatorLogLocation = arg;
186	if (args[i - 1].equalsIgnoreCase("-destinationName")) //$NON-NLS-1$	227	if (args[i - 1].equalsIgnoreCase("-destinationName")) //$NON-NLS-1$
Lines 211-216 Link Here
211	comparatorLog = getLog(comparatorLogLocation, comparatorID);	252	comparatorLog = getLog(comparatorLogLocation, comparatorID);
212	}	253	}
213		254
		255	public void setComparator(String comparator) {
		256	// If the factory fails to load the comparator an exception will be thrown
		257	ArtifactComparatorFactory.getArtifactComparator(comparator);
		258	comparatorID = comparator;
		259	}
		260
214	public void setLog(IArtifactMirrorLog log) {	261	public void setLog(IArtifactMirrorLog log) {
215	mirrorLog = log;	262	mirrorLog = log;
216	}	263	}
Lines 242-250 Link Here
242	*/	289	*/
243	private void cleanup() {	290	private void cleanup() {
244	//if the repository was not already loaded before the mirror application started, close it.	291	//if the repository was not already loaded before the mirror application started, close it.
245	if (!sourceLoaded)	292	if (!sourceLoaded && sourceLocation != null)
246	getManager().removeRepository(sourceLocation);	293	getManager().removeRepository(sourceLocation);
247	if (!destinationLoaded)	294	if (!destinationLoaded && destinationLocation != null)
248	getManager().removeRepository(destinationLocation);	295	getManager().removeRepository(destinationLocation);
249	if (baselineLocation != null && !baselineLoaded)	296	if (baselineLocation != null && !baselineLoaded)
250	getManager().removeRepository(baselineLocation);	297	getManager().removeRepository(baselineLocation);

Added Link Here

(-)src/org/eclipse/equinox/internal/p2/repository/helpers/RepositoryHelper.java (+36 lines)
1	package org.eclipse.equinox.internal.p2.repository.helpers;
2
3	import java.io.File;
4	import java.net.URI;
5	import org.eclipse.core.runtime.URIUtil;
6
7	public class RepositoryHelper {
8
9	private static final String FILE_SCHEME = "file"; //$NON-NLS-1$
10
11	/**
12	* Creates a new URI representing a local file from one with a null scheme,
13	* or a one character scheme. (eg. C:\myfile, or /var/myfile)
14	* @param location the URI to convert
15	* @return the converted URI, or the original
16	*/
17	public static URI fileURIHelper(URI location) {
18	if (location == null)
19	return null;
20	URI result = location;
21	if (location.getScheme() == null)
22	// Probably a local path: /home/user/repo
23	result = (new File(location.getPath())).getAbsoluteFile().toURI();
24	else if (location.getScheme().length() == 1)
25	// Likely a windows path: C:\repo
26	result = (new File(URIUtil.toUnencodedString(location))).toURI();
27	else if (!FILE_SCHEME.equalsIgnoreCase(location.getScheme()))
28	return result;
29
30	// Zipped repository?
31	String lowerCase = result.toString().toLowerCase();
32	if (lowerCase.endsWith(".jar") \|\| lowerCase.endsWith(".zip")) //$NON-NLS-1$//$NON-NLS-2$
33	return URIUtil.toJarURI(result, null);
34	return result;
35	}
36	}

Lines 10-17 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/mirror/MirrorApplication.java (-24 / +59 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
15	import java.net.URI;	13	import java.net.URI;
16	import java.net.URISyntaxException;	14	import java.net.URISyntaxException;
17	import java.util.*;	15	import java.util.*;
Lines 19-29 Link Here
19	import org.eclipse.equinox.app.IApplication;	17	import org.eclipse.equinox.app.IApplication;
20	import org.eclipse.equinox.app.IApplicationContext;	18	import org.eclipse.equinox.app.IApplicationContext;
21	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;	19	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
22	import org.eclipse.equinox.internal.p2.metadata.repository.Activator;	20	import org.eclipse.equinox.internal.p2.metadata.repository.*;
23	import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;	21	import org.eclipse.equinox.internal.p2.repository.helpers.RepositoryHelper;
24	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	22	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
26	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.IRepositoryManager;
		26	import org.eclipse.osgi.util.NLS;
27		27
28	/**	28	/**
29	* An application that performs mirroring of artifacts between repositories.	29	* An application that performs mirroring of artifacts between repositories.
Lines 66-95 Link Here
66	* @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)	66	* @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
67	*/	67	*/
68	public Object start(IApplicationContext context) throws Exception {	68	public Object start(IApplicationContext context) throws Exception {
69	initializeFromArguments((String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS));	69	try {
70	setupRepositories();	70	initializeFromArguments((String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS));
71	new Mirroring().mirror(source, destination, rootSpecs, transitive);	71	setupRepositories();
72	//if the repository was not already loaded before the mirror application started, close it.	72	new Mirroring().mirror(source, destination, rootSpecs, transitive);
73	if (!sourceLoaded)	73
74	getManager().removeRepository(sourceLocation);	74	return IApplication.EXIT_OK;
75	if (!destinationLoaded)	75	} catch (Exception e) {
76	getManager().removeRepository(destinationLocation);	76	// Display the error to the user
77	return IApplication.EXIT_OK;	77	System.err.println(e.getMessage());
		78	// Throw the exception so it can be logged
		79	throw e;
		80	} finally {
		81	//if the repository was not already loaded before the mirror application started, close it.
		82	if (!sourceLoaded && sourceLocation != null)
		83	getManager().removeRepository(sourceLocation);
		84	if (!destinationLoaded && destinationLocation != null)
		85	getManager().removeRepository(destinationLocation);
		86	}
78	}	87	}
79		88
80	private void setupRepositories() throws ProvisionException {	89	private void setupRepositories() throws Exception {
81	if (destinationLocation == null \|\| sourceLocation == null)	90	if (destinationLocation == null \|\| sourceLocation == null)
82	throw new IllegalStateException("Must specify a source and destination"); //$NON-NLS-1$	91	throw new IllegalStateException("Must specify a source and destination"); //$NON-NLS-1$
83		92
84	//Check if repositories are already loaded	93	// Load the source repository
85	//TODO modify the contains statement once the API is available
86	sourceLoaded = getManager().contains(sourceLocation);
87	//TODO modify the contains statement once the API is available
88	destinationLoaded = getManager().contains(destinationLocation);
89
90	//must execute before initializeDestination is called	94	//must execute before initializeDestination is called
91	source = getManager().loadRepository(sourceLocation, 0, null);	95	try {
92	destination = initializeDestination();	96	sourceLoaded = getManager().contains(sourceLocation);
		97	source = getManager().loadRepository(sourceLocation, 0, null);
		98	} catch (Exception e) {
		99	// Retry but this time help the user
		100	sourceLocation = RepositoryHelper.fileURIHelper(sourceLocation);
		101	sourceLoaded = getManager().contains(sourceLocation);
		102	try {
		103	source = getManager().loadRepository(sourceLocation, 0, null);
		104	} catch (Exception e2) {
		105	// throw original error to avoid confusion
		106	throw e;
		107	}
		108	}
		109
		110	try {
		111	destinationLoaded = getManager().contains(destinationLocation);
		112	destination = initializeDestination();
		113	} catch (Exception e) {
		114	// Attempt to help the user & retry
		115	destinationLocation = RepositoryHelper.fileURIHelper(destinationLocation);
		116	destinationLoaded = getManager().contains(destinationLocation);
		117	try {
		118	destination = initializeDestination();
		119	} catch (Exception e2) {
		120	// throw original error to avoid confusion
		121	throw e;
		122	}
		123	}
93	}	124	}
94		125
95	/*	126	/*
Lines 110-117 Link Here
110	}	141	}
111		142
112	private IMetadataRepository initializeDestination() throws ProvisionException {	143	private IMetadataRepository initializeDestination() throws ProvisionException {
		144	IMetadataRepository repository;
113	try {	145	try {
114	IMetadataRepository repository = getManager().loadRepository(destinationLocation, IRepositoryManager.REPOSITORY_HINT_MODIFIABLE, null);	146	repository = getManager().loadRepository(destinationLocation, IRepositoryManager.REPOSITORY_HINT_MODIFIABLE, null);
115	if (repository != null && repository.isModifiable()) {	147	if (repository != null && repository.isModifiable()) {
116	if (destinationName != null)	148	if (destinationName != null)
117	repository.setName(destinationName);	149	repository.setName(destinationName);
Lines 125-131 Link Here
125	//This code assumes source has been successfully loaded before this point	157	//This code assumes source has been successfully loaded before this point
126	//No existing repository; create a new repository at destinationLocation but with source's attributes.	158	//No existing repository; create a new repository at destinationLocation but with source's attributes.
127	// TODO for now create a Simple repo by default.	159	// TODO for now create a Simple repo by default.
128	return getManager().createRepository(destinationLocation, destinationName == null ? source.getName() : destinationName, IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, source.getProperties());	160	repository = getManager().createRepository(destinationLocation, destinationName == null ? source.getName() : destinationName, IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, source.getProperties());
		161	if (!repository.isModifiable())
		162	throw new IllegalStateException(NLS.bind(Messages.Mirroring_DestinationNotModifiable, destinationLocation));
		163	return repository;
129	}	164	}
130		165
131	/* (non-Javadoc)	166	/* (non-Javadoc)

Lines 16-31 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
16	org.eclipse.equinox.internal.p2.core.helpers,	16	org.eclipse.equinox.internal.p2.core.helpers,
17	org.eclipse.equinox.internal.p2.director,	17	org.eclipse.equinox.internal.p2.director,
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.provisional.p2.artifact.repository,	20	org.eclipse.equinox.internal.provisional.p2.artifact.repository,
20	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,	21	org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,
21	org.eclipse.equinox.internal.provisional.p2.core,	22	org.eclipse.equinox.internal.provisional.p2.core,
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,
26	org.eclipse.equinox.internal.provisional.p2.metadata.query,	26	org.eclipse.equinox.internal.provisional.p2.metadata.query,
27	org.eclipse.equinox.internal.provisional.p2.metadata.repository,	27	org.eclipse.equinox.internal.provisional.p2.metadata.repository,
28	org.eclipse.equinox.internal.provisional.p2.query,	28	org.eclipse.equinox.internal.provisional.p2.query,
		29	org.eclipse.equinox.internal.provisional.p2.repository,
29	org.eclipse.internal.provisional.equinox.p2.jarprocessor,	30	org.eclipse.internal.provisional.equinox.p2.jarprocessor,
30	org.eclipse.osgi.util;version="1.1.0",	31	org.eclipse.osgi.util;version="1.1.0",
31	org.osgi.framework;version="1.5.0",	32	org.osgi.framework;version="1.5.0",

Lines 10-17 Link Here

(-)src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java (-2 / +15 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
15	import java.io.*;	13	import java.io.*;
16	import java.net.*;	14	import java.net.*;
17	import java.util.*;	15	import java.util.*;
Lines 27-32 Link Here
27	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	25	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
28	import org.eclipse.equinox.internal.provisional.p2.core.Version;	26	import org.eclipse.equinox.internal.provisional.p2.core.Version;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
		28	import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
30	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	29	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
31	import org.eclipse.equinox.p2.tests.TestActivator;	30	import org.eclipse.equinox.p2.tests.TestActivator;
32	import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;	31	import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
Lines 1464-1467 Link Here
1464	fail("Error verifying log", e);	1463	fail("Error verifying log", e);
1465	}	1464	}
1466	}	1465	}
		1466
		1467	/**
		1468	* Test how the mirror application handles a repository specified without a scheme (eg: /usr/ or C:/usr)
		1469	*/
		1470	public void testArtifactMirrorNonURIDest() {
		1471	String[] args = new String[] {"-destination", destRepoLocation.toString(), "-source", sourceRepoLocation.toString()};
		1472
		1473	try {
		1474	runMirrorApplication("Mirroring", args);
		1475	assertContentEquals("2.1", getArtifactRepositoryManager().loadRepository(sourceRepoLocation.toURI(), null), getArtifactRepositoryManager().loadRepository(destRepoLocation.toURI(), null));
		1476	} catch (Exception e) {
		1477	fail("Error mirroring", e);
		1478	}
		1479	}
1467	}	1480	}