Bug 1173479 - 4.13: Native Management Port/Host does not take into ac…

…count

port offset?

Fixed AS7 resourceUpgrade code to always detect native management host/port
in case resource is running and defaults are set

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

@@ -554,6 +554,24 @@ public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource)
 
             report.setNewPluginConfiguration(pluginConfiguration);
         }
+        // detect if server is running and has default values
+        if (inventoriedResource.getNativeProcess() != null
+            && "127.0.0.1".equals(serverPluginConfiguration.getNativeHost())
+            && Integer.valueOf(9999).equals(serverPluginConfiguration.getNativePort())) {
+            try {
+                AS7CommandLine commandLine = new AS7CommandLine(inventoriedResource.getNativeProcess());
+                HostConfiguration hostConfiguration = loadHostConfiguration(serverPluginConfiguration
+                    .getHostConfigFile());
+                HostPort hp = hostConfiguration.getNativeHostPort(commandLine, getMode());
+                serverPluginConfiguration.setNativeHost(hp.host);
+                serverPluginConfiguration.setNativePort(hp.port);
+                report.setNewPluginConfiguration(serverPluginConfiguration.getPluginConfig());
+                LOG.info("Detected native host/port " + hp + " for " + inventoriedResource.getResourceKey());
+                upgraded = true;
+            } catch (Exception e) {
+                LOG.error("Unable to detect and upgrade native management host and port", e);
+            }
+        }
 
         if (upgraded) {
             return report;