Skip to content

Commit db064db

Browse files
committed
[KARAF-5207] Features 1.4 namespace not supported by the features deployer
1 parent f1b98b2 commit db064db

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java

+6-16
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,14 @@ public void destroy() {
101101

102102
private boolean isKnownFeaturesURI(String uri){
103103
if(uri == null){
104-
return true;
104+
return false;
105105
}
106-
if(FeaturesNamespaces.URI_0_0_0.equalsIgnoreCase(uri)){
107-
return true;
108-
}
109-
if(FeaturesNamespaces.URI_1_0_0.equalsIgnoreCase(uri)){
110-
return true;
111-
}
112-
if(FeaturesNamespaces.URI_1_1_0.equalsIgnoreCase(uri)){
113-
return true;
114-
}
115-
if(FeaturesNamespaces.URI_1_2_0.equalsIgnoreCase(uri)){
116-
return true;
117-
}
118-
if(FeaturesNamespaces.URI_1_3_0.equalsIgnoreCase(uri)){
119-
return true;
106+
for (String ns : FeaturesNamespaces.SUPPORTED_URIS) {
107+
if (ns.equalsIgnoreCase(uri)){
108+
return true;
109+
}
120110
}
121-
return FeaturesNamespaces.URI_CURRENT.equalsIgnoreCase(uri);
111+
return false;
122112
}
123113

124114
private void loadProperties() throws IOException {

features/core/src/main/java/org/apache/karaf/features/FeaturesNamespaces.java

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public interface FeaturesNamespaces {
3434

3535
String URI_CURRENT = URI_1_5_0;
3636

37+
String[] SUPPORTED_URIS = {
38+
URI_1_0_0, URI_1_1_0, URI_1_2_0, URI_1_2_1,
39+
URI_1_3_0, URI_1_4_0, URI_1_5_0
40+
};
41+
3742
QName FEATURES_0_0_0 = new QName("features");
3843
QName FEATURES_1_0_0 = new QName(URI_1_0_0, "features");
3944
QName FEATURES_1_1_0 = new QName(URI_1_1_0, "features");

0 commit comments

Comments
 (0)