Attachment #100301 for bug #228406

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

Lines 20-27 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/generator/Messages.java (+2 lines)
20	public static String exception_sourceDirectoryInvalid;	20	public static String exception_sourceDirectoryInvalid;
21	public static String exception_artifactRepoLocationURL;	21	public static String exception_artifactRepoLocationURL;
22	public static String exception_artifactRepoNotWritable;	22	public static String exception_artifactRepoNotWritable;
		23	public static String exception_artifactRepoNotSpecified;
23	public static String exception_metadataRepoLocationURL;	24	public static String exception_metadataRepoLocationURL;
24	public static String exception_metadataRepoNotWritable;	25	public static String exception_metadataRepoNotWritable;
		26	public static String exception_metadataRepoNotSpecified;
25	public static String exception_baseLocationNotSpecified;	27	public static String exception_baseLocationNotSpecified;
26		28
27	public static String message_generatingMetadata;	29	public static String message_generatingMetadata;

Lines 157-167 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java (-1 / +14 lines)
157	}	157	}
158		158
159	private void initializeMetadataRepository(EclipseInstallGeneratorInfoProvider provider) throws ProvisionException {	159	private void initializeMetadataRepository(EclipseInstallGeneratorInfoProvider provider) throws ProvisionException {
		160	if (metadataLocation == null)
		161	return;
160	URL location;	162	URL location;
161	try {	163	try {
162	location = new URL(metadataLocation);	164	location = new URL(metadataLocation);
163	} catch (MalformedURLException e) {	165	} catch (MalformedURLException e) {
164	throw new IllegalArgumentException(NLS.bind(Messages.exception_metadataRepoLocationURL, artifactLocation));	166	throw new IllegalArgumentException(NLS.bind(Messages.exception_metadataRepoLocationURL, metadataLocation));
165	}	167	}
166		168
167	// First try to create a simple repo, this will fail if one already exists	169	// First try to create a simple repo, this will fail if one already exists
Lines 343-348 Link Here
343	System.out.println(Messages.exception_baseLocationNotSpecified);	345	System.out.println(Messages.exception_baseLocationNotSpecified);
344	return new Integer(-1);	346	return new Integer(-1);
345	}	347	}
		348
		349	if (provider.getArtifactRepository() == null) {
		350	System.out.println(Messages.exception_artifactRepoNotSpecified);
		351	return new Integer(-1);
		352	}
		353
		354	if (provider.getMetadataRepository() == null) {
		355	System.out.println(Messages.exception_metadataRepoNotSpecified);
		356	return new Integer(-1);
		357	}
		358
346	System.out.println(NLS.bind(Messages.message_generatingMetadata, provider.getBaseLocation()));	359	System.out.println(NLS.bind(Messages.message_generatingMetadata, provider.getBaseLocation()));
347		360
348	long before = System.currentTimeMillis();	361	long before = System.currentTimeMillis();

Lines 15-22 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/generator/messages.properties (+2 lines)
15	exception_sourceDirectoryInvalid = Source directory is invalid: {0}.	15	exception_sourceDirectoryInvalid = Source directory is invalid: {0}.
16	exception_artifactRepoLocationURL = Artifact repository location is not a valid URL: {0}.	16	exception_artifactRepoLocationURL = Artifact repository location is not a valid URL: {0}.
17	exception_artifactRepoNotWritable = Artifact repository is not writable: {0}.	17	exception_artifactRepoNotWritable = Artifact repository is not writable: {0}.
		18	exception_artifactRepoNotSpecified = An artifact repository was not specified.
18	exception_metadataRepoLocationURL = Metadata repository location is not a valid URL: {0}.	19	exception_metadataRepoLocationURL = Metadata repository location is not a valid URL: {0}.
19	exception_metadataRepoNotWritable = Metadata repository not writable: {0}.	20	exception_metadataRepoNotWritable = Metadata repository not writable: {0}.
		21	exception_metadataRepoNotSpecified = A metadata repository location was not specified.
20	exception_baseLocationNotSpecified = Eclipse base location not specified.	22	exception_baseLocationNotSpecified = Eclipse base location not specified.
21		23
22	message_generatingMetadata = Generating metadata for {0}.	24	message_generatingMetadata = Generating metadata for {0}.

Return to bug 228406