From 9c70d70ae7733b85bac83f31c23a2d567eed5911 Mon Sep 17 00:00:00 2001 From: Andrei Pozolotin Date: Tue, 29 Jan 2013 11:35:18 -0600 Subject: [PATCH] KARAF-1851 --- .../features/FeatureDeploymentListener.java | 3 +++ .../apache/karaf/features/FeaturesNamespaces.java | 2 +- .../features/internal/model/package-info.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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 ab033ba..f0b1193 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,6 +101,9 @@ public class FeatureDeploymentListener implements ArtifactUrlTransformer, Bundle if(FeaturesNamespaces.URI_1_1_0.equalsIgnoreCase(uri)){ return true; } + if(FeaturesNamespaces.URI_1_2_0.equalsIgnoreCase(uri)){ + return true; + } if(FeaturesNamespaces.URI_CURRENT.equalsIgnoreCase(uri)){ return true; } 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 921c832..8e09748 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,6 @@ public interface FeaturesNamespaces { QName FEATURES_1_1_0 = new QName(URI_1_1_0, "features"); QName FEATURES_1_2_0 = new QName(URI_1_2_0, "features"); - QName FEATURES_CURRENT = FEATURES_1_1_0; + QName FEATURES_CURRENT = FEATURES_1_2_0; } diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java index f994bc1..c86a58c 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java @@ -17,5 +17,5 @@ * under the License. */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://karaf.apache.org/xmlns/features/v1.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@javax.xml.bind.annotation.XmlSchema(namespace = org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT, elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.karaf.features.internal.model; -- 1.7.9.5