Juan Hernandez has uploaded a new change for review. Change subject: core: Move the session cleaner interceptor to bll ......................................................................
core: Move the session cleaner interceptor to bll Commit 028ff6 moved the utils library to a JBoss module, but the application server doesn't load correctly interceptors from these modules, so the local session cleaner interceptors has to be moved to the same .jar file containing the intercepted bean, otherwise the interceptor is ignored. Backported from master committ 5eaa94df4873b2e19ad7275ea0f039fe6ca4fea2. Change-Id: I6cc78a0c8f8af468a233a0be19f69bfd9de7ab9f Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/pom.xml M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interceptors/ThreadLocalSessionCleanerInterceptor.java M backend/manager/modules/utils/pom.xml M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml 5 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/12633/1 diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index fde4507..9813730 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -100,6 +100,11 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.1_spec</artifactId> + </dependency> + <!-- logging implementation used for unit tests --> <dependency> <groupId>org.slf4j</groupId> 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 de90e3a..7bd5347 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 @@ -57,7 +57,7 @@ import org.ovirt.engine.core.searchbackend.BaseConditionFieldAutoCompleter; import org.ovirt.engine.core.utils.ErrorTranslatorImpl; import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; -import org.ovirt.engine.core.utils.ThreadLocalSessionCleanerInterceptor; +import org.ovirt.engine.core.bll.interceptors.ThreadLocalSessionCleanerInterceptor; import org.ovirt.engine.core.utils.ejb.BeanProxyType; import org.ovirt.engine.core.utils.ejb.BeanType; import org.ovirt.engine.core.utils.ejb.EjbUtils; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ThreadLocalSessionCleanerInterceptor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interceptors/ThreadLocalSessionCleanerInterceptor.java similarity index 76% rename from backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ThreadLocalSessionCleanerInterceptor.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interceptors/ThreadLocalSessionCleanerInterceptor.java index a41b894..18f204b 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ThreadLocalSessionCleanerInterceptor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interceptors/ThreadLocalSessionCleanerInterceptor.java @@ -1,8 +1,10 @@ -package org.ovirt.engine.core.utils; +package org.ovirt.engine.core.bll.interceptors; import javax.interceptor.AroundInvoke; import javax.interceptor.InvocationContext; +import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; + public class ThreadLocalSessionCleanerInterceptor { @AroundInvoke diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml index 0ec3127..493ab7e 100644 --- a/backend/manager/modules/utils/pom.xml +++ b/backend/manager/modules/utils/pom.xml @@ -13,11 +13,6 @@ <name>Common utilities</name> <dependencies> - <dependency> - <groupId>org.jboss.spec.javax.interceptor</groupId> - <artifactId>jboss-interceptors-api_1.1_spec</artifactId> - <version>1.0.0.Final</version> - </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> 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 ca92063..723b5b2 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 @@ -9,7 +9,6 @@ <dependencies> <module name="javax.api"/> <module name="javax.ejb.api"/> - <module name="javax.interceptor.api"/> <module name="javax.servlet.api"/> <module name="javax.transaction.api"/> <module name="org.apache.commons.codec"/> -- To view, visit http://gerrit.ovirt.org/12633 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cc78a0c8f8af468a233a0be19f69bfd9de7ab9f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
