Attachment 100301 Details for Bug 228406 – patch

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

[patch] patch

228406.txt (text/plain), 4.35 KB, created by Andrew Niefer

on 2008-05-14 16:30:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2008-05-14 16:30:27 EDT

Size: 4.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.metadata.generator
>Index: src/org/eclipse/equinox/internal/p2/metadata/generator/Messages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/Messages.java,v
>retrieving revision 1.1
>diff -u -r1.1 Messages.java
>--- src/org/eclipse/equinox/internal/p2/metadata/generator/Messages.java	10 Feb 2008 22:45:28 -0000	1.1
>+++ src/org/eclipse/equinox/internal/p2/metadata/generator/Messages.java	14 May 2008 20:29:31 -0000
>@@ -20,8 +20,10 @@
> 	public static String exception_sourceDirectoryInvalid;
> 	public static String exception_artifactRepoLocationURL;
> 	public static String exception_artifactRepoNotWritable;
>+	public static String exception_artifactRepoNotSpecified;
> 	public static String exception_metadataRepoLocationURL;
> 	public static String exception_metadataRepoNotWritable;
>+	public static String exception_metadataRepoNotSpecified;
> 	public static String exception_baseLocationNotSpecified;
> 
> 	public static String message_generatingMetadata;
>Index: src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java,v
>retrieving revision 1.40
>diff -u -r1.40 EclipseGeneratorApplication.java
>--- src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java	14 May 2008 20:12:44 -0000	1.40
>+++ src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java	14 May 2008 20:29:31 -0000
>@@ -157,11 +157,13 @@
> 	}
> 
> 	private void initializeMetadataRepository(EclipseInstallGeneratorInfoProvider provider) throws ProvisionException {
>+		if (metadataLocation == null)
>+			return;
> 		URL location;
> 		try {
> 			location = new URL(metadataLocation);
> 		} catch (MalformedURLException e) {
>-			throw new IllegalArgumentException(NLS.bind(Messages.exception_metadataRepoLocationURL, artifactLocation));
>+			throw new IllegalArgumentException(NLS.bind(Messages.exception_metadataRepoLocationURL, metadataLocation));
> 		}
> 
> 		// 	First try to create a simple repo, this will fail if one already exists
>@@ -343,6 +345,17 @@
> 			System.out.println(Messages.exception_baseLocationNotSpecified);
> 			return new Integer(-1);
> 		}
>+
>+		if (provider.getArtifactRepository() == null) {
>+			System.out.println(Messages.exception_artifactRepoNotSpecified);
>+			return new Integer(-1);
>+		}
>+
>+		if (provider.getMetadataRepository() == null) {
>+			System.out.println(Messages.exception_metadataRepoNotSpecified);
>+			return new Integer(-1);
>+		}
>+
> 		System.out.println(NLS.bind(Messages.message_generatingMetadata, provider.getBaseLocation()));
> 
> 		long before = System.currentTimeMillis();
>Index: src/org/eclipse/equinox/internal/p2/metadata/generator/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/messages.properties,v
>retrieving revision 1.1
>diff -u -r1.1 messages.properties
>--- src/org/eclipse/equinox/internal/p2/metadata/generator/messages.properties	10 Feb 2008 22:45:28 -0000	1.1
>+++ src/org/eclipse/equinox/internal/p2/metadata/generator/messages.properties	14 May 2008 20:29:31 -0000
>@@ -15,8 +15,10 @@
> exception_sourceDirectoryInvalid = Source directory is invalid: {0}.
> exception_artifactRepoLocationURL = Artifact repository location is not a valid URL: {0}.
> exception_artifactRepoNotWritable = Artifact repository is not writable: {0}.
>+exception_artifactRepoNotSpecified = An artifact repository was not specified.
> exception_metadataRepoLocationURL = Metadata repository location is not a valid URL: {0}.
> exception_metadataRepoNotWritable = Metadata repository not writable: {0}.
>+exception_metadataRepoNotSpecified = A metadata repository location was not specified.
> exception_baseLocationNotSpecified = Eclipse base location not specified.
> 
> message_generatingMetadata = Generating metadata for {0}.

Actions: View | Diff

Attachments on bug 228406: 100301 | 101344