Separate EAP7 plugin from EAP6 (AS7) plugin

modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java

@@ -156,7 +156,9 @@ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext
                 ProcessInfo process = processScanResult.getProcessInfo();
                 AS7CommandLine commandLine = new AS7CommandLine(process);
                 DiscoveredResourceDetails details = buildResourceDetails(discoveryContext, process, commandLine);
-                discoveredResources.add(details);
+                if (details != null) {
+                    discoveredResources.add(details);
+                }
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Discovered new " + discoveryContext.getResourceType().getName() + " Resource (key=["
                         + details.getResourceKey() + "], name=[" + details.getResourceName() + "], version=["
@@ -221,6 +223,10 @@ protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContex
         pluginConfig.setSimpleValue("realm", hostConfig.getManagementSecurityRealm());
         String apiVersion = hostConfig.getDomainApiVersion();
         JBossProductType productType = JBossProductType.determineJBossProductType(homeDir, apiVersion);
+        if(productType == JBossProductType.EAP7) {
+            // Ignore here, use EAP7 / Wildfly 10 plugin to do the detection
+            return null;
+        }
         serverPluginConfig.setProductType(productType);
         pluginConfig.setSimpleValue("expectedRuntimeProductName", productType.PRODUCT_NAME);
         pluginConfig.setSimpleValue("hostXmlFileName", getHostXmlFileName(commandLine));
@@ -480,6 +486,10 @@ public DiscoveredResourceDetails discoverResource(Configuration pluginConfig, Re
                 + "] as user [" + user + "]. Did you provide the correct credentials?");
         }
 
+        if (productType == JBossProductType.EAP7) {
+            throw new InvalidPluginConfigurationException("EAP7 / Wildfly 10 are not supported by this plugin.");
+        }
+
         HostPort hostPort = new HostPort(false);
         HostPort managementHostPort = new HostPort(false);
         managementHostPort.host = hostname;

modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java

@@ -125,8 +125,9 @@ private static JBossProductType determineJBossProductTypeViaProductConfFile(File
                 throw new Exception("'slot' property not found in " + productConfFile + ".");
             }
             if (slot.equals("eap")) {
-                productType = JBossProductType.EAP;
-                if(apiVersion.startsWith("4")) {
+                if(apiVersion.startsWith("1")) {
+                    productType = JBossProductType.EAP;
+                } else {
                     productType = JBossProductType.EAP7;
                 }
             } else if (slot.equals("ispn")) {

modules/plugins/pom.xml

@@ -135,6 +135,7 @@
            <module>jboss-as</module>
            <module>jboss-as-5</module>
            <module>jboss-as-7</module>
+           <module>wfly-10</module>
            <module>jboss-as-7-jmx</module>
            <module>rhq-server</module>
            <module>jboss-cache-v3</module>

modules/plugins/wfly-10/d2d.sh

@@ -0,0 +1,8 @@
+#!/bin/sh 
+
+M2_REPO=${HOME}/.m2/repository
+RHQ_VERSION='4.14.0-SNAPSHOT'
+OPTS=""
+#OPTS="-agentlib:jdwp=transport=dt_socket,address=8790,server=y,suspend=y"
+
+java $OPTS -cp "target/classes/lib/*:${M2_REPO}/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar:target/rhq-jboss-as-7-plugin-${RHQ_VERSION}.jar:${M2_REPO}/org/rhq/rhq-core-plugin-api/${RHQ_VERSION}/rhq-core-plugin-api-${RHQ_VERSION}.jar:${M2_REPO}/org/rhq/rhq-core-util/${RHQ_VERSION}/rhq-core-util-${RHQ_VERSION}.jar" org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*