diff options
3 files changed, 18 insertions, 5 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF index b051d92a5..fb053054f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF +++ b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.jst.jsf.common;singleton:=true -Bundle-Version: 1.5.100.qualifier +Bundle-Version: 1.5.101.qualifier Bundle-Activator: org.eclipse.jst.jsf.common.JSFCommonPlugin$Implementation Bundle-Localization: plugin Export-Package: org.eclipse.jst.jsf.common;x-internal:=true, diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/pom.xml b/jsf/plugins/org.eclipse.jst.jsf.common/pom.xml index 66e56aef9..fdcbfb959 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/pom.xml +++ b/jsf/plugins/org.eclipse.jst.jsf.common/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.jsf</groupId> <artifactId>org.eclipse.jst.jsf.common</artifactId> - <version>1.5.100-SNAPSHOT</version> + <version>1.5.101-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java index d5b175599..791a3fd1a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java @@ -71,9 +71,15 @@ public class DomainLoadingStrategyRegistry{ * @param strategy */ protected void addDomainLoadingStrategyDescriptor(final DomainLoadingStrategyDescriptorImpl strategy){ - getDescriptors().put(strategy.getDomain(), strategy); + if (getDescriptors().containsKey(strategy.getDomain())) { + if (!strategy.getBundleId().equals(JSFCommonPlugin.PLUGIN_ID)) { + getDescriptors().put(strategy.getDomain(), strategy); + } + } else { + getDescriptors().put(strategy.getDomain(), strategy); + } } - + /** * @param domain * @return an instance of an <code>IDomainLoadingStrategy</code> for the given domain @@ -132,7 +138,14 @@ public class DomainLoadingStrategyRegistry{ public String getDomain() { return domain; } - + + /** + * @return bundle ID + */ + public String getBundleId() { + return bundleId; + } + /** * @return new instance of IDomainLoadingStrategy */ |