[ovirt-engine] Fix some build problems

[Juan Hernandez]

commit 36479a043543aebb62390b6b1d8bfabff2c9d9a3
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date:   Tue Jul 24 20:45:00 2012 +0200

    Fix some build problems
    
    Make the dependency on commons-collections in the utils module
    explicit.
    
    Update the code to work with commons-configuration 1.8, as that is
    what is in rawhide at the moment.

 ...ependency-on-commons-collections-explicit.patch |   27 +++++++++++++++
 ovirt-engine-update-commons-configuration.patch    |   35 ++++++++++++++++++++
 ovirt-engine.spec                                  |   15 ++++++++-
 3 files changed, 76 insertions(+), 1 deletions(-)
---
diff --git a/ovirt-engine-make-dependency-on-commons-collections-explicit.patch b/ovirt-engine-make-dependency-on-commons-collections-explicit.patch
new file mode 100644
index 0000000..d766455
--- /dev/null
+++ b/ovirt-engine-make-dependency-on-commons-collections-explicit.patch
@@ -0,0 +1,27 @@
+From f9c10a1cc1f82d416f69012035c8f997d5b367f8 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Tue, 24 Jul 2012 20:40:47 +0200
+Subject: [PATCH] Make dependency on commons-collections explicit
+
+---
+ backend/manager/modules/utils/pom.xml |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml
+index d47ed1f..8546974 100644
+--- a/backend/manager/modules/utils/pom.xml
++++ b/backend/manager/modules/utils/pom.xml
+@@ -38,6 +38,10 @@
+       <artifactId>commons-beanutils</artifactId>
+       <version>1.8.2</version>
+     </dependency>
++    <dependency>
++      <groupId>commons-collections</groupId>
++      <artifactId>commons-collections</artifactId>
++    </dependency>
+ 
+     <dependency>
+       <groupId>${engine.groupId}</groupId>
+-- 
+1.7.10.4
+
diff --git a/ovirt-engine-update-commons-configuration.patch b/ovirt-engine-update-commons-configuration.patch
new file mode 100644
index 0000000..8b46e6c
--- /dev/null
+++ b/ovirt-engine-update-commons-configuration.patch
@@ -0,0 +1,35 @@
+From 9c21f1900e7d7d4fd43e6b8dd3d543e60ce8ffba Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Tue, 24 Jul 2012 21:10:45 +0200
+Subject: [PATCH] Update to commons-configuration 1.8
+
+---
+ .../java/org/ovirt/engine/core/config/EngineConfigLogic.java     |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java b/backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
+index 6f5f2c5..f1df486 100644
+--- a/backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
++++ b/backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
+@@ -67,9 +67,9 @@ public class EngineConfigLogic {
+     }
+ 
+     private void populateAlternateKeyMap(HierarchicalConfiguration config) {
+-        List<SubnodeConfiguration> configurationsAt = config.configurationsAt("/*/" + ALTERNATE_KEY);
++        List<HierarchicalConfiguration> configurationsAt = config.configurationsAt("/*/" + ALTERNATE_KEY);
+         alternateKeysMap = new HashMap<String, String>(configurationsAt.size());
+-        for (SubnodeConfiguration node : configurationsAt) {
++        for (HierarchicalConfiguration node : configurationsAt) {
+             String rootKey = node.getRootNode()
+                     .getParentNode().getName();
+             String[] alternateKeys = config.getStringArray("/" + rootKey + "/" + ALTERNATE_KEY);
+@@ -329,4 +329,4 @@ public class EngineConfigLogic {
+     public ConfigDAO getConfigDAO() {
+         return configDAO;
+     }
+-}
+\ No newline at end of file
++}
+-- 
+1.7.10.4
+
diff --git a/ovirt-engine.spec b/ovirt-engine.spec
index 0b1d45b..cfb973d 100644
--- a/ovirt-engine.spec
+++ b/ovirt-engine.spec
@@ -31,7 +31,7 @@
 
 Name: ovirt-engine
 Version: %{upstream_version}.%{upstream_release}
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Management server for Open Virtualization
 Group: Applications/System
 License: ASL 2.0
@@ -155,6 +155,13 @@ Patch350: %{name}-add-resteasy-listener-to-restapi.patch
 Patch360: %{name}-makefile-fixes.patch
 Patch370: %{name}-setup-fixes.patch
 
+# Make the dependency on commons-collections explicit:
+# Upstream: http://gerrit.ovirt.org/6597
+Patch380: %{name}-make-dependency-on-commons-collections-explicit.patch
+
+# Update the code to use commons-configuration 1.8:
+Patch390: %{name}-update-commons-configuration.patch
+
 # Add a README file:
 Patch1000: %{name}-add-readme.patch
 
@@ -456,6 +463,8 @@ The common libraries used by Open Virtualization Manager Tools.
 %patch350 -p1
 %patch360 -p1
 %patch370 -p1
+%patch380 -p1
+%patch390 -p1
 %patch1000 -p1
 %patch1010 -p1
 %patch1020 -p1
@@ -973,6 +982,10 @@ fi
 
 
 %changelog
+* Tue Jul 24 2012 Juan Hernandez <juan.hernandez at redhat.com> - 3.0.0.0001-15
+- Make dependency on commons-collections explicit
+- Update to commons-configuration 1.8
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0.0001-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild