Attachment 134456 Details for Bug 274695 – Fix

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

[patch] Fix

patch.txt (text/plain), 2.57 KB, created by John Arthorne

on 2009-05-05 11:56:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2009-05-05 11:56:39 EDT

Size: 2.57 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.publisher
>Index: src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java,v
>retrieving revision 1.46
>diff -u -r1.46 FeaturesAction.java
>--- src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java	29 Apr 2009 16:01:59 -0000	1.46
>+++ src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java	5 May 2009 15:56:20 -0000
>@@ -59,17 +59,19 @@
> 		iu.setId(id);
> 		Version version = Version.parseVersion(feature.getVersion());
> 		iu.setVersion(version);
>+
>+		// set properties for other feature attributes
>+		iu.setProperty(IInstallableUnit.PROP_NAME, feature.getLabel());
>+		if (feature.getDescription() != null)
>+			iu.setProperty(IInstallableUnit.PROP_DESCRIPTION, feature.getDescription());
>+		if (feature.getDescriptionURL() != null)
>+			iu.setProperty(IInstallableUnit.PROP_DESCRIPTION_URL, feature.getDescriptionURL());
>+		if (feature.getProviderName() != null)
>+			iu.setProperty(IInstallableUnit.PROP_PROVIDER, feature.getProviderName());
> 		if (feature.getLicense() != null)
> 			iu.setLicense(MetadataFactory.createLicense(toURIOrNull(feature.getLicenseURL()), feature.getLicense()));
> 		if (feature.getCopyright() != null)
> 			iu.setCopyright(MetadataFactory.createCopyright(toURIOrNull(feature.getCopyrightURL()), feature.getCopyright()));
>-
>-		// The required capabilities are not specified at this level because we don't want the feature jar to be attractive to install.
>-		iu.setTouchpointType(PublisherHelper.TOUCHPOINT_OSGI);
>-		iu.setFilter(INSTALL_FEATURES_FILTER);
>-		iu.setSingleton(true);
>-
>-		// set properties for other feature attributes
> 		if (feature.getApplication() != null)
> 			iu.setProperty(UPDATE_FEATURE_APPLICATION_PROP, feature.getApplication());
> 		if (feature.getPlugin() != null)
>@@ -79,6 +81,11 @@
> 		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.
>+		iu.setTouchpointType(PublisherHelper.TOUCHPOINT_OSGI);
>+		iu.setFilter(INSTALL_FEATURES_FILTER);
>+		iu.setSingleton(true);
>+
> 		if (feature.getInstallHandler() != null && feature.getInstallHandler().trim().length() > 0) {
> 			String installHandlerProperty = "handler=" + feature.getInstallHandler(); //$NON-NLS-1$
>

Actions: View | Diff

Attachments on bug 274695: 134117 | 134178 | 134456 | 134476 | 134493