Juan Hernandez has uploaded a new change for review. Change subject: core: Deploy all EJBs in a single .jar ......................................................................
core: Deploy all EJBs in a single .jar This change moves all the EJBs to a single "beans.jar" deployment. This new deployment doesn't contain any classes, only the dependencies required to bring all the EJBs from the JBoss modules created in previous changes. Change-Id: Ib2fa1ff28742b87a9a03d96aecace227f6b902b1 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- A backend/manager/modules/beans/pom.xml A backend/manager/modules/beans/src/main/resources/META-INF/MANIFEST.MF M backend/manager/modules/pom.xml M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java M ear/pom.xml M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java M packaging/fedora/spec/ovirt-engine.spec.in 9 files changed, 57 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/13717/1 diff --git a/backend/manager/modules/beans/pom.xml b/backend/manager/modules/beans/pom.xml new file mode 100644 index 0000000..8eaae2c --- /dev/null +++ b/backend/manager/modules/beans/pom.xml @@ -0,0 +1,37 @@ +<project + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>manager-modules</artifactId> + <version>3.3.0-SNAPSHOT</version> + </parent> + + <artifactId>beans</artifactId> + <packaging>ejb</packaging> + + <name>Backend Beans</name> + + <build> + <plugins> + + <!-- Use a custom manifest that includes the dependencies for the + modules that contain the actual classes of the beans: --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <archive> + <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + + </plugins> + </build> + +</project> diff --git a/backend/manager/modules/beans/src/main/resources/META-INF/MANIFEST.MF b/backend/manager/modules/beans/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..c0bab0f --- /dev/null +++ b/backend/manager/modules/beans/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Dependencies: org.ovirt.engine.core.bll annotations, + org.ovirt.engine.core.common annotations, + org.ovirt.engine.core.scheduler annotations, + org.ovirt.engine.core.utils annotations diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml index 0e4843e..6e2589c 100644 --- a/backend/manager/modules/pom.xml +++ b/backend/manager/modules/pom.xml @@ -24,6 +24,7 @@ <module>bll</module> <module>restapi</module> <module>root</module> + <module>beans</module> </modules> <dependencies> diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java index ff5649c..934763d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java @@ -101,7 +101,7 @@ // Lookup the backend bean: try { Context initial = new InitialContext(); - backend = (BackendLocal) initial.lookup("java:global/engine/bll/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal"); + backend = (BackendLocal) initial.lookup("java:global/engine/beans/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal"); } catch (Exception exception) { logger.error("Can't find reference to backend bean.", exception); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java index 5659d31..5521323 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java @@ -9,17 +9,17 @@ */ public class EngineEJBUtilsStrategy extends EJBUtilsStrategy { - public static final String ENGINE_CONTEXT_PREFIX = "java:global/engine/"; + public static final String ENGINE_CONTEXT_PREFIX = "java:global/engine/beans/"; @Override protected void addJNDIBeans() { - addBeanJNDIName(BeanType.BACKEND, ENGINE_CONTEXT_PREFIX.concat("bll/Backend")); - addBeanJNDIName(BeanType.SCHEDULER, ENGINE_CONTEXT_PREFIX.concat("scheduler/Scheduler")); + addBeanJNDIName(BeanType.BACKEND, ENGINE_CONTEXT_PREFIX.concat("Backend")); + addBeanJNDIName(BeanType.SCHEDULER, ENGINE_CONTEXT_PREFIX.concat("Scheduler")); addBeanJNDIName(BeanType.USERS_DOMAINS_CACHE, ENGINE_CONTEXT_PREFIX.concat("bll/UsersDomainsCacheManagerService")); - addBeanJNDIName(BeanType.VDS_EVENT_LISTENER, ENGINE_CONTEXT_PREFIX.concat("bll/VdsEventListener")); - addBeanJNDIName(BeanType.LOCK_MANAGER, ENGINE_CONTEXT_PREFIX.concat("bll/LockManager")); - addBeanJNDIName(BeanType.EVENTQUEUE_MANAGER, ENGINE_CONTEXT_PREFIX.concat("bll/EventQueue")); + addBeanJNDIName(BeanType.VDS_EVENT_LISTENER, ENGINE_CONTEXT_PREFIX.concat("VdsEventListener")); + addBeanJNDIName(BeanType.LOCK_MANAGER, ENGINE_CONTEXT_PREFIX.concat("LockManager")); + addBeanJNDIName(BeanType.EVENTQUEUE_MANAGER, ENGINE_CONTEXT_PREFIX.concat("EventQueue")); } @Override diff --git a/ear/pom.xml b/ear/pom.xml index 9950d3f..bef2ccb 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -67,14 +67,7 @@ <!-- ** EJB-JARs --> <dependency> <groupId>org.ovirt.engine.core</groupId> - <artifactId>scheduler</artifactId> - <version>${engine.version}</version> - <type>ejb</type> - </dependency> - - <dependency> - <groupId>org.ovirt.engine.core</groupId> - <artifactId>bll</artifactId> + <artifactId>beans</artifactId> <version>${engine.version}</version> <type>ejb</type> </dependency> @@ -201,14 +194,7 @@ <!-- ** EJB-JARs --> <ejbModule> <groupId>org.ovirt.engine.core</groupId> - <artifactId>scheduler</artifactId> - <bundleFileName>scheduler.jar</bundleFileName> - </ejbModule> - - <ejbModule> - <groupId>org.ovirt.engine.core</groupId> - <artifactId>bll</artifactId> - <bundleFileName>bll.jar</bundleFileName> + <artifactId>beans</artifactId> </ejbModule> </modules> @@ -229,7 +215,6 @@ *.jar/**, *.war/**, META-INF/**, - lib/vdsbroker.jar/**, </packagingIncludes> </configuration> diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java index f65a690..65e44a5 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java @@ -36,7 +36,7 @@ private BackendLocal backend; @EJB(beanInterface = BackendLocal.class, - mappedName = "java:global/engine/bll/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal") + mappedName = "java:global/engine/beans/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal") public void setBackend(BackendLocal backend) { this.backend = backend; } diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java index 601534e..5bf6f6c 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java @@ -44,7 +44,7 @@ private ObjectMapper mapper; @EJB(beanInterface = BackendLocal.class, - mappedName = "java:global/engine/bll/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal") + mappedName = "java:global/engine/beans/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal") public void setBackend(BackendLocal backend) { this.backend = backend; } diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index c42a3c6..fedfa0c 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -313,9 +313,7 @@ mv %{buildroot}/${lib_path} %{buildroot}/${java_path} ln -s ${java_path} %{buildroot}${lib_path} done <<'.' -%{engine_ear}/bll.jar -%{engine_ear}/lib/vdsbroker.jar -%{engine_ear}/scheduler.jar +%{engine_ear}/beans.jar %{engine_jboss_modules}/org/ovirt/engine/core/bll/main/bll.jar %{engine_jboss_modules}/org/ovirt/engine/core/common/main/common.jar %{engine_jboss_modules}/org/ovirt/engine/core/compat/main/compat.jar @@ -500,6 +498,7 @@ %endif # Jar files: +%{engine_java}/beans.jar %{engine_java}/bll.jar %{engine_java}/dal.jar %{engine_java}/scheduler.jar @@ -537,9 +536,7 @@ # subpackages: %dir %{engine_ear} %{engine_ear}/META-INF -%{engine_ear}/lib -%{engine_ear}/bll.jar -%{engine_ear}/scheduler.jar +%{engine_ear}/beans.jar # Root web application: %{root_war} -- To view, visit http://gerrit.ovirt.org/13717 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2fa1ff28742b87a9a03d96aecace227f6b902b1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
