[ovirt-engine/f18] Include the health servlet in the build
Juan Hernandez
jhernand at fedoraproject.org
Thu Dec 6 20:52:09 UTC 2012
commit 24f445127ba42061e42ada54ce64b15fdcfe7d07
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Thu Dec 6 21:23:43 2012 +0100
Include the health servlet in the build
ovirt-engine-build-backend-only.patch | 25 ------------
ovirt-engine-dont-build-gwt-components.patch | 25 ++++++++++++
...e-make-dependency-on-servlet-api-explicit.patch | 28 +++++++++++++
ovirt-engine-remove-frontend-from-ear.patch | 42 ++++----------------
ovirt-engine.spec | 11 ++++-
5 files changed, 70 insertions(+), 61 deletions(-)
---
diff --git a/ovirt-engine-dont-build-gwt-components.patch b/ovirt-engine-dont-build-gwt-components.patch
new file mode 100644
index 0000000..b78dc63
--- /dev/null
+++ b/ovirt-engine-dont-build-gwt-components.patch
@@ -0,0 +1,25 @@
+From eae9aecf4d8abab7cacf76199f88c9a497a516e8 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Fri, 25 May 2012 15:39:51 +0200
+Subject: [PATCH] Don't build the GWT components
+
+---
+ frontend/pom.xml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/frontend/pom.xml b/frontend/pom.xml
+index c14010a..5e94615 100644
+--- a/frontend/pom.xml
++++ b/frontend/pom.xml
+@@ -12,8 +12,6 @@
+ <name>oVirt Modules - frontend</name>
+ <description>parent POM for all oVirt modules</description>
+ <modules>
+- <module>webadmin</module>
+- <module>api</module>
+ <module>wars</module>
+ </modules>
+ <properties>
+--
+1.7.11.7
+
diff --git a/ovirt-engine-make-dependency-on-servlet-api-explicit.patch b/ovirt-engine-make-dependency-on-servlet-api-explicit.patch
new file mode 100644
index 0000000..24dd5b8
--- /dev/null
+++ b/ovirt-engine-make-dependency-on-servlet-api-explicit.patch
@@ -0,0 +1,28 @@
+From 0d97614eeb574e471cc769d39eee8e0667469ce2 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Thu, 6 Dec 2012 17:26:05 +0100
+Subject: [PATCH] Make dependency on servlet API explicit
+
+---
+ frontend/wars/rmw-war/pom.xml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/frontend/wars/rmw-war/pom.xml b/frontend/wars/rmw-war/pom.xml
+index 4e78538..f5cf449 100644
+--- a/frontend/wars/rmw-war/pom.xml
++++ b/frontend/wars/rmw-war/pom.xml
+@@ -26,6 +26,11 @@
+ <version>${engine.version}</version>
+ <scope>provided</scope>
+ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.spec.javax.servlet</groupId>
++ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
++ </dependency>
+ </dependencies>
+
+ </project>
+--
+1.7.11.7
+
diff --git a/ovirt-engine-remove-frontend-from-ear.patch b/ovirt-engine-remove-frontend-from-ear.patch
index a044e19..695e30b 100644
--- a/ovirt-engine-remove-frontend-from-ear.patch
+++ b/ovirt-engine-remove-frontend-from-ear.patch
@@ -1,30 +1,17 @@
-From 5ab615e67acd6b2fafa9367c10033d47a0903637 Mon Sep 17 00:00:00 2001
+From 6bf13129289785e1a0d38e4aab49ee49220157e4 Mon Sep 17 00:00:00 2001
From: Juan Hernandez <juan.hernandez at redhat.com>
Date: Wed, 1 Aug 2012 13:17:28 +0200
-Subject: [PATCH] core: Remove frontend from EAR
+Subject: [PATCH] Remove GWT components from EAR
---
- ear/pom.xml | 56 --------------------------------------------------------
- 1 file changed, 56 deletions(-)
+ ear/pom.xml | 42 ------------------------------------------
+ 1 file changed, 42 deletions(-)
diff --git a/ear/pom.xml b/ear/pom.xml
-index 0cb0837..da93b8f 100644
+index 0cb0837..0781319 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
-@@ -65,42 +65,14 @@
- </dependency>
-
- <dependency>
-- <groupId>org.ovirt.engine.ui</groupId>
-- <artifactId>rmw-war</artifactId>
-- <version>${engine.version}</version>
-- <type>war</type>
-- </dependency>
--
-- <dependency>
- <groupId>org.ovirt.engine.api</groupId>
- <artifactId>restapi-webapp</artifactId>
- <version>${engine.version}</version>
+@@ -78,29 +78,8 @@
<type>war</type>
</dependency>
@@ -54,20 +41,7 @@ index 0cb0837..da93b8f 100644
<groupId>org.ovirt.engine.core</groupId>
<artifactId>scheduler</artifactId>
<version>${engine.version}</version>
-@@ -214,42 +186,14 @@
- </webModule>
-
- <webModule>
-- <groupId>org.ovirt.engine.ui</groupId>
-- <artifactId>rmw-war</artifactId>
-- <bundleFileName>ovirtengineweb.war</bundleFileName>
-- <contextRoot>/OvirtEngineWeb</contextRoot>
-- </webModule>
--
-- <webModule>
- <groupId>org.ovirt.engine.api</groupId>
- <artifactId>restapi-webapp</artifactId>
- <bundleFileName>restapi.war</bundleFileName>
+@@ -227,29 +206,8 @@
<contextRoot>/api</contextRoot>
</webModule>
@@ -98,5 +72,5 @@ index 0cb0837..da93b8f 100644
<artifactId>scheduler</artifactId>
<bundleFileName>engine-scheduler.jar</bundleFileName>
--
-1.7.11.2
+1.7.11.7
diff --git a/ovirt-engine.spec b/ovirt-engine.spec
index 9795b4f..f7ee275 100644
--- a/ovirt-engine.spec
+++ b/ovirt-engine.spec
@@ -35,8 +35,8 @@ Source0: http://www.ovirt.org/releases/stable/src/%{name}-%{version}.tar.gz
# Update to Hibernate 3.6.10:
Patch10: %{name}-update-hibernate.patch
-# Build only the backend:
-Patch20: %{name}-build-backend-only.patch
+# Don't build the GWT components:
+Patch20: %{name}-dont-build-gwt-components.patch
# Fix the checkstyle group, artifact and version:
Patch30: %{name}-fix-checkstyle-gav.patch
@@ -52,6 +52,10 @@ Patch50: %{name}-remove-spring-from-restapi.patch
# Remove the frontend related content from the ear:
Patch60: %{name}-remove-frontend-from-ear.patch
+# Make the dependency on servlet API explicit in the module containing
+# the health servlet:
+Patch61: %{name}-make-dependency-on-servlet-api-explicit.patch
+
# Make dependency on commons-collections explicit:
# Upstream: http://gerrit.ovirt.org/6597
Patch70: %{name}-make-dependency-on-commons-collections-explicit.patch
@@ -332,6 +336,7 @@ All-in-one plugin for oVirt Engine's setup
%patch40 -p1
%patch50 -p1
%patch60 -p1
+%patch61 -p1
%patch70 -p1
%patch80 -p1
%patch90 -p1
@@ -623,6 +628,7 @@ fi
%{engine_ear}/lib
%{engine_ear}/engine-bll.jar
%{engine_ear}/engine-scheduler.jar
+%{engine_ear}/ovirtengineweb.war
# Root web application:
%{root_war}
@@ -772,6 +778,7 @@ fi
- Update all in one plugin for new security model (#869457)
- Use pid instead of procpid in engine-cleanup
- Don't try to lock frontend packages
+- Include the health servlet in the build
* Thu Aug 09 2012 Juan Hernandez <juan.hernandez at redhat.com> - 3.1.0-1
- Update to upstream 3.1 release
More information about the scm-commits
mailing list