Attachment 102546 Details for Bug 222480 – patch

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

[patch] patch

222480.txt (text/plain), 9.46 KB, created by DJ Houghton

on 2008-05-28 19:05:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: DJ Houghton

Created: 2008-05-28 19:05:26 EDT

Size: 9.46 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.metadata.generator
>Index: src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java,v
>retrieving revision 1.22
>diff -u -r1.22 FeatureParser.java
>--- src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java	14 May 2008 19:31:28 -0000	1.22
>+++ src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java	28 May 2008 23:04:39 -0000
>@@ -251,6 +251,12 @@
> 			String arch = attributes.getValue("arch"); //$NON-NLS-1$
> 			result.setEnvironment(os, ws, arch, nl);
> 
>+			result.setApplication(attributes.getValue("application")); //$NON-NLS-1$
>+			result.setPlugin(attributes.getValue("plugin")); //$NON-NLS-1$
>+			result.setExclusive(Boolean.valueOf(attributes.getValue("exclusive")).booleanValue()); //$NON-NLS-1$
>+			result.setPrimary(Boolean.valueOf(attributes.getValue("primary")).booleanValue()); //$NON-NLS-1$
>+			result.setColocationAffinity(attributes.getValue("colocation-affinity")); //$NON-NLS-1$
>+
> 			//TODO rootURLs
> 			if (url != null && "file".equals(url.getProtocol())) { //$NON-NLS-1$
> 				File f = new File(url.getFile().replace('/', File.separatorChar));
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Feature.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Feature.java,v
>retrieving revision 1.3
>diff -u -r1.3 Feature.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Feature.java	9 May 2008 01:37:01 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Feature.java	28 May 2008 23:04:39 -0000
>@@ -23,6 +23,11 @@
> 	private String version;
> 	private String label;
> 	private String image;
>+	private String pluginId;
>+	private boolean primary = false;
>+	private boolean exclusive = false;
>+	private String application;
>+	private String colocationAffinity;
> 
> 	private URLEntry description;
> 	private URLEntry license;
>@@ -70,10 +75,18 @@
> 		entries.add(plugin);
> 	}
> 
>+	public String getApplication() {
>+		return application;
>+	}
>+
> 	public String getArch() {
> 		return arch;
> 	}
> 
>+	public String getColocationAffinity() {
>+		return colocationAffinity;
>+	}
>+
> 	public String getCopyright() {
> 		if (copyright != null)
> 			return copyright.getAnnotation();
>@@ -162,6 +175,10 @@
> 		return os;
> 	}
> 
>+	public String getPlugin() {
>+		return pluginId;
>+	}
>+
> 	public String getProviderName() {
> 		return providerName;
> 	}
>@@ -186,6 +203,22 @@
> 		return ws;
> 	}
> 
>+	public boolean isExclusive() {
>+		return exclusive;
>+	}
>+
>+	public boolean isPrimary() {
>+		return primary;
>+	}
>+
>+	public void setApplication(String application) {
>+		this.application = application;
>+	}
>+
>+	public void setColocationAffinity(String colocationAffinity) {
>+		this.colocationAffinity = colocationAffinity;
>+	}
>+
> 	public void setCopyright(String copyright) {
> 		if (this.copyright == null)
> 			this.copyright = new URLEntry();
>@@ -217,6 +250,10 @@
> 		this.nl = nl;
> 	}
> 
>+	public void setExclusive(boolean exclusive) {
>+		this.exclusive = exclusive;
>+	}
>+
> 	public void setImage(String image) {
> 		this.image = image;
> 	}
>@@ -257,6 +294,14 @@
> 		this.location = location;
> 	}
> 
>+	public void setPlugin(String pluginId) {
>+		this.pluginId = pluginId;
>+	}
>+
>+	public void setPrimary(boolean primary) {
>+		this.primary = primary;
>+	}
>+
> 	public void setProviderName(String value) {
> 		providerName = value;
> 	}
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java,v
>retrieving revision 1.50
>diff -u -r1.50 MetadataGeneratorHelper.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java	23 May 2008 01:56:06 -0000	1.50
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java	28 May 2008 23:04:39 -0000
>@@ -96,6 +96,10 @@
> 	private static final String LAUNCHER_ID_PREFIX = "org.eclipse.launcher"; //$NON-NLS-1$
> 
> 	private static final String ECLIPSE_INSTALL_HANDLER_PROP = "org.eclipse.update.installHandler"; //$NON-NLS-1$
>+	private static final String UPDATE_FEATURE_APPLICATION_PROP = "org.eclipse.update.feature.application"; //$NON-NLS-1$
>+	private static final String UPDATE_FEATURE_PLUGIN_PROP = "org.eclipse.update.feature.plugin"; //$NON-NLS-1$
>+	private static final String UPDATE_FEATURE_EXCLUSIVE_PROP = "org.eclipse.update.feature.exclusive"; //$NON-NLS-1$
>+	private static final String UPDATE_FEATURE_PRIMARY_PROP = "org.eclipse.update.feature.primary"; //$NON-NLS-1$
> 
> 	//TODO - need to come up with a way to infer launcher version
> 	private static final Version LAUNCHER_VERSION = new Version(1, 0, 0);
>@@ -571,6 +575,14 @@
> 			iu.setLicense(new License(feature.getLicenseURL(), feature.getLicense()));
> 		if (feature.getCopyright() != null)
> 			iu.setCopyright(new Copyright(feature.getCopyrightURL(), feature.getCopyright()));
>+		if (feature.getApplication() != null)
>+			iu.setProperty(UPDATE_FEATURE_APPLICATION_PROP, feature.getApplication());
>+		if (feature.getPlugin() != null)
>+			iu.setProperty(UPDATE_FEATURE_PLUGIN_PROP, feature.getPlugin());
>+		if (feature.isExclusive())
>+			iu.setProperty(UPDATE_FEATURE_EXCLUSIVE_PROP, Boolean.TRUE.toString());
>+		if (feature.isPrimary())
>+			iu.setProperty(UPDATE_FEATURE_PRIMARY_PROP, Boolean.TRUE.toString());
> 
> 		// The required capabilities are not specified at this level because we don't want the feature jar to be attractive to install.
> 
>#P org.eclipse.equinox.p2.touchpoint.eclipse
>Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java,v
>retrieving revision 1.14
>diff -u -r1.14 PlatformConfigurationWrapper.java
>--- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java	6 May 2008 17:26:58 -0000	1.14
>+++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java	28 May 2008 23:04:40 -0000
>@@ -190,6 +190,11 @@
> 		addedFeature.setId(id);
> 		addedFeature.setVersion(version);
> 		addedFeature.setUrl(makeFeatureURL(id, version));
>+		addedFeature.setApplication(application);
>+		addedFeature.setPluginIdentifier(pluginIdentifier);
>+		addedFeature.setPluginVersion(pluginVersion);
>+		addedFeature.setRoots(root);
>+		addedFeature.setPrimary(primary);
> 		site.addFeature(addedFeature);
> 		return Status.OK_STATUS;
> 	}
>Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 InstallFeatureAction.java
>--- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java	6 Apr 2008 00:10:17 -0000	1.1
>+++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java	28 May 2008 23:04:40 -0000
>@@ -20,6 +20,9 @@
> 
> public class InstallFeatureAction extends ProvisioningAction {
> 	public static final String ID = "installFeature"; //$NON-NLS-1$
>+	private static final String UPDATE_FEATURE_APPLICATION_PROP = "org.eclipse.update.feature.application"; //$NON-NLS-1$
>+	private static final String UPDATE_FEATURE_PLUGIN_PROP = "org.eclipse.update.feature.plugin"; //$NON-NLS-1$
>+	private static final String UPDATE_FEATURE_PRIMARY_PROP = "org.eclipse.update.feature.primary"; //$NON-NLS-1$
> 
> 	public IStatus execute(Map parameters) {
> 		return InstallFeatureAction.installFeature(parameters);
>@@ -65,6 +68,11 @@
> 		if (file == null || !file.exists()) {
> 			return Util.createError(NLS.bind(Messages.artifact_file_not_found, artifactKey));
> 		}
>-		return configuration.addFeatureEntry(file, featureId, featureVersion, artifactKey.getId(), artifactKey.getVersion().toString(), /*primary*/false, /*application*/null, /*root*/null);
>+		String pluginId = iu.getProperty(UPDATE_FEATURE_PLUGIN_PROP);
>+		boolean isPrimary = Boolean.valueOf(iu.getProperty(UPDATE_FEATURE_PRIMARY_PROP)).booleanValue();
>+		String application = iu.getProperty(UPDATE_FEATURE_APPLICATION_PROP);
>+		// TODO this isn't right... but we will leave it for now because we don't actually use the value in the install
>+		String pluginVersion = artifactKey.getVersion().toString();
>+		return configuration.addFeatureEntry(file, featureId, featureVersion, pluginId, pluginVersion, isPrimary, application, /*root*/null);
> 	}
> }
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 222480: 96341 | 102260 | 102261 | 102546