Attachment 100255 Details for Bug 231215 – patch

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

[patch] patch

231215.txt (text/plain), 12.81 KB, created by Andrew Niefer

on 2008-05-14 14:04:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2008-05-14 14:04:42 EDT

Size: 12.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java,v
>retrieving revision 1.30
>diff -u -r1.30 IBuildPropertiesConstants.java
>--- src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java	12 May 2008 18:13:37 -0000	1.30
>+++ src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java	14 May 2008 17:58:55 -0000
>@@ -89,6 +89,8 @@
> 	public static final String PROPERTY_P2_FINAL_MODE_OVERRIDE = "p2.final.mode.override"; //$NON-NLS-1$
> 	public static final String PROPERTY_P2_FLAVOR = "p2.flavor"; //$NON-NLS-1$
> 	public static final String PROPERTY_P2_APPEND = "p2.append"; //$NON-NLS-1$
>+	public static final String PROPERTY_P2_METADATA_REPO_NAME = "p2.metadata.repo.name"; //$NON-NLS-1$
>+	public static final String PROPERTY_P2_ARTIFACT_REPO_NAME = "p2.artifact.repo.name"; //$NON-NLS-1$
> 	//Internal usage only
> 	public static final String PROPERTY_P2_GENERATION_MODE = "p2.generation.mode"; //$NON-NLS-1$
> 	public static final String SOURCE_PLUGIN = "sourcePlugin"; //$NON-NLS-1$
>Index: src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java,v
>retrieving revision 1.31
>diff -u -r1.31 AssembleScriptGenerator.java
>--- src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java	23 Apr 2008 18:58:35 -0000	1.31
>+++ src/org/eclipse/pde/internal/build/AssembleScriptGenerator.java	14 May 2008 17:58:55 -0000
>@@ -129,11 +129,15 @@
> 			script.printTargetDeclaration(TARGET_P2_METADATA, null, TARGET_P2_METADATA, PROPERTY_RUN_PACKAGER, null);
> 			script.printConditionIsSet("mode", "incremental", PROPERTY_RUN_PACKAGER, "final"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 			script.printProperty(PROPERTY_P2_APPEND, "true"); //$NON-NLS-1$
>+			script.printProperty(PROPERTY_P2_METADATA_REPO_NAME, ""); //$NON-NLS-1$
>+			script.printProperty(PROPERTY_P2_ARTIFACT_REPO_NAME, ""); //$NON-NLS-1$
> 			script.print("<p2.generator "); //$NON-NLS-1$
> 			script.printAttribute("append", Utils.getPropertyFormat(PROPERTY_P2_APPEND), true); //$NON-NLS-1$
> 			script.printAttribute("flavor", Utils.getPropertyFormat(PROPERTY_P2_FLAVOR), true); //$NON-NLS-1$
> 			script.printAttribute("metadataRepository", Utils.getPropertyFormat(PROPERTY_P2_METADATA_REPO), true); //$NON-NLS-1$ 
>-			script.printAttribute("artifactRepository", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO), true); //$NON-NLS-1$ 
>+			script.printAttribute("artifactRepository", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO), true); //$NON-NLS-1$
>+			script.printAttribute("metadataRepositoryName", Utils.getPropertyFormat(PROPERTY_P2_METADATA_REPO_NAME), true); //$NON-NLS-1$
>+			script.printAttribute("artifactRepositoryName", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO_NAME), true); //$NON-NLS-1$
> 			script.printAttribute("publishArtifacts", Utils.getPropertyFormat(PROPERTY_P2_PUBLISH_ARTIFACTS), true); //$NON-NLS-1$ 
> 			script.printAttribute("mode", "${mode}", true); //$NON-NLS-1$ //$NON-NLS-2$
> 
>Index: src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java,v
>retrieving revision 1.105
>diff -u -r1.105 AssembleConfigScriptGenerator.java
>--- src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java	12 May 2008 18:13:37 -0000	1.105
>+++ src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java	14 May 2008 17:58:55 -0000
>@@ -481,7 +481,9 @@
> 		if (haveP2Bundles()) {
> 			script.printTargetDeclaration(TARGET_P2_METADATA, null, TARGET_P2_METADATA, null, null);
> 			script.printProperty(PROPERTY_P2_APPEND, "true"); //$NON-NLS-1$
>-			
>+			script.printProperty(PROPERTY_P2_METADATA_REPO_NAME, ""); //$NON-NLS-1$
>+			script.printProperty(PROPERTY_P2_ARTIFACT_REPO_NAME, ""); //$NON-NLS-1$
>+
> 			if (havePDEUIState()) {
> 				//during feature export we need to override the "mode"
> 				printP2GenerationModeCondition();
>@@ -492,11 +494,13 @@
> 			script.printAttribute("flavor", Utils.getPropertyFormat(PROPERTY_P2_FLAVOR), true); //$NON-NLS-1$
> 			script.printAttribute("metadataRepository", Utils.getPropertyFormat(PROPERTY_P2_METADATA_REPO), true); //$NON-NLS-1$ 
> 			script.printAttribute("artifactRepository", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO), true); //$NON-NLS-1$ 
>+			script.printAttribute("metadataRepositoryName", Utils.getPropertyFormat(PROPERTY_P2_METADATA_REPO_NAME), true); //$NON-NLS-1$
>+			script.printAttribute("artifactRepositoryName", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO_NAME), true); //$NON-NLS-1$
> 			script.printAttribute("publishArtifacts", Utils.getPropertyFormat(PROPERTY_P2_PUBLISH_ARTIFACTS), true); //$NON-NLS-1$ 
> 			script.printAttribute("p2OS", configInfo.getOs(), true); //$NON-NLS-1$
> 			if (!havePDEUIState() || rootFileProviders.size() > 0)
> 				script.printAttribute("mode", "incremental", true); //$NON-NLS-1$ //$NON-NLS-2$
>-			else 
>+			else
> 				script.printAttribute("mode", Utils.getPropertyFormat(PROPERTY_P2_GENERATION_MODE), true); //$NON-NLS-1$
> 			script.println("/>"); //$NON-NLS-1$
> 
>@@ -507,10 +511,12 @@
> 				script.printAttribute("flavor", Utils.getPropertyFormat(PROPERTY_P2_FLAVOR), true); //$NON-NLS-1$
> 				script.printAttribute("metadataRepository", Utils.getPropertyFormat(PROPERTY_P2_METADATA_REPO), true); //$NON-NLS-1$ 
> 				script.printAttribute("artifactRepository", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO), true); //$NON-NLS-1$ 
>+				script.printAttribute("metadataRepositoryName", Utils.getPropertyFormat(PROPERTY_P2_METADATA_REPO_NAME), true); //$NON-NLS-1$
>+				script.printAttribute("artifactRepositoryName", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO_NAME), true); //$NON-NLS-1$
> 				script.printAttribute("launcherConfig", configInfo.toString(), true); //$NON-NLS-1$
> 				script.printAttribute("p2OS", configInfo.getOs(), true); //$NON-NLS-1$
> 				script.printAttribute("publishArtifacts", Utils.getPropertyFormat(PROPERTY_P2_PUBLISH_ARTIFACTS), true); //$NON-NLS-1$ 
>-				if(!havePDEUIState())
>+				if (!havePDEUIState())
> 					script.printAttribute("mode", "incremental", true); //$NON-NLS-1$ //$NON-NLS-2$
> 				else
> 					script.printAttribute("mode", Utils.getPropertyFormat(PROPERTY_P2_GENERATION_MODE), true); //$NON-NLS-1$
>@@ -527,7 +533,7 @@
> 
> 	protected void printP2GenerationModeCondition() {
> 		// "final" if not running packager and we are overriding, else "incremental"
>-		script.print("<condition");  //$NON-NLS-1$
>+		script.print("<condition"); //$NON-NLS-1$
> 		script.printAttribute("property", PROPERTY_P2_GENERATION_MODE, true); //$NON-NLS-1$
> 		script.printAttribute("value", "final", true); //$NON-NLS-1$ //$NON-NLS-2$
> 		script.printAttribute("else", "incremental", false); //$NON-NLS-1$ //$NON-NLS-2$
>@@ -540,7 +546,7 @@
> 		script.println("\t</and>"); //$NON-NLS-1$
> 		script.printEndTag("condition"); //$NON-NLS-1$
> 	}
>-	
>+
> 	public boolean haveP2Bundles() {
> 		if (p2Bundles != null)
> 			return p2Bundles.booleanValue();
>Index: src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java,v
>retrieving revision 1.20
>diff -u -r1.20 PackageScriptGenerator.java
>--- src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java	23 Apr 2008 18:58:36 -0000	1.20
>+++ src/org/eclipse/pde/internal/build/packager/PackageScriptGenerator.java	14 May 2008 17:58:55 -0000
>@@ -8,6 +8,8 @@
>  ******************************************************************************/
> package org.eclipse.pde.internal.build.packager;
> 
>+import org.eclipse.pde.internal.build.Utils;
>+
> import java.io.*;
> import java.util.*;
> import org.eclipse.core.runtime.*;
>@@ -84,6 +86,8 @@
> 		if (configScriptGenerator.haveP2Bundles()) {
> 			script.printTargetDeclaration(TARGET_P2_METADATA, null, TARGET_P2_METADATA, null, null);
> 			script.printProperty(PROPERTY_P2_APPEND, "true"); //$NON-NLS-1$
>+			script.printProperty(PROPERTY_P2_METADATA_REPO_NAME, ""); //$NON-NLS-1$
>+			script.printProperty(PROPERTY_P2_ARTIFACT_REPO_NAME, ""); //$NON-NLS-1$
> 			ProductFile product = configScriptGenerator.getProductFile();
> 			String versionAdvice = null;
> 			if (versionsList && product != null) {
>@@ -103,6 +107,8 @@
> 		script.printAttribute("flavor", Utils.getPropertyFormat(PROPERTY_P2_FLAVOR), true); //$NON-NLS-1$
> 		script.printAttribute("metadataRepository", Utils.getPropertyFormat(PROPERTY_P2_METADATA_REPO), true); //$NON-NLS-1$ 
> 		script.printAttribute("artifactRepository", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO), true); //$NON-NLS-1$ 
>+		script.printAttribute("metadataRepositoryName", Utils.getPropertyFormat(PROPERTY_P2_METADATA_REPO_NAME), true); //$NON-NLS-1$
>+		script.printAttribute("artifactRepositoryName", Utils.getPropertyFormat(PROPERTY_P2_ARTIFACT_REPO_NAME), true); //$NON-NLS-1$
> 		script.printAttribute("publishArtifacts", Utils.getPropertyFormat(PROPERTY_P2_PUBLISH_ARTIFACTS), true); //$NON-NLS-1$ 
> 		script.printAttribute("mode", "final", true); //$NON-NLS-1$ //$NON-NLS-2$
> 
>@@ -162,6 +168,8 @@
> 			p2Script.printProjectDeclaration("P2 Product IU Generation", "main", "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 			p2Script.println();
> 			p2Script.printProperty(PROPERTY_P2_APPEND, "true"); //$NON-NLS-1$
>+			p2Script.printProperty(PROPERTY_P2_METADATA_REPO_NAME, ""); //$NON-NLS-1$
>+			p2Script.printProperty(PROPERTY_P2_ARTIFACT_REPO_NAME, ""); //$NON-NLS-1$
> 			p2Script.printTargetDeclaration("main", null, TARGET_P2_METADATA, null, "Generate the final Product IU"); //$NON-NLS-1$//$NON-NLS-2$
> 			generateP2FinalCall(p2Script, productFileLocation, adviceFile != null ? adviceFile.getAbsolutePath() : null);
> 			p2Script.printTargetEnd();
>#P org.eclipse.equinox.p2.metadata.generator
>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.39
>diff -u -r1.39 EclipseGeneratorApplication.java
>--- src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java	12 May 2008 18:05:43 -0000	1.39
>+++ src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java	14 May 2008 17:58:56 -0000
>@@ -112,7 +112,7 @@
> 			throw new IllegalArgumentException(NLS.bind(Messages.exception_artifactRepoLocationURL, artifactLocation));
> 		}
> 
>-		String repositoryName = artifactRepoName != null ? artifactRepoName : artifactLocation + " - artifacts"; //$NON-NLS-1$
>+		String repositoryName = (artifactRepoName != null && artifactRepoName.length() > 0) ? artifactRepoName : artifactLocation + " - artifacts"; //$NON-NLS-1$
> 		Map properties = new HashMap(1);
> 		properties.put(IRepository.PROP_COMPRESSED, compress);
> 		if (provider.reuseExistingPack200Files())
>@@ -122,9 +122,6 @@
> 			result = manager.createRepository(location, repositoryName, IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties);
> 			manager.removeRepository(location);
> 			provider.setArtifactRepository(result);
>-			// TODO is this needed?
>-			if (artifactRepoName != null)
>-				result.setName(artifactRepoName);
> 			return;
> 		} catch (ProvisionException e) {
> 			//fall through a load existing repo
>@@ -171,7 +168,7 @@
> 		//  We try creating a repo first instead of just loading what is there because we don't want a repo based
> 		//  on a site.xml if there is one there.
> 
>-		String repositoryName = metadataRepoName == null ? metadataLocation + " - metadata" : metadataRepoName; //$NON-NLS-1$
>+		String repositoryName = (metadataRepoName == null || metadataRepoName.length() == 0) ? metadataLocation + " - metadata" : metadataRepoName; //$NON-NLS-1$
> 		Map properties = new HashMap(1);
> 		properties.put(IRepository.PROP_COMPRESSED, compress);
> 
>@@ -179,9 +176,6 @@
> 		try {
> 			IMetadataRepository result = manager.createRepository(location, repositoryName, IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties);
> 			manager.removeRepository(location);
>-			// TODO is this needed?
>-			if (metadataRepoName != null)
>-				result.setName(metadataRepoName);
> 			provider.setMetadataRepository(result);
> 			return;
> 		} catch (ProvisionException e) {

Actions: View | Diff

Attachments on bug 231215: 99390 | 100255 | 100296