Roy Golan has submitted this change and it was merged. Change subject: core: make EventQueue a CDI Singleton, dump jndi ...................................................................... core: make EventQueue a CDI Singleton, dump jndi - EventQueueMonitor is now a Singleton bean till now it was an EJB so we can lookup it. It used the tangled EjbStrategy* to get the dependency replaced in test time. This is not needed anymore when using CDI - drop jndi usage and use CDI instead instead of doing a jndi lookup all instances could be injected info beans. Change-Id: I966e995dd10b93d968cec135f10ab55f1bd729a7 Signed-off-by: Roy Golan <rgolan(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/eventqueue/EventQueueMonitor.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java 10 files changed, 78 insertions(+), 75 deletions(-) Approvals: Roy Golan: Verified; Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/40642 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I966e995dd10b93d968cec135f10ab55f1bd729a7 Gerrit-PatchSet: 8 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Dudi Maroshi <dudi(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org