Einav Cohen has submitted this change and it was merged.
Change subject: packaging: Move ROOT.war to the EAR
......................................................................
packaging: Move ROOT.war to the EAR
This patch moves the root web application to the EAR file. This
has several advantages:
1. There is only one deployment unit to add to the application
server, so the setup and packaging is simplified.
2. The root web application works without needing to use the
engine-setup tool. This can be very useful for development
environments.
3. The root web application is a regular maven subproject so it
can be built taking advantage of all the maven capabilities. In
particular the content can be dynamically generated using
servlets. In fact this is already used to generate the following
files:
web-conf.js
Instead of copying this file from the /etc/ovirt-engine
directory the application contains a servlet that reads that
file
and sends it content. It also can guess the content of the file
even if it doesn't exist (useful for development environments).
ca.pem
Instead of copying this file from the /etc/pki/ovirt-engine
directory the application uses a servlet to read it from its
original location and send the content with the right content
type.
engine.ssh.key.txt
Instead of copying the file from /etc/pki/ovirt-engine/keys
directory the application uses a servlet to read it from its
original location. This could be improved to generate the
content directly from the keystore.
This means three files that don't need to be copied or symlinked
during the setup of the engine and can be placed only in the
directories they are expected to be according to the file system
standards (configuration files only in /etc, so on).
This patch also simplifies the setup tools so that they don't need
to modify the web.xml file.
Change-Id: I1d3aa9af7b78546b5449031c8db23ff766b68496
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M Makefile
M backend/manager/conf/ca/installCA_dev.sh
M backend/manager/modules/pom.xml
A backend/manager/modules/root/pom.xml
A backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FileServlet.java
A backend/manager/modules/root/src/main/java/org/ovirt/engine/core/ServletUtils.java
A backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WebConfServlet.java
A backend/manager/modules/root/src/main/resources/META-INF/MANIFEST.MF
A backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
R backend/manager/modules/root/src/main/webapp/engineVersion.js
R backend/manager/modules/root/src/main/webapp/favicon.ico
R backend/manager/modules/root/src/main/webapp/images/bg_head.gif
R backend/manager/modules/root/src/main/webapp/images/bg_main.gif
R backend/manager/modules/root/src/main/webapp/images/logo.png
A backend/manager/modules/root/src/main/webapp/index.html
A backend/manager/modules/root/src/main/webapp/style.css
A backend/manager/modules/root/src/resources/META-INF/MANIFEST.MF
M ear/pom.xml
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/engine-cleanup.py
M packaging/fedora/setup/engine-setup.py
M packaging/fedora/setup/output_messages.py
M packaging/fedora/setup/ovirt_port80.py
D packaging/fedora/setup/resources/jboss/ROOT.war/WEB-INF/context.xml
D packaging/fedora/setup/resources/jboss/ROOT.war/WEB-INF/jboss-web.xml
D packaging/fedora/setup/resources/jboss/ROOT.war/WEB-INF/web.xml
D packaging/fedora/setup/resources/jboss/ROOT.war/engine_index.html
D packaging/fedora/setup/resources/jboss/ROOT.war/style.css
M packaging/fedora/spec/ovirt-engine.spec.in
29 files changed, 538 insertions(+), 396 deletions(-)
Approvals:
Juan Hernandez: Verified
Einav Cohen: Verified; Looks good to me, approved
--
To view, visit
http://gerrit.ovirt.org/3782
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d3aa9af7b78546b5449031c8db23ff766b68496
Gerrit-PatchSet: 9
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>