*** empty log message ***
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
index 266f143..b3fe3b3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
@@ -179,7 +179,12 @@
* @see org.eclipse.update.core.ISite#getRawIncludedFeatureReferences()
*/
public ISiteFeatureReference[] getFeatureReferences() {
- return filterFeatures(getRawFeatureReferences());
+ // only filter local site
+ if (getCurrentConfiguredSite()!=null)
+ return filterFeatures(getRawFeatureReferences());
+ else
+ return getRawFeatureReferences();
+
}
/*
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
index d5d5fe7..8ad4fdd 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
@@ -866,8 +866,8 @@
int searchLocation = IUpdateConstants.SEARCH_ROOT;
if ("both".equalsIgnoreCase(locationName))
searchLocation = IUpdateConstants.SEARCH_ROOT & IUpdateConstants.SEARCH_SELF;
- if ("root".equalsIgnoreCase(locationName))
- searchLocation = IUpdateConstants.SEARCH_ROOT;
+ if ("self".equalsIgnoreCase(locationName))
+ searchLocation = IUpdateConstants.SEARCH_SELF;
includedFeature.setSearchLocation(searchLocation);
// os arch ws
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
index e015884..4f6d151 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
@@ -452,7 +452,8 @@
} else {
// write non-primary feature entries
String version = feature.getVersionedIdentifier().getVersion().toString();
- IPlatformConfiguration.IFeatureEntry featureEntry = runtimeConfiguration.createFeatureEntry(id, version, pluginVersion, false, null, null);
+ String pluginIdentifier = feature.getPrimaryPluginID();
+ IPlatformConfiguration.IFeatureEntry featureEntry = runtimeConfiguration.createFeatureEntry(id, version, pluginIdentifier, pluginVersion, false, null, null);
runtimeConfiguration.configureFeatureEntry(featureEntry);
}
