3:59 p.m.
Branch: refs/heads/hotfix/jon3.1.2
Home: https://github.com/rhq-project/rhq
Commit: dacab80cb014a34a23ad32a61643fbe26b4fa5dc
https://github.com/rhq-project/rhq/commit/dacab80cb014a34a23ad32a61643fbe...
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
Incorrect copyright date introduced by commit f2dc897
Corrected copyright start date. This class was not introduced until
2011.
Commit: 0226e3c1164a696da127ba7a1eaf4d80c013216c
https://github.com/rhq-project/rhq/commit/0226e3c1164a696da127ba7a1eaf4d8...
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
BZ-1203469: Fail to manually import JBoss EAP based products when product 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.
Commit: 29b503b5cfd3f9a99c1a8c10bac23b1c272bd0af
https://github.com/rhq-project/rhq/commit/29b503b5cfd3f9a99c1a8c10bac23b1...
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
BZ-1203469: Fail to auto discover EAP based products when product 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.
This fix allows the product type to fallback to a generic AS instance in
the event its product slot is unknown and a the home directory name does
not include a product key in its name.
Commit: 03caa627cba0c0b09454b3fd89f5bdd08490aff5
https://github.com/rhq-project/rhq/commit/03caa627cba0c0b09454b3fd89f5bdd...
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
Merge branch 'RHQ_4_4_0_JON312GA/bug/1203469' into hotfix/jon3.1.2
This allows AS7 based products to be discovered as AS instances in the event they are for
unknown or unsupported product slots.
Compare: https://github.com/rhq-project/rhq/compare/dbab1189aba8...03caa627cba0