Oved Ourfali has submitted this change and it was merged. Change subject: core: Fix CDI in dal module to work with EAP/WildFly ...................................................................... core: Fix CDI in dal module to work with EAP/WildFly 1. Removes infra for injecting beans from external JARs introduced in I3b3c2c57178b5df4f98b4191ac9a06f9129414d0, because it's incompatible with WildFly 8+. 2. Adds beans.xml into dal module to allow automatic beans discovery. 3. Adds weld:scan extension configuration into beans.xml to prevent CDI 1.0 ambiguity error between constructor of PostgresDbEngineDialect and producer method DbFacadeLocator.produceDbEngineDialect() during automatic beans discovery. Change-Id: I122b02f846cfbb9b861d13792790cf93ca7ee0d6 Bug-Url: https://bugzilla.redhat.com/1121327 Signed-off-by: Martin Perina <mperina@redhat.com> --- M backend/manager/dependencies/common/pom.xml D backend/manager/dependencies/common/src/main/modules/org/deltaspike/main/module.xml D backend/manager/dependencies/common/src/main/modules/org/reflections/main/module.xml M backend/manager/modules/bll/pom.xml D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/ModuleConfigurationExtension.java D backend/manager/modules/bll/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension M backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml A backend/manager/modules/dal/src/main/resources/META-INF/beans.xml M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml A backend/manager/modules/utils/src/main/resources/META-INF/beans.xml M ear/src/main/resources/META-INF/MANIFEST.MF M pom.xml 12 files changed, 62 insertions(+), 151 deletions(-) Approvals: Martin Peřina: Verified Jenkins CI: Passed CI tests Oved Ourfali: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/40151 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I122b02f846cfbb9b861d13792790cf93ca7ee0d6 Gerrit-PatchSet: 17 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liran Zelkha <liran.zelkha@gmail.com> Gerrit-Reviewer: Liran Zelkha <lzelkha@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Moti Asayag <masayag@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo@redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits@redhat.com> Gerrit-Reviewer: automation@ovirt.org