Attachment 130845 Details for Bug 264110 – Director app, Ant tasks

[patch] Director app, Ant tasks

Tasks.patch (text/plain), 20.65 KB, created by Matthew Piggott

on 2009-04-03 11:40:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Piggott

Created: 2009-04-03 11:40:27 EDT

Size: 20.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.metadata.repository
>Index: src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/AddChildTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/AddChildTask.java,v
>retrieving revision 1.1
>diff -u -r1.1 AddChildTask.java
>--- src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/AddChildTask.java	13 Jan 2009 23:26:52 -0000	1.1
>+++ src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/AddChildTask.java	2 Apr 2009 21:25:45 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
> import org.eclipse.equinox.internal.p2.metadata.repository.Activator;
> 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.core.ProvisionException;
> import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
> 
>@@ -42,10 +43,14 @@
> 		CompositeMetadataRepository repo = null;
> 		try {
> 			repo = (CompositeMetadataRepository) manager.loadRepository(location, null);
>+			// Ensure the destination is valid
>+			RepositoryHelper.validDestinationRepository(repo);
> 		} catch (ClassCastException e) {
> 			throw new BuildException("Repository at location: " + location + " is not a composite metadata repository.");
> 		} catch (ProvisionException e) {
> 			throw new BuildException("Error occurred while loading repository.", e);
>+		} catch (IllegalStateException e) {
>+			throw new BuildException(e.getMessage(), e);
> 		}
> 
> 		// add the child
>@@ -67,13 +72,13 @@
> 	 * Set the location of the composite repository.
> 	 */
> 	public void setLocation(String value) throws URISyntaxException {
>-		location = URIUtil.fromString(value);
>+		location = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
> 	 * Set the location of the child repository.
> 	 */
> 	public void setChild(String value) throws URISyntaxException {
>-		child = URIUtil.fromString(value);
>+		child = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> }
>Index: src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java,v
>retrieving revision 1.5
>diff -u -r1.5 CreateCompositeMetadataRepositoryTask.java
>--- src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java	30 Mar 2009 01:48:54 -0000	1.5
>+++ src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java	2 Apr 2009 21:25:45 -0000
>@@ -10,8 +10,6 @@
>  *******************************************************************************/
> package org.eclipse.equinox.internal.p2.metadata.repository.ant;
> 
>-import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
>-
> import java.net.URI;
> import java.net.URISyntaxException;
> import java.util.HashMap;
>@@ -22,9 +20,11 @@
> import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
> import org.eclipse.equinox.internal.p2.metadata.repository.Activator;
> 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.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;
> 
> /**
>  * Ant task for creating a new composite metadata repository.
>@@ -89,7 +89,7 @@
> 	 * Set the repository location.
> 	 */
> 	public void setLocation(String value) throws URISyntaxException {
>-		location = URIUtil.fromString(value);
>+		location = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
>Index: src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/RemoveChildTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/RemoveChildTask.java,v
>retrieving revision 1.2
>diff -u -r1.2 RemoveChildTask.java
>--- src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/RemoveChildTask.java	17 Jan 2009 01:31:50 -0000	1.2
>+++ src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/RemoveChildTask.java	2 Apr 2009 21:25:45 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
> import org.eclipse.equinox.internal.p2.metadata.repository.Activator;
> 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.core.ProvisionException;
> import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
> 
>@@ -42,8 +43,11 @@
> 		CompositeMetadataRepository repo;
> 		try {
> 			repo = (CompositeMetadataRepository) manager.loadRepository(location, null);
>+			RepositoryHelper.validDestinationRepository(repo);
> 		} catch (ProvisionException e) {
> 			throw new BuildException("Error occurred while loading repository.", e);
>+		} catch (IllegalStateException e) {
>+			throw new BuildException(e.getMessage(), e);
> 		}
> 
> 		// remove all the children repositories if requested, otherwise
>@@ -58,14 +62,14 @@
> 	 * Set the location of the composite repository.
> 	 */
> 	public void setLocation(String value) throws URISyntaxException {
>-		location = URIUtil.fromString(value);
>+		location = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
> 	 * Set the location of the child repository to remove.
> 	 */
> 	public void setChild(String value) throws URISyntaxException {
>-		child = URIUtil.fromString(value);
>+		child = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
>#P org.eclipse.equinox.p2.director.app
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF,v
>retrieving revision 1.17
>diff -u -r1.17 MANIFEST.MF
>--- META-INF/MANIFEST.MF	30 Mar 2009 01:49:14 -0000	1.17
>+++ META-INF/MANIFEST.MF	2 Apr 2009 21:03:33 -0000
>@@ -9,10 +9,10 @@
>  org.eclipse.equinox.internal.p2.console,
>  org.eclipse.equinox.internal.p2.core.helpers,
>  org.eclipse.equinox.internal.p2.engine,
>+ 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.location,
>- org.eclipse.equinox.internal.provisional.p2.repository,
>  org.eclipse.equinox.internal.provisional.p2.director,
>  org.eclipse.equinox.internal.provisional.p2.engine,
>  org.eclipse.equinox.internal.provisional.p2.engine.phases,
>@@ -20,6 +20,7 @@
>  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.osgi.service.environment,
>  org.eclipse.osgi.service.resolver;version="1.1.0",
>  org.osgi.framework
>Index: src/org/eclipse/equinox/internal/p2/director/app/Application.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java,v
>retrieving revision 1.50
>diff -u -r1.50 Application.java
>--- src/org/eclipse/equinox/internal/p2/director/app/Application.java	26 Mar 2009 15:17:05 -0000	1.50
>+++ src/org/eclipse/equinox/internal/p2/director/app/Application.java	2 Apr 2009 21:03:34 -0000
>@@ -22,6 +22,7 @@
> import org.eclipse.equinox.internal.p2.console.ProvisioningHelper;
> 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.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.*;
> import org.eclipse.equinox.internal.provisional.p2.core.Version;
>@@ -178,6 +179,7 @@
> 				boolean anyValid = false; // do we have any valid repos or did they all fail to load?
> 				artifactReposForRemoval = new URI[artifactRepositoryLocations.length];
> 				for (int i = 0; i < artifactRepositoryLocations.length; i++) {
>+					artifactRepositoryLocations[i] = RepositoryHelper.localRepoURIHelper(artifactRepositoryLocations[i]);
> 					try {
> 						if (!artifactManager.contains(artifactRepositoryLocations[i])) {
> 							artifactManager.loadRepository(artifactRepositoryLocations[i], null);
>@@ -208,6 +210,7 @@
> 				boolean anyValid = false; // do we have any valid repos or did they all fail to load?
> 				metadataReposForRemoval = new URI[metadataRepositoryLocations.length];
> 				for (int i = 0; i < metadataRepositoryLocations.length; i++) {
>+					metadataRepositoryLocations[i] = RepositoryHelper.localRepoURIHelper(metadataRepositoryLocations[i]);
> 					try {
> 						if (!metadataManager.contains(metadataRepositoryLocations[i])) {
> 							metadataManager.loadRepository(metadataRepositoryLocations[i], null);
>#P org.eclipse.equinox.p2.repository.tools
>Index: src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryDescriptor.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryDescriptor.java,v
>retrieving revision 1.3
>diff -u -r1.3 RepositoryDescriptor.java
>--- src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryDescriptor.java	30 Mar 2009 01:49:17 -0000	1.3
>+++ src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryDescriptor.java	3 Apr 2009 15:37:40 -0000
>@@ -10,9 +10,9 @@
>  *******************************************************************************/
> package org.eclipse.equinox.p2.internal.repository.tools;
> 
>-import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
>-
> import java.net.URI;
>+import org.eclipse.equinox.internal.p2.repository.helpers.RepositoryHelper;
>+import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
> 
> public class RepositoryDescriptor {
> 
>@@ -32,7 +32,7 @@
> 	}
> 
> 	public void setLocation(URI repoLocation) {
>-		location = repoLocation;
>+		location = RepositoryHelper.localRepoURIHelper(repoLocation);
> 	}
> 
> 	public void setFormat(String format) {
>Index: src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ProcessRepoTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ProcessRepoTask.java,v
>retrieving revision 1.2
>diff -u -r1.2 ProcessRepoTask.java
>--- src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ProcessRepoTask.java	3 Mar 2009 18:45:08 -0000	1.2
>+++ src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ProcessRepoTask.java	3 Apr 2009 15:37:40 -0000
>@@ -20,6 +20,7 @@
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.URIUtil;
> import org.eclipse.equinox.internal.p2.jarprocessor.ant.JarProcessorTask;
>+import org.eclipse.equinox.internal.p2.repository.helpers.RepositoryHelper;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication;
> import org.eclipse.equinox.p2.internal.repository.tools.RepositoryDescriptor;
>@@ -111,7 +112,7 @@
> 
> 	public void setRepositoryPath(String repository) {
> 		try {
>-			this.repository = URIUtil.fromString(repository);
>+			this.repository = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(repository));
> 		} catch (URISyntaxException e) {
> 			throw new IllegalArgumentException("Repository location (" + repository + ") must be a URL."); //$NON-NLS-1$ //$NON-NLS-2$
> 		}
>#P org.eclipse.equinox.p2.artifact.repository
>Index: src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/AddChildTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/AddChildTask.java,v
>retrieving revision 1.1
>diff -u -r1.1 AddChildTask.java
>--- src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/AddChildTask.java	13 Jan 2009 23:26:59 -0000	1.1
>+++ src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/AddChildTask.java	2 Apr 2009 21:20:10 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
> import org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository;
> 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.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> 
>@@ -42,8 +43,12 @@
> 		CompositeArtifactRepository repo = null;
> 		try {
> 			repo = (CompositeArtifactRepository) manager.loadRepository(location, null);
>+			// Ensure the destination is valid
>+			RepositoryHelper.validDestinationRepository(repo);
> 		} catch (ProvisionException e) {
> 			throw new BuildException("Exception while loading repository.", e);
>+		} catch (IllegalStateException e) {
>+			throw new BuildException(e.getMessage(), e);
> 		}
> 
> 		// just do a straight add if the user didn't specify a comparator.
>@@ -63,14 +68,14 @@
> 	 * Set the location of the composite repository.
> 	 */
> 	public void setLocation(String value) throws URISyntaxException {
>-		location = URIUtil.fromString(value);
>+		location = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
> 	 * Set the location of the child repository.
> 	 */
> 	public void setChild(String value) throws URISyntaxException {
>-		child = URIUtil.fromString(value);
>+		child = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
>Index: src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/CreateCompositeArtifactRepositoryTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/CreateCompositeArtifactRepositoryTask.java,v
>retrieving revision 1.5
>diff -u -r1.5 CreateCompositeArtifactRepositoryTask.java
>--- src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/CreateCompositeArtifactRepositoryTask.java	30 Mar 2009 01:49:13 -0000	1.5
>+++ src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/CreateCompositeArtifactRepositoryTask.java	2 Apr 2009 21:20:10 -0000
>@@ -20,6 +20,7 @@
> import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
> import org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository;
> 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.IArtifactRepository;
> import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
>@@ -72,9 +73,13 @@
> 
> 		// create the repository
> 		try {
>-			manager.createRepository(location, name, IArtifactRepositoryManager.TYPE_COMPOSITE_REPOSITORY, properties);
>+			IArtifactRepository repo = manager.createRepository(location, name, IArtifactRepositoryManager.TYPE_COMPOSITE_REPOSITORY, properties);
>+			// Check if the destination is valid
>+			RepositoryHelper.validDestinationRepository(repo);
> 		} catch (ProvisionException e) {
> 			throw new BuildException("Error occurred while creating composite artifact repository.", e);
>+		} catch (IllegalStateException e) {
>+			throw new BuildException(e.getMessage(), e);
> 		}
> 	}
> 
>@@ -99,7 +104,7 @@
> 	 * Set the location of the repository.
> 	 */
> 	public void setLocation(String value) throws URISyntaxException {
>-		location = URIUtil.fromString(value);
>+		location = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
>Index: src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/RemoveChildTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/RemoveChildTask.java,v
>retrieving revision 1.2
>diff -u -r1.2 RemoveChildTask.java
>--- src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/RemoveChildTask.java	17 Jan 2009 01:31:49 -0000	1.2
>+++ src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/RemoveChildTask.java	2 Apr 2009 21:20:10 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
> import org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository;
> 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.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> 
>@@ -42,6 +43,8 @@
> 		CompositeArtifactRepository repo;
> 		try {
> 			repo = (CompositeArtifactRepository) manager.loadRepository(location, null);
>+			// Ensure the destination is valid
>+			RepositoryHelper.validDestinationRepository(repo);
> 		} catch (ProvisionException e) {
> 			throw new BuildException("Error occurred while loading repository.", e);
> 		}
>@@ -57,14 +60,14 @@
> 	 * Set the repository location.
> 	 */
> 	public void setLocation(String value) throws URISyntaxException {
>-		location = URIUtil.fromString(value);
>+		location = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
> 	 * Set the child repository location.
> 	 */
> 	public void setChild(String value) throws URISyntaxException {
>-		child = URIUtil.fromString(value);
>+		child = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*
>Index: src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/ValidateTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/ValidateTask.java,v
>retrieving revision 1.1
>diff -u -r1.1 ValidateTask.java
>--- src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/ValidateTask.java	13 Jan 2009 23:26:59 -0000	1.1
>+++ src_ant/org/eclipse/equinox/internal/p2/artifact/repository/ant/ValidateTask.java	2 Apr 2009 21:20:10 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
> import org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository;
> 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.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> 
>@@ -56,7 +57,7 @@
> 	 * Set the repository location.
> 	 */
> 	public void setLocation(String value) throws URISyntaxException {
>-		location = URIUtil.fromString(value);
>+		location = RepositoryHelper.localRepoURIHelper(URIUtil.fromString(value));
> 	}
> 
> 	/*

Flags:

pascal: iplog+

Actions: View | Diff

Attachments on bug 264110: 130616 | 130764 | 130765 | 130845 | 133453 | 133462