[KARAF-1752] remove hard coded features uri in features deployer feature discovery; THX to Andrei Pozolotin for the patch

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1376824 13f79535-47bb-0310-9956-ffa450edef68

Author: anpieber

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

@@ -35,6 +35,7 @@
 
 import org.apache.felix.fileinstall.ArtifactUrlTransformer;
 import org.apache.karaf.features.Feature;
+import org.apache.karaf.features.FeaturesNamespaces;
 import org.apache.karaf.features.FeaturesService;
 import org.apache.karaf.features.Repository;
 import org.osgi.framework.Bundle;
@@ -87,14 +88,37 @@ public void destroy() throws Exception {
         bundleContext.removeBundleListener(this);
     }
 
+    private boolean isKnownFeaturesURI(String uri){
+    	if(uri == null){
+    		return true;
+    	}
+    	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_CURRENT.equalsIgnoreCase(uri)){
+    		return true;
+    	}
+    	return false;
+    }
+    
     public boolean canHandle(File artifact) {
         try {
             if (artifact.isFile() && artifact.getName().endsWith(".xml")) {
                 Document doc = parse(artifact);
                 String name = doc.getDocumentElement().getLocalName();
                 String uri  = doc.getDocumentElement().getNamespaceURI();
-                if ("features".equals(name) && (uri == null || "".equals(uri) || "http://karaf.apache.org/xmlns/features/v1.0.0".equalsIgnoreCase(uri))) {
-                    return true;
+                if ("features".equals(name) ) {
+                	if(isKnownFeaturesURI(uri)){
+                        return true;
+                	} else {
+                		logger.error("unknown features uri", new Exception("" + uri));
+                	}
                 }
             }
         } catch (Exception e) {

features/core/src/main/java/org/apache/karaf/features/internal/FeaturesNamespaces.java renamed to features/core/src/main/java/org/apache/karaf/features/FeaturesNamespaces.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.karaf.features.internal;
+package org.apache.karaf.features;
 
 import javax.xml.namespace.QName;
 

features/core/src/main/java/org/apache/karaf/features/internal/FeatureValidationUtil.java

@@ -29,6 +29,7 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
+import org.apache.karaf.features.FeaturesNamespaces;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;

features/core/src/main/java/org/apache/karaf/features/internal/model/JaxbUtil.java

@@ -35,7 +35,7 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.transform.sax.SAXSource;
 
-import org.apache.karaf.features.internal.FeaturesNamespaces;
+import org.apache.karaf.features.FeaturesNamespaces;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;

features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java

@@ -20,4 +20,4 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = FeaturesNamespaces.URI_CURRENT, elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.apache.karaf.features.internal.model;
 
-import org.apache.karaf.features.internal.FeaturesNamespaces;
+import org.apache.karaf.features.FeaturesNamespaces;

tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java

@@ -29,7 +29,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
 
-import org.apache.karaf.features.internal.FeaturesNamespaces;
+import org.apache.karaf.features.FeaturesNamespaces;
 import org.apache.karaf.features.internal.model.Features;
 import org.apache.karaf.features.internal.model.Feature;
 import org.apache.karaf.features.internal.model.JaxbUtil;