Description of problem: EAP6 plugin will detect and fail to add EAP7 instances. The monitoring and management of EAP7 instances will be done by separate plugin, so EAP6 should detect the case where EAP7 was incorrectly detected and ignore it. Version-Release number of selected component (if applicable): 3.3.5 / EAP plugin pack 02 How reproducible: Steps to Reproduce: 1. 2. 3. Actual results: EAP6-plugin adds EAP7 instance, but fails with InvalidPluginConfiguration. Expected results: EAP6 plugin ignores detected EAP7 instances. Additional info:
Fixed in the master: commit 6b04a3b3e9a1ac7ad25771d54300834e048ae986 Author: Michael Burman <miburman> Date: Thu Mar 3 15:33:58 2016 +0200 [BZ 1314384] If EAP7 is detected, ignore it commit f01d65c0845ff7e4ce5a3d8794e36b67fe88d2e7 Author: Michael Burman <miburman> Date: Thu Feb 11 21:11:07 2016 +0200 [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
The commits look good to me. I'm just not sure the "if(apiVersion.startsWith("1"))" check is valid with all EAP6 versions. Can you confirm it is?
Well, the AS7 starts at 1.0 and EAP6.4 is 1.4 (and Wildfly 8 is 2.0, Wildfly 9 is 3.0 and Wildfly 10 is 4.0, EAP7.0.0 is 4.0). I'll download the EAP6.0 to verify, but other versions do apply.
Sounds good then.
Moving to ON_QA as available for test with DR build: http://jon01.mw.lab.eng.bos.redhat.com:8042/dist/release/jon/plugins/eap/3.3/Update-03/DR02/jon-plugin-pack-eap-3.3.0.GA-update-03-DR02.zip