Juan Hernandez has uploaded a new change for review.
Change subject: core: Add jxpath as commons-configuration dep
......................................................................
core: Add jxpath as commons-configuration dep
The commons-configuration module provided by JBoss AS doesn't include
commons-jxpath as a dependency, but engine-config needs it in order to
parse configuration files, so we need to add a module for commons-jxpath
and also override the commons-configuration module to include the
dependency on commons-jxpath.
Backported from master commit 71a7c80a1fcaf026e2b0115725924aa18d91ae61.
Change-Id: I605dece87a7a15fc03215f0969f718f41fe0523e
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M backend/manager/dependencies/pom.xml
A
backend/manager/dependencies/src/main/modules/org/apache/commons/configuration/main/module.xml
A
backend/manager/dependencies/src/main/modules/org/apache/commons/jxpath/main/module.xml
3 files changed, 69 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/12630/1
diff --git a/backend/manager/dependencies/pom.xml
b/backend/manager/dependencies/pom.xml
index ac9b1af..cd89f38 100644
--- a/backend/manager/dependencies/pom.xml
+++ b/backend/manager/dependencies/pom.xml
@@ -22,9 +22,21 @@
<dependencies>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons-configuration.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${httpclient.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>${commons-jxpath.version}</version>
</dependency>
<dependency>
@@ -166,12 +178,24 @@
<modules>
<module>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <moduleName>org.apache.commons.configuration</moduleName>
+ </module>
+
+ <module>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<moduleName>org.ovirt.engine.core.dependencies</moduleName>
</module>
<module>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <moduleName>org.apache.commons.jxpath</moduleName>
+ </module>
+
+ <module>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<moduleName>org.ovirt.engine.core.dependencies</moduleName>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/commons/configuration/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/commons/configuration/main/module.xml
new file mode 100644
index 0000000..1f1c0cb
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/apache/commons/configuration/main/module.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- This module is already provided by JBoss AS, but we need to
+ override it because that version doesn't include commons-jxpath
+ as a dependency, but we need to add it, otherwise parsing
+ of configuration files in engine-config doesn't work. -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.commons.configuration">
+
+ <resources>
+ <resource-root path="commons-configuration.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.collections"/>
+ <module name="org.apache.commons.lang"/>
+ <module name="org.apache.commons.logging"/>
+
+ <!-- This is what we need to add to the stock module provided by the
+ application server: -->
+ <module name="org.apache.commons.jxpath"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/commons/jxpath/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/commons/jxpath/main/module.xml
new file mode 100644
index 0000000..493478a
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/apache/commons/jxpath/main/module.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- We need this module because the engine-config tool uses
+ commons-configuration in a way that requires it to parse
+ configuration files, but it is not included in JBoss AS
+ because the application server doesn't use
+ commons-configuration in this way: -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.commons.jxpath">
+
+ <resources>
+ <resource-root path="commons-jxpath.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.logging"/>
+ </dependencies>
+
+</module>
--
To view, visit http://gerrit.ovirt.org/12630
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I605dece87a7a15fc03215f0969f718f41fe0523e
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
