Bug 1171720 - AS7 upgrade fails if productType is missing

Added code which also re-discoveres productType when upgrading resource's
supportsPatching pluginConfig property in case it's null.

Author: Libor Zoubek

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

@@ -548,11 +548,49 @@ public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource)
         if (supportsPatching == null || supportsPatching.startsWith("__UNINITIALIZED_")) {
             upgraded = true;
 
-            JBossProductType productType = JBossProductType.valueOf(pluginConfiguration.getSimpleValue("productType"));
-            pluginConfiguration
+            JBossProductType productType = serverPluginConfiguration.getProductType();
+            if (productType == null) {
+                if (inventoriedResource.getNativeProcess() != null) {
+                    // if resource seems to run, detect product type
+                    AS7CommandLine commandLine = new AS7CommandLine(inventoriedResource.getNativeProcess());
+                    File homeDir = getHomeDir(inventoriedResource.getNativeProcess(), commandLine);
+                    File baseDir = getBaseDir(inventoriedResource.getNativeProcess(), commandLine, homeDir);
+                    File configDir = getConfigDir(inventoriedResource.getNativeProcess(), commandLine, baseDir);
+                    File hostXmlFile = getHostXmlFile(commandLine, configDir);
+                    if (hostXmlFile.exists()) {
+                        try {
+                            HostConfiguration hostConfig = loadHostConfiguration(hostXmlFile);
+                            String apiVersion = hostConfig.getDomainApiVersion();
+                            productType = JBossProductType.determineJBossProductType(homeDir, apiVersion);
+                            serverPluginConfiguration.setProductType(productType);
+                            pluginConfiguration.setSimpleValue("supportsPatching",
+                                Boolean.toString(supportsPatching(productType, inventoriedResource.getVersion())));
+                            report.setNewPluginConfiguration(pluginConfiguration);
+                            LOG.info(productType);
+                        } catch (Exception e) {
+                            LOG.warn("Unable to detect productType", e);
+                        }
+                    } else {
+                        LOG.warn("Unable to upgrade resource " + inventoriedResource
+                            + "Server configuration file not found at the expected location (" + hostXmlFile + ").");
+                        upgraded = false;
+                    }
+
+
+                } else {
+                    // we have to skip upgrading at this point since it is not running and we're unable to detect productType
+                    LOG.warn("Unable to upgrade resource "
+                        + inventoriedResource
+                        + " : resource is missing productType pluginConfiguration property and needs to be running in order to discover it");
+                    upgraded = false;
+                }
+            } else {
+                pluginConfiguration
                 .setSimpleValue("supportsPatching", Boolean.toString(supportsPatching(productType, inventoriedResource.getVersion())));
+                report.setNewPluginConfiguration(pluginConfiguration);
+            }
+
 
-            report.setNewPluginConfiguration(pluginConfiguration);
         }
         // detect if server is running and has default values
         if (inventoriedResource.getNativeProcess() != null