Roy Golan has uploaded a new change for review.
Change subject: core: make Log and LogFactory a CDI bean
......................................................................
core: make Log and LogFactory a CDI bean
Change-Id: Ib2be272cc33b8338310a19133241449764a493b1
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
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/application/META-INF/jboss-deployment-structure.xml
5 files changed, 33 insertions(+), 35 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/29499/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
index 132d3c8..583ae50 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
@@ -1,30 +1,11 @@
package org.ovirt.engine.core.bll;
-import java.nio.file.FileSystems;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.ConcurrencyManagement;
-import javax.ejb.ConcurrencyManagementType;
-import javax.ejb.DependsOn;
-import javax.ejb.Local;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.inject.Inject;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.Interceptors;
-
import org.apache.commons.collections.KeyValue;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.ovirt.engine.core.aaa.AuthenticationProfileRepository;
import org.ovirt.engine.api.extensions.aaa.Acct;
import org.ovirt.engine.core.aaa.AcctUtils;
+import org.ovirt.engine.core.aaa.AuthenticationProfileRepository;
import org.ovirt.engine.core.bll.attestationbroker.AttestThread;
import org.ovirt.engine.core.bll.context.CommandContext;
import org.ovirt.engine.core.bll.context.EngineContext;
@@ -37,6 +18,7 @@
import org.ovirt.engine.core.bll.job.JobRepositoryFactory;
import org.ovirt.engine.core.bll.quota.QuotaManager;
import org.ovirt.engine.core.bll.session.SessionDataContainer;
+import org.ovirt.engine.core.bll.utils.Injector;
import org.ovirt.engine.core.common.EngineWorkingMode;
import org.ovirt.engine.core.common.action.LoginUserParameters;
import org.ovirt.engine.core.common.action.LogoutUserParameters;
@@ -62,7 +44,6 @@
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
-import org.ovirt.engine.core.bll.utils.Injector;
import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
import org.ovirt.engine.core.compat.DateTime;
@@ -80,9 +61,26 @@
import org.ovirt.engine.core.utils.ejb.EjbUtils;
import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager;
import org.ovirt.engine.core.utils.log.Log;
-import org.ovirt.engine.core.utils.log.LogFactory;
import org.ovirt.engine.core.utils.osinfo.OsInfoPreferencesLoader;
import org.ovirt.engine.core.utils.timer.SchedulerUtilQuartzImpl;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.ConcurrencyManagement;
+import javax.ejb.ConcurrencyManagementType;
+import javax.ejb.DependsOn;
+import javax.ejb.Local;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.inject.Inject;
+import javax.interceptor.ExcludeClassInterceptors;
+import javax.interceptor.Interceptors;
+import java.nio.file.FileSystems;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
// Here we use a Singleton Bean
// The @Startup annotation is to make sure the bean is initialized on startup.
@@ -143,7 +141,7 @@
AcctUtils.reportReason(Acct.ReportReason.SHUTDOWN, "Shutting down
engine");
}
- private static void checkDBConnectivity() {
+ private void checkDBConnectivity() {
boolean dbUp = false;
long expectedTimeout =
System.currentTimeMillis()
@@ -328,7 +326,7 @@
/**
* Handles compensation in case of uncompleted compensation-aware commands
resulted from server failure.
*/
- private static void compensate() {
+ private void compensate() {
// get all command snapshot entries
List<KeyValue> commandSnapshots =
DbFacade.getInstance().getBusinessEntitySnapshotDao().getAllCommands();
@@ -674,7 +672,8 @@
return runAction(action, true);
}
- private static final Log log = LogFactory.getLog(Backend.class);
+ @Inject
+ private Log log;
@Override
public VdcQueryReturnValue runInternalQuery(VdcQueryType queryType,
VdcQueryParametersBase queryParameters) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
index c397219..660030f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
@@ -1,11 +1,8 @@
package org.ovirt.engine.core.bll.utils;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.utils.log.Log;
-import org.ovirt.engine.core.utils.log.LogFactory;
+
+import javax.enterprise.inject.Produces;
/**
* This class is made to keep all producers of bll dependencies, generally
singletons from other jars in one place for the
@@ -37,10 +34,10 @@
*
* @param injectionPoint
*/
- @Produces
- public Log produceLogger(InjectionPoint injectionPoint) {
- return
LogFactory.getLog(injectionPoint.getMember().getDeclaringClass());
- }
+// @Produces
+// public Log produceLogger(InjectionPoint injectionPoint) {
+// return
LogFactory.getLog(injectionPoint.getMember().getDeclaringClass());
+// }
private BllCDIAdapter() {
diff --git
a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
index f174cb3..a2a12ae 100644
---
a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
+++
b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
@@ -8,6 +8,8 @@
<dependencies>
<module name="javax.api"/>
+ <module name="javax.inject.api"/>
+ <module name="javax.enterprise.api"/>
<module name="javax.ejb.api"/>
<module name="javax.servlet.api"/>
<module name="javax.servlet.jstl.api"/>
diff --git
a/backend/manager/modules/utils/src/main/resources/META-INF/beans.xml
b/backend/manager/modules/utils/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/backend/manager/modules/utils/src/main/resources/META-INF/beans.xml
diff --git a/ear/src/main/application/META-INF/jboss-deployment-structure.xml
b/ear/src/main/application/META-INF/jboss-deployment-structure.xml
index aa38dfa..dae360c 100644
--- a/ear/src/main/application/META-INF/jboss-deployment-structure.xml
+++ b/ear/src/main/application/META-INF/jboss-deployment-structure.xml
@@ -31,7 +31,7 @@
<module name="org.ovirt.engine.core.dal" export="true"
meta-inf="import"/>
<module name="org.ovirt.engine.core.extensions-manager"
export="true"/>
<module name="org.ovirt.engine.core.searchbackend" export="true"/>
- <module name="org.ovirt.engine.core.utils" export="true"
meta-inf="import"/>
+ <module name="org.ovirt.engine.core.utils" annotations="true"
export="true" meta-inf="import"/>
<module name="org.ovirt.engine.core.uutils" export="true"/>
<module name="org.ovirt.engine.extensions.builtin" export="true"/>
<module name="org.ovirt.otopi" export="true"/>
--
To view, visit http://gerrit.ovirt.org/29499
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2be272cc33b8338310a19133241449764a493b1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
