[rhq-project/rhq] 193806: [BZ 1303952] Separate EAP6 instances from EAP7 ins...
by Libor Zoubek
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 19380654f8225567781d0174e2e1a022cf031064
https://github.com/rhq-project/rhq/commit/19380654f8225567781d0174e2e1a02...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModuleOptionsComponent.java
Log Message:
-----------
[BZ 1303952] Separate EAP6 instances from EAP7 instances by using domain version (sort of like Wildfly 8 detection was done). Keep the "EAP" as SHORT_NAME since several feature detections are using EAP as magic word
Commit: 9411d7cd82d695c4cc424fb6a811bad5182d0977
https://github.com/rhq-project/rhq/commit/9411d7cd82d695c4cc424fb6a811bad...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
Log Message:
-----------
[BZ 1314384] If EAP7 is detected, ignore it
Commit: d41551fe316a74335fed27fc9a23e09690f6fb8b
https://github.com/rhq-project/rhq/commit/d41551fe316a74335fed27fc9a23e09...
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
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.
(cherry picked from commit 0226e3c1164a696da127ba7a1eaf4d80c013216c)
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
0b4745e8a6c48943fcb821c5cd557bc7f03678bd
5bcfe335ca257bcc142d9ac74103e1b5f911b61e
0a9a4eee63ca268da106bd6d20b1c0dc4252e645
181b92a192b9b09c96d2ebaf62424944a969880c
Conflicts:
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Commit: 4ccdda039237d2840c51054ecc0e6f75ceec113a
https://github.com/rhq-project/rhq/commit/4ccdda039237d2840c51054ecc0e6f7...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
[BZ 1314782] Add missing null check for HostXmlFile
Commit: e828b787d3321a6cdad6bae805b68f8c86d69780
https://github.com/rhq-project/rhq/commit/e828b787d3321a6cdad6bae805b68f8...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java
A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/JBossCliConfiguration.java
A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/TruststoreConfig.java
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java
A modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/helper/JBossCliConfigurationTest.java
A modules/plugins/jboss-as-7/src/test/resources/jboss-cli-1.0.xml
A modules/plugins/jboss-as-7/src/test/resources/jboss-cli-1.3.xml
M modules/plugins/jboss-as-7/src/test/resources/standalone711.xml
Log Message:
-----------
Bug 1236631 - Add a way to setup SSL settings in jboss-cli.xml
Added operation called "Setup CLI" which can change jboss-cli.xml according
to pluginConfiguration properties. It can configure SSL stuff + default
controller host + port. Operation is present for Standalone and Host
Controllers. When setting up jboss-cli.xml security, truststore
path+password can be either taken from plugin config and written as
plaintext (default) or if using vault, it can be copied from server's
standalone.xml. Supports all known scheme versions of jboss-cli.xml (earlier
may fail to store trustore passwords using vault)
Compare: https://github.com/rhq-project/rhq/compare/357691f86611...e828b787d332
8 years, 1 month