[resolves #144] Add plugin support for multiple namespace versions

Author: jamesnetherton

config/src/main/java/org/wildfly/extras/config/ConfigSupport.java

@@ -92,7 +92,6 @@ public static void applyConfigChange(Path jbossHome, List<String> configs, boole
                 ConfigLogger.info("Processing config for: " + plugin.getConfigName());
 
                 applyLayerChanges(jbossHome, plugin, enable);
-
                 applyConfigurationChanges(jbossHome, plugin, enable);
             }
         }
@@ -255,7 +254,6 @@ private static void applyConfigurationChanges(Path jbossHome, ConfigPlugin plugi
         domainPaths.add(Paths.get("domain", "configuration", "domain.xml"));
 
         String message = (enable ? "\tEnable " : "\tDisable ") + plugin.getConfigName() + " configuration in: ";
-
         String lineSeparator = System.getProperty("line.separator");
 
         SAXBuilder jdom = new SAXBuilder();
@@ -374,16 +372,33 @@ private static byte[] loadBytesFromURL(URL resource) throws IOException {
         return out.toByteArray();
     }
 
-    @SuppressWarnings("unchecked")
+    @Deprecated
     public static Element findElementWithAttributeValue(Element element, String name, Namespace ns, String attrName, String attrValue) {
-        if (element.getName().equals(name) && element.getNamespace().equals(ns)) {
-            Attribute attribute = element.getAttribute(attrName);
-            if (attribute != null && attrValue.equals(attribute.getValue())) {
-                return element;
+        return findElementWithAttributeValue(element, name, attrName, attrValue, ns);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Element findElementWithAttributeValue(Element element, String name, String attrName, String attrValue, Namespace... supportedNamespaces) {
+        for (Namespace ns : supportedNamespaces) {
+            if (element.getName().equals(name) && element.getNamespace().equals(ns)) {
+                Attribute attribute = element.getAttribute(attrName);
+                if (attribute != null && attrValue.equals(attribute.getValue())) {
+                    return element;
+                }
+            }
+            for (Element ch : (List<Element>) element.getChildren()) {
+                Element result = findElementWithAttributeValue(ch, name, attrName, attrValue, supportedNamespaces);
+                if (result != null) {
+                    return result;
+                }
             }
         }
-        for (Element ch : (List<Element>) element.getChildren()) {
-            Element result = findElementWithAttributeValue(ch, name, ns, attrName, attrValue);
+        return null;
+    }
+
+    public static Element findChildElement(Element parent, String name, Namespace... supportedNamespaces) {
+        for (Namespace ns : supportedNamespaces) {
+            Element result = parent.getChild(name, ns);
             if (result != null) {
                 return result;
             }
@@ -408,18 +423,24 @@ public static Map<String, Element> mapByAttributeName(List<Element> elements, St
         return rc;
     }
 
-    @SuppressWarnings("unchecked")
+    @Deprecated
     public static List<Element> findProfileElements(Document doc, Namespace ns) {
+        return findProfileElements(doc, new Namespace[] {ns});
+    }
+
+    @SuppressWarnings("unchecked")
+    public static List<Element> findProfileElements(Document doc, Namespace... supportedNamespaces) {
         List<Element> result = new ArrayList<>();
-        Element profile = doc.getRootElement().getChild("profile", ns);
-        if (profile != null) {
-            result.add(profile);
-        }
-        Element profiles = doc.getRootElement().getChild("profiles", ns);
-        if (profiles != null) {
-            result.addAll(profiles.getChildren("profile", ns));
+        for (Namespace ns : supportedNamespaces) {
+            Element profile = doc.getRootElement().getChild("profile", ns);
+            if (profile != null) {
+                result.add(profile);
+            }
+            Element profiles = doc.getRootElement().getChild("profiles", ns);
+            if (profiles != null) {
+                result.addAll(profiles.getChildren("profile", ns));
+            }
         }
         return result;
     }
-
 }

config/src/main/java/org/wildfly/extras/config/NamespaceConstants.java

@@ -0,0 +1,28 @@
+/*
+ * #%L
+ * Fuse EAP :: Config
+ * %%
+ * Copyright (C) 2015 RedHat
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package org.wildfly.extras.config;
+
+public interface NamespaceConstants {
+    String NS_DOMAIN = "urn:jboss:domain";
+    String NS_INFINISPAN = "urn:jboss:domain:infinispan";
+    String NS_LOGGING = "urn:jboss:domain:logging";
+    String NS_SECURITY = "urn:jboss:domain:security";
+    String NS_WELD = "urn:jboss:domain:weld";
+}

config/src/main/java/org/wildfly/extras/config/NamespaceRegistry.java

@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * Fuse EAP :: Config
+ * %%
+ * Copyright (C) 2015 RedHat
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package org.wildfly.extras.config;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jdom.Namespace;
+import org.wildfly.extras.config.internal.IllegalArgumentAssertion;
+
+public class NamespaceRegistry {
+    private Map<String, List<Namespace>> namespaces = new LinkedHashMap<>();
+
+    public void registerNamespace(String namespace, String version) {
+        if (!namespaces.containsKey(namespace)) {
+            namespaces.put(namespace, new ArrayList<Namespace>());
+        }
+        namespaces.get(namespace).add(Namespace.getNamespace(namespace + ":" + version));
+    }
+
+    public Namespace[] getNamespaces(String namespace) {
+        IllegalArgumentAssertion.assertTrue(namespaces.containsKey(namespace), "Unsupported namespace: " + namespace);
+        List<Namespace> namespaces = this.namespaces.get(namespace);
+        return namespaces.toArray(new Namespace[namespaces.size()]);
+    }
+}

config/src/test/java/org/wildfly/camel/test/config/ConfigSupportTest.java

@@ -58,7 +58,7 @@ public List<LayerConfig> getLayerConfigs() {
             @Override
             public void applyStandaloneConfigChange(ConfigContext context, boolean enable) {
             }
-            
+
             @Override
             public void applyDomainConfigChange(ConfigContext context, boolean enable) {
             }
@@ -109,7 +109,7 @@ public List<LayerConfig> getLayerConfigs() {
             @Override
             public void applyStandaloneConfigChange(ConfigContext context, boolean enable) {
             }
-            
+
             @Override
             public void applyDomainConfigChange(ConfigContext context, boolean enable) {
             }