This repository has been archived by the owner on Jul 11, 2022. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BZ-1203469: Fail to manually import JBoss EAP based products when pro…
…duct slot is unknown If a JBoss EAP 6/AS 7 instance does not include a bin/product.conf file, it is assumed to be an AS 7 instance. However, if it does include a product.conf file but the slot value is unknown by the as-7 plug-in, an attempt is made to determine its type from its home directory name. If this does not work, discovery is aborted and the JBoss EAP 6 / AS 7 instance can not be imported into inventory. Even when an AS7 resource is manually added, this same problem occurs. This fix allows a manual import to be successful even if the product type can not be determined. A warning is now logged to identify that an unsupported product was found and the product type falls back to AS. (cherry picked from commit 0226e3c) Conflicts: modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java See [BZ 1300727] for more details, but this commit squashes the following four commits and cherry-picks from 3.1.x->3.3.x 0b4745e 5bcfe33 0a9a4ee 181b92a Conflicts: modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
- Loading branch information