Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 274695 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java (-7 / +14 lines)
Lines 59-75 Link Here
59
		iu.setId(id);
59
		iu.setId(id);
60
		Version version = Version.parseVersion(feature.getVersion());
60
		Version version = Version.parseVersion(feature.getVersion());
61
		iu.setVersion(version);
61
		iu.setVersion(version);
62
63
		// set properties for other feature attributes
64
		iu.setProperty(IInstallableUnit.PROP_NAME, feature.getLabel());
65
		if (feature.getDescription() != null)
66
			iu.setProperty(IInstallableUnit.PROP_DESCRIPTION, feature.getDescription());
67
		if (feature.getDescriptionURL() != null)
68
			iu.setProperty(IInstallableUnit.PROP_DESCRIPTION_URL, feature.getDescriptionURL());
69
		if (feature.getProviderName() != null)
70
			iu.setProperty(IInstallableUnit.PROP_PROVIDER, feature.getProviderName());
62
		if (feature.getLicense() != null)
71
		if (feature.getLicense() != null)
63
			iu.setLicense(MetadataFactory.createLicense(toURIOrNull(feature.getLicenseURL()), feature.getLicense()));
72
			iu.setLicense(MetadataFactory.createLicense(toURIOrNull(feature.getLicenseURL()), feature.getLicense()));
64
		if (feature.getCopyright() != null)
73
		if (feature.getCopyright() != null)
65
			iu.setCopyright(MetadataFactory.createCopyright(toURIOrNull(feature.getCopyrightURL()), feature.getCopyright()));
74
			iu.setCopyright(MetadataFactory.createCopyright(toURIOrNull(feature.getCopyrightURL()), feature.getCopyright()));
66
67
		// The required capabilities are not specified at this level because we don't want the feature jar to be attractive to install.
68
		iu.setTouchpointType(PublisherHelper.TOUCHPOINT_OSGI);
69
		iu.setFilter(INSTALL_FEATURES_FILTER);
70
		iu.setSingleton(true);
71
72
		// set properties for other feature attributes
73
		if (feature.getApplication() != null)
75
		if (feature.getApplication() != null)
74
			iu.setProperty(UPDATE_FEATURE_APPLICATION_PROP, feature.getApplication());
76
			iu.setProperty(UPDATE_FEATURE_APPLICATION_PROP, feature.getApplication());
75
		if (feature.getPlugin() != null)
77
		if (feature.getPlugin() != null)
Lines 79-84 Link Here
79
		if (feature.isPrimary())
81
		if (feature.isPrimary())
80
			iu.setProperty(UPDATE_FEATURE_PRIMARY_PROP, Boolean.TRUE.toString());
82
			iu.setProperty(UPDATE_FEATURE_PRIMARY_PROP, Boolean.TRUE.toString());
81
83
84
		// The required capabilities are not specified at this level because we don't want the feature jar to be attractive to install.
85
		iu.setTouchpointType(PublisherHelper.TOUCHPOINT_OSGI);
86
		iu.setFilter(INSTALL_FEATURES_FILTER);
87
		iu.setSingleton(true);
88
82
		if (feature.getInstallHandler() != null && feature.getInstallHandler().trim().length() > 0) {
89
		if (feature.getInstallHandler() != null && feature.getInstallHandler().trim().length() > 0) {
83
			String installHandlerProperty = "handler=" + feature.getInstallHandler(); //$NON-NLS-1$
90
			String installHandlerProperty = "handler=" + feature.getInstallHandler(); //$NON-NLS-1$
84
91

Return to bug 274695