Repository: karaf
Updated Branches:
refs/heads/master f1b98b280 -> db064db65
[KARAF-5207] Features 1.4 namespace not supported by the features deployer
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/db064db6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/db064db6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/db064db6
Branch: refs/heads/master
Commit: db064db65794b46f828816bdf0d225fe5e10efd5
Parents: f1b98b2
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Jun 15 11:17:35 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Jun 15 11:17:51 2017 +0200
----------------------------------------------------------------------
.../features/FeatureDeploymentListener.java | 22 ++++++--------------
.../karaf/features/FeaturesNamespaces.java | 5 +++++
2 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/db064db6/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
----------------------------------------------------------------------
diff --git a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
index fa36404..ab954fa 100644
--- a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
+++ b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
@@ -101,24 +101,14 @@ public class FeatureDeploymentListener implements ArtifactUrlTransformer, Bundle
private boolean isKnownFeaturesURI(String uri){
if(uri == null){
- return true;
+ return false;
}
- if(FeaturesNamespaces.URI_0_0_0.equalsIgnoreCase(uri)){
- return true;
- }
- if(FeaturesNamespaces.URI_1_0_0.equalsIgnoreCase(uri)){
- return true;
- }
- if(FeaturesNamespaces.URI_1_1_0.equalsIgnoreCase(uri)){
- return true;
- }
- if(FeaturesNamespaces.URI_1_2_0.equalsIgnoreCase(uri)){
- return true;
- }
- if(FeaturesNamespaces.URI_1_3_0.equalsIgnoreCase(uri)){
- return true;
+ for (String ns : FeaturesNamespaces.SUPPORTED_URIS) {
+ if (ns.equalsIgnoreCase(uri)){
+ return true;
+ }
}
- return FeaturesNamespaces.URI_CURRENT.equalsIgnoreCase(uri);
+ return false;
}
private void loadProperties() throws IOException {
http://git-wip-us.apache.org/repos/asf/karaf/blob/db064db6/features/core/src/main/java/org/apache/karaf/features/FeaturesNamespaces.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/FeaturesNamespaces.java b/features/core/src/main/java/org/apache/karaf/features/FeaturesNamespaces.java
index a4fc589..d4f584f 100644
--- a/features/core/src/main/java/org/apache/karaf/features/FeaturesNamespaces.java
+++ b/features/core/src/main/java/org/apache/karaf/features/FeaturesNamespaces.java
@@ -34,6 +34,11 @@ public interface FeaturesNamespaces {
String URI_CURRENT = URI_1_5_0;
+ String[] SUPPORTED_URIS = {
+ URI_1_0_0, URI_1_1_0, URI_1_2_0, URI_1_2_1,
+ URI_1_3_0, URI_1_4_0, URI_1_5_0
+ };
+
QName FEATURES_0_0_0 = new QName("features");
QName FEATURES_1_0_0 = new QName(URI_1_0_0, "features");
QName FEATURES_1_1_0 = new QName(URI_1_1_0, "features");