Juan Hernandez has uploaded a new change for review.
Change subject: core: Deploy beans as independent .jar
......................................................................
core: Deploy beans as independent .jar
This change moves the EJBs out of the .ear, so that they can be deployed
as an independent application. After doing that movemenet there are no
more applications inside the .ear, so it has been removed.
The "ear" project hasn't been removed in order to avoid confusion for
developers used to run "cd ear; mvn install -Pdep". That will continue
to work, but it will deploy the independent applications instead of the
.ear.
Change-Id: I9108e2bc98ec6420fa8b443ac06ceae3b394b1f6
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M Makefile
M backend/manager/conf/engine.conf.defaults.in
M backend/manager/modules/beans/pom.xml
D backend/manager/modules/beans/src/main/resources/META-INF/MANIFEST.MF
A
backend/manager/modules/beans/src/main/resources/META-INF/jboss-deployment-structure.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
D ear/src/main/resources/META-INF/MANIFEST.MF
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
12 files changed, 52 insertions(+), 222 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/13721/1
diff --git a/Makefile b/Makefile
index e9c7b8e..67c0b01 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@
JAVA_DIR=$(DATAROOT_DIR)/java
PKG_SYSCONF_DIR=$(SYSCONF_DIR)/$(ENGINE_NAME)
PKG_PKI_DIR=$(SYSCONF_DIR)/pki/$(ENGINE_NAME)
-PKG_EAR_DIR=$(DATA_DIR)/engine.ear
+PKG_BEANS_DIR=$(DATA_DIR)/beans.jar
PKG_RESTAPI_DIR=$(DATA_DIR)/restapi.war
PKG_ROOT_DIR=$(DATA_DIR)/root.war
PKG_USERPORTAL_DIR=$(DATA_DIR)/userportal.war
@@ -249,15 +249,14 @@
@install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/firewalld/services
install_artifacts:
- @echo "*** Deploying EAR to $(DESTDIR)"
- install -dm 755 $(DESTDIR)$(PKG_EAR_DIR)
+ @echo "*** Deploying artifacts to $(DESTDIR)"
install -dm 755 $(DESTDIR)$(PKG_RESTAPI_DIR)
install -dm 755 $(DESTDIR)$(PKG_ROOT_DIR)
install -dm 755 $(DESTDIR)$(PKG_USERPORTAL_DIR)
install -dm 755 $(DESTDIR)$(PKG_WEBADMIN_DIR)
install -dm 755 $(DESTDIR)$(MAVENPOM_DIR)
- X=`find "$(MAVEN_OUTPUT_DIR)" -name
'engine-server-ear-$(POM_VERSION)*'.ear` && unzip -o "$$X" -d
"$(DESTDIR)$(PKG_EAR_DIR)"
+ find "$(MAVEN_OUTPUT_DIR)" -name 'beans-$(POM_VERSION)*.jar' -not -name
'*-tests.jar' -exec cp {} "$(DESTDIR)$(PKG_BEANS_DIR)" \;
X=`find "$(MAVEN_OUTPUT_DIR)" -name
'restapi-webapp-$(POM_VERSION)*'.war` && unzip -o "$$X" -d
"$(DESTDIR)$(PKG_RESTAPI_DIR)"
X=`find "$(MAVEN_OUTPUT_DIR)" -name 'root-webapp-$(POM_VERSION)*'.war`
&& unzip -o "$$X" -d "$(DESTDIR)$(PKG_ROOT_DIR)"
X=`find "$(MAVEN_OUTPUT_DIR)" -name 'userportal-$(POM_VERSION)*'.war`
&& unzip -o "$$X" -d "$(DESTDIR)$(PKG_USERPORTAL_DIR)"
diff --git a/backend/manager/conf/engine.conf.defaults.in
b/backend/manager/conf/engine.conf.defaults.in
index 1e16d9c..8acae93 100644
--- a/backend/manager/conf/engine.conf.defaults.in
+++ b/backend/manager/conf/engine.conf.defaults.in
@@ -89,12 +89,11 @@
ENGINE_PROPERTIES=
#
-# Additional applications to be deployed in the instance of the
-# application server started by the engine. This is a list of space
-# separated files or directories that should exist under
-# /usr/share/ovirt-engine:
+# Applications to be deployed in the instance of the application server
+# started by the engine. This is a list of space separated files or
+# directories that should exist under /usr/share/ovirt-engine:
#
-ENGINE_APPS="engine.ear restapi.war root.war userportal.war webadmin.war"
+ENGINE_APPS="beans.jar restapi.war root.war userportal.war webadmin.war"
#
# Flags to enable or disable the web server (the proxy) and the
diff --git a/backend/manager/modules/beans/pom.xml
b/backend/manager/modules/beans/pom.xml
index 8eaae2c..71bfb69 100644
--- a/backend/manager/modules/beans/pom.xml
+++ b/backend/manager/modules/beans/pom.xml
@@ -12,26 +12,8 @@
</parent>
<artifactId>beans</artifactId>
- <packaging>ejb</packaging>
+ <packaging>jar</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
deleted file mode 100644
index c0bab0f..0000000
--- a/backend/manager/modules/beans/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-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/beans/src/main/resources/META-INF/jboss-deployment-structure.xml
b/backend/manager/modules/beans/src/main/resources/META-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..5acb2ec
--- /dev/null
+++
b/backend/manager/modules/beans/src/main/resources/META-INF/jboss-deployment-structure.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
+
+ <deployment>
+ <dependencies>
+ <module name="org.ovirt.engine.core.bll" annotations="true"/>
+ <module name="org.ovirt.engine.core.common" annotations="true"/>
+ <module name="org.ovirt.engine.core.scheduler" annotations="true"/>
+ <module name="org.ovirt.engine.core.utils" annotations="true"/>
+ </dependencies>
+ </deployment>
+
+</jboss-deployment-structure>
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 934763d..af8f628 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/beans/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal");
+ backend = (BackendLocal)
initial.lookup("java:global/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 5521323..a950d6e 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,7 +9,7 @@
*/
public class EngineEJBUtilsStrategy extends EJBUtilsStrategy {
- public static final String ENGINE_CONTEXT_PREFIX =
"java:global/engine/beans/";
+ public static final String ENGINE_CONTEXT_PREFIX = "java:global/beans/";
@Override
protected void addJNDIBeans() {
diff --git a/ear/pom.xml b/ear/pom.xml
index e8c2d58..147f261 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -1,4 +1,8 @@
-<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/maven-v4_0_0.xsd";>
+<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/maven-v4_0_0.xsd";>
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -7,41 +11,23 @@
<version>3.3.0-SNAPSHOT</version>
</parent>
- <artifactId>engine-server-ear</artifactId>
- <packaging>ear</packaging>
+ <artifactId>engine-server</artifactId>
+ <packaging>pom</packaging>
- <name>oVirt Server EAR</name>
- <description>oVirt server EAR</description>
-
- <distributionManagement>
- <repository>
- <id>local</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- </distributionManagement>
+ <name>oVirt Server</name>
+ <description>oVirt Server</description>
<properties>
-
<earDirectory>${project.build.directory}/${project.build.finalName}</earDirectory>
<backendConfFiles>${basedir}/../backend/manager/conf</backendConfFiles>
</properties>
<dependencies>
- <!-- Internal Deps -->
- <!-- ** JARs -->
- <dependency>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>vdsbroker</artifactId>
- <version>${engine.version}</version>
- <type>jar</type>
- </dependency>
-
- <!-- WARS -->
+ <!-- Web applications: -->
<dependency>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>root-webapp</artifactId>
<version>${engine.version}</version>
<type>war</type>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -49,7 +35,6 @@
<artifactId>restapi-webapp</artifactId>
<version>${engine.version}</version>
<type>war</type>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -57,7 +42,6 @@
<artifactId>userportal</artifactId>
<version>${engine.version}</version>
<type>war</type>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -65,137 +49,17 @@
<artifactId>webadmin</artifactId>
<version>${engine.version}</version>
<type>war</type>
- <scope>provided</scope>
</dependency>
- <!-- ** EJB-JARs -->
+ <!-- Beans: -->
<dependency>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>beans</artifactId>
<version>${engine.version}</version>
- <type>ejb</type>
- </dependency>
-
- <!-- ** JARs -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
-
- <!-- Set the scope of depedencies provided by JBoss so that
- they are not included in the resulting archive: -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <scope>provided</scope>
+ <type>jar</type>
</dependency>
</dependencies>
-
- <build>
- <finalName>engine</finalName>
-
- <pluginManagement>
- <plugins>
-
- <!-- We need to ignore the execution of the maven-ear-plugin when
- running inside Eclipse, as there is no Eclipse plugin supporting
- most of the parameters that we use and this generates an error
- when importing the project: -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>generate-application-xml</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
-
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <!-- params common to ear:ear and ear:generate-application-xml -->
- <defaultLibBundleDir>lib</defaultLibBundleDir>
- <workDirectory>${earDirectory}</workDirectory>
-
- <!-- J2EE version -->
- <version>1.4</version>
-
- <!-- params for ear:ear -->
- <resourcesDir>${basedir}/target/classes</resourcesDir>
- <unpackTypes>war</unpackTypes>
-
- <!-- params for ear:generate-application-xml -->
- <displayName>ENGINE</displayName>
-
- <modules>
- <!-- ** EJB-JARs -->
- <ejbModule>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>beans</artifactId>
- </ejbModule>
-
- </modules>
-
- <!-- Add a the manifest that contains the required dependencies
- for JBoss modules: -->
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- </archive>
-
- <!-- Add the META-INF directory, all the EJB and web
- applications, and our own dependencies from the
- lib directory, but none of the external dependencies,
- as they are already included as references in the
- manifest: -->
- <packagingIncludes>
- beans.jar/**,
- META-INF/**,
- </packagingIncludes>
-
- </configuration>
- </plugin>
-
- </plugins>
- </build>
<profiles>
@@ -204,7 +68,7 @@
<properties>
<deploymentsDir>${jbossServer}/deployments</deploymentsDir>
- <earDir>${deploymentsDir}/engine.ear</earDir>
+ <beansDir>${deploymentsDir}/beans.jar</beansDir>
<restapiDir>${deploymentsDir}/restapi.war</restapiDir>
<rootDir>${deploymentsDir}/root.war</rootDir>
<userportalDir>${deploymentsDir}/userportal.war</userportalDir>
@@ -320,15 +184,12 @@
dependencies of the project: -->
<dependencyfilesets/>
- <!-- Deploy the .ear: -->
- <mkdir dir="${earDir}"/>
- <unzip dest="${earDir}">
- <fileset dir="${project.build.directory}">
- <include name="${project.build.finalName}.ear"/>
- </fileset>
+ <!-- Deploy the beans .jar: -->
+ <mkdir dir="${beansDir}"/>
+ <unzip dest="${beansDir}">
+ <fileset refid="org.ovirt.engine.core:beans:jar"/>
</unzip>
- <touch file="${earDir}/META-INF/application.xml"/>
- <touch file="${earDir}.dodeploy"/>
+ <touch file="${beansDir}.dodeploy"/>
<!-- Deploy the RESTAPI .war: -->
<mkdir dir="${restapiDir}"/>
@@ -375,7 +236,7 @@
<phase>clean</phase>
<configuration>
<tasks>
- <delete dir="${earDir}"/>
+ <delete dir="${beansDir}"/>
<delete dir="${restapiDir}"/>
<delete dir="${rootDir}"/>
<delete dir="${userportalDir}"/>
diff --git a/ear/src/main/resources/META-INF/MANIFEST.MF
b/ear/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index b045a89..0000000
--- a/ear/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Dependencies: asm.asm,
- javax.validation.api,
- org.apache.commons.beanutils,
- org.apache.commons.codec,
- org.apache.commons.collections,
- org.apache.commons.lang,
- org.apache.log4j,
- org.codehaus.jackson.jackson-core-asl,
- org.codehaus.jackson.jackson-mapper-asl,
- org.dom4j,
- org.hibernate.validator,
- org.ovirt.engine.core.common,
- org.ovirt.engine.core.compat,
- org.ovirt.engine.core.dal,
- org.ovirt.engine.core.dependencies,
- org.ovirt.engine.core.searchbackend,
- org.ovirt.engine.core.utils
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 65e44a5..1cb0e2a 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/beans/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal")
+ mappedName =
"java:global/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 5bf6f6c..639759d 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/beans/Backend!org.ovirt.engine.core.common.interfaces.BackendLocal")
+ mappedName =
"java:global/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 6f28c25..121d665 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -22,7 +22,6 @@
%global engine_name ovirt-engine
%global engine_etc %{_sysconfdir}/%{engine_name}
%global engine_data %{_datadir}/%{engine_name}
-%global engine_ear %{engine_data}/engine.ear
%global engine_java %{_javadir}/%{engine_name}
%global engine_pki %{_sysconfdir}/pki/%{engine_name}
%global engine_jboss_modules %{engine_data}/modules
@@ -32,6 +31,9 @@
%global engine_run %{_localstatedir}/run/%{engine_name}
%global engine_cache %{_localstatedir}/cache/%{engine_name}
%global engine_tmp %{_localstatedir}/tmp/%{engine_name}
+
+# Directory for beans:
+%global beans_jar %{engine_data}/beans.jar
# Directories of web applications:
%global restapi_war %{engine_data}/restapi.war
@@ -93,7 +95,7 @@
JAVA_DIR=%{_javadir} \\\
MAVENPOM_DIR=%{_mavenpomdir} \\\
PKG_SYSCONF_DIR=%{engine_etc} \\\
- PKG_EAR_DIR=%{engine_ear} \\\
+ PKG_BEANS_DIR=%{beans_jar} \\\
PKG_RESTAPI_DIR=%{restapi_war} \\\
PKG_ROOT_DIR=%{root_war} \\\
PKG_USERPORTAL_DIR=%{userportal_war} \\\
@@ -323,7 +325,7 @@
mv %{buildroot}/${lib_path} %{buildroot}/${java_path}
ln -s ${java_path} %{buildroot}${lib_path}
done <<'.'
-%{engine_ear}/beans.jar
+%{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
@@ -541,12 +543,8 @@
# Host deploy logs
%attr(-, %{engine_user}, %{engine_group}) %{engine_log}/host-deploy
-# The backend owns the directory of the ear and most of its contents,
-# but not all, as most of the web applications are owned by other
-# subpackages:
-%dir %{engine_ear}
-%{engine_ear}/META-INF
-%{engine_ear}/beans.jar
+# Beans application:
+%{beans_jar}
# Root web application:
%{root_war}
--
To view, visit http://gerrit.ovirt.org/13721
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9108e2bc98ec6420fa8b443ac06ceae3b394b1f6
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
