Juan Hernandez has uploaded a new change for review.
Change subject: core: JBoss modules update
......................................................................
core: JBoss modules update
When the JBoss modules mechanism was introduced all the dependencies
where added to a single "dependencies" module. This patch separates them
into different modules.
Change-Id: Iec23626539af13f2ae3cd4edb1610198bef8eef4
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M backend/manager/dependencies/pom.xml
M
backend/manager/dependencies/src/main/modules/com/woorea/openstack/sdk/main/module.xml
A
backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml
A
backend/manager/dependencies/src/main/modules/org/apache/commons/httpclient/main/module.xml
A backend/manager/dependencies/src/main/modules/org/apache/mina/main/module.xml
A backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
A
backend/manager/dependencies/src/main/modules/org/apache/ws/commons/main/module.xml
A
backend/manager/dependencies/src/main/modules/org/apache/xmlrpc/main/module.xml
D
backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml
A backend/manager/dependencies/src/main/modules/org/ovirt/otopi/main/module.xml
A
backend/manager/dependencies/src/main/modules/org/ovirt/ovirt-host-deploy/main/module.xml
M backend/manager/dependencies/src/main/modules/org/postgresql/main/module.xml
A backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml
A
backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
M
backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml
M
backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml
M
backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml
M
backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml
M
backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
M
backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
M ear/src/main/resources/META-INF/MANIFEST.MF
21 files changed, 288 insertions(+), 185 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/19404/1
diff --git a/backend/manager/dependencies/pom.xml
b/backend/manager/dependencies/pom.xml
index 237a0bc..4016b16 100644
--- a/backend/manager/dependencies/pom.xml
+++ b/backend/manager/dependencies/pom.xml
@@ -94,12 +94,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-jdk14.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>${spring.ldap.version}</version>
@@ -234,7 +228,7 @@
<module>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.apache.commons.httpclient</moduleName>
</module>
<module>
@@ -246,121 +240,115 @@
<module>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.apache.commons.compress</moduleName>
</module>
<module>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.apache.mina</moduleName>
</module>
<module>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.apache.sshd</moduleName>
</module>
<module>
<groupId>org.apache.ws.commons.util</groupId>
<artifactId>ws-commons-util</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.apache.ws.commons</moduleName>
</module>
<module>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.apache.xmlrpc</moduleName>
</module>
<module>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.apache.xmlrpc</moduleName>
</module>
<module>
<groupId>org.ovirt.otopi</groupId>
<artifactId>otopi</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.ovirt.otopi</moduleName>
</module>
<module>
<groupId>org.ovirt.ovirt-host-deploy</groupId>
<artifactId>ovirt-host-deploy</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.ovirt.ovirt-host-deploy</moduleName>
</module>
<module>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
- </module>
-
- <module>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.quartz</moduleName>
</module>
<module>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <moduleName>org.ovirt.engine.core.dependencies</moduleName>
+ <moduleName>org.springframework</moduleName>
</module>
<module>
diff --git
a/backend/manager/dependencies/src/main/modules/com/woorea/openstack/sdk/main/module.xml
b/backend/manager/dependencies/src/main/modules/com/woorea/openstack/sdk/main/module.xml
index 6366959..44abd98 100644
---
a/backend/manager/dependencies/src/main/modules/com/woorea/openstack/sdk/main/module.xml
+++
b/backend/manager/dependencies/src/main/modules/com/woorea/openstack/sdk/main/module.xml
@@ -1,21 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="com.woorea.openstack.sdk">
- <resources>
- <resource-root path="glance-client.jar"/>
- <resource-root path="glance-model.jar"/>
- <resource-root path="keystone-client.jar"/>
- <resource-root path="keystone-model.jar"/>
- <resource-root path="openstack-client.jar"/>
- <resource-root path="quantum-client.jar"/>
- <resource-root path="quantum-model.jar"/>
- <resource-root path="resteasy-connector.jar"/>
- </resources>
+<module xmlns="urn:jboss:module:1.1" name="com.woorea.openstack.sdk">
+
+ <resources>
+ <resource-root path="glance-client.jar"/>
+ <resource-root path="glance-model.jar"/>
+ <resource-root path="keystone-client.jar"/>
+ <resource-root path="keystone-model.jar"/>
+ <resource-root path="openstack-client.jar"/>
+ <resource-root path="quantum-client.jar"/>
+ <resource-root path="quantum-model.jar"/>
+ <resource-root path="resteasy-connector.jar"/>
+ </resources>
+
<dependencies>
- <module name="javax.ws.rs.api"/>
- <module name="org.jboss.resteasy.resteasy-jaxrs"/>
- <module name="org.codehaus.jackson.jackson-core-asl"/>
- <module name="org.codehaus.jackson.jackson-mapper-asl"/>
- <module name="org.codehaus.jackson.jackson-jaxrs"/>
+ <module name="javax.ws.rs.api"/>
+ <module name="org.jboss.resteasy.resteasy-jaxrs"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-jaxrs"/>
</dependencies>
+
</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml
new file mode 100644
index 0000000..7c8ee3a
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.commons.compress">
+
+ <resources>
+ <resource-root path="commons-compress.jar"/>
+ </resources>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/commons/httpclient/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/commons/httpclient/main/module.xml
new file mode 100644
index 0000000..cc222de
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/apache/commons/httpclient/main/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.commons.httpclient">
+
+ <resources>
+ <resource-root path="commons-httpclient.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.codec"/>
+ <module name="org.apache.commons.logging"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/mina/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/mina/main/module.xml
new file mode 100644
index 0000000..b845207
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/apache/mina/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.mina">
+
+ <resources>
+ <resource-root path="mina-core.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.slf4j"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
new file mode 100644
index 0000000..031edda
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.sshd">
+
+ <resources>
+ <resource-root path="sshd-core.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.mina"/>
+ <module name="org.slf4j"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/ws/commons/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/ws/commons/main/module.xml
new file mode 100644
index 0000000..d1f1c2b
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/apache/ws/commons/main/module.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.commons">
+
+ <resources>
+ <resource-root path="ws-commons-util.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/xmlrpc/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/xmlrpc/main/module.xml
new file mode 100644
index 0000000..e4f049a
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/apache/xmlrpc/main/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.xmlrpc">
+
+ <resources>
+ <resource-root path="xmlrpc-common.jar"/>
+ <resource-root path="xmlrpc-client.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.ws.commons"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml
deleted file mode 100644
index fef9c55..0000000
---
a/backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This module contains all the dependencies that are used by serveral
- engine components and that are not available as builtin modules in
- JBoss 7: -->
-
-<module xmlns="urn:jboss:module:1.0" name="org.ovirt.engine.core.dependencies">
- <resources>
- <resource-root path="commons-compress.jar"/>
- <resource-root path="commons-httpclient.jar"/>
- <resource-root path="mina-core.jar"/>
- <resource-root path="otopi.jar"/>
- <resource-root path="ovirt-host-deploy.jar"/>
- <resource-root path="quartz.jar"/>
- <resource-root path="slf4j-api.jar"/>
- <resource-root path="spring-aop.jar"/>
- <resource-root path="spring-asm.jar"/>
- <resource-root path="spring-beans.jar"/>
- <resource-root path="spring-context.jar"/>
- <resource-root path="spring-core.jar"/>
- <resource-root path="spring-expression.jar"/>
- <resource-root path="spring-instrument.jar"/>
- <resource-root path="spring-jdbc.jar"/>
- <resource-root path="spring-ldap-core.jar"/>
- <resource-root path="spring-tx.jar"/>
- <resource-root path="sshd-core.jar"/>
- <resource-root path="ws-commons-util.jar"/>
- <resource-root path="xmlrpc-client.jar"/>
- <resource-root path="xmlrpc-common.jar"/>
- </resources>
-
- <dependencies>
- <module name="javax.api"/>
- <module name="javax.transaction.api"/>
- <module name="org.apache.commons.codec"/>
- <module name="org.apache.commons.lang"/>
- <module name="org.apache.commons.logging"/>
- <module name="org.slf4j.impl"/>
- <module name="sun.jdk"/>
- </dependencies>
-
-</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/ovirt/otopi/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/ovirt/otopi/main/module.xml
new file mode 100644
index 0000000..8499053
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/ovirt/otopi/main/module.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.ovirt.otopi">
+
+ <resources>
+ <resource-root path="otopi.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="org.apache.commons.logging"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/ovirt/ovirt-host-deploy/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/ovirt/ovirt-host-deploy/main/module.xml
new file mode 100644
index 0000000..f73d17c
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/ovirt/ovirt-host-deploy/main/module.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.ovirt.ovirt-host-deploy">
+
+ <resources>
+ <resource-root path="ovirt-host-deploy.jar"/>
+ </resources>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/postgresql/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/postgresql/main/module.xml
index be37eb8..36e24a2 100644
---
a/backend/manager/dependencies/src/main/modules/org/postgresql/main/module.xml
+++
b/backend/manager/dependencies/src/main/modules/org/postgresql/main/module.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.postgresql">
- <resources>
- <resource-root path="postgresql.jar"/>
- </resources>
+<module xmlns="urn:jboss:module:1.1" name="org.postgresql">
- <dependencies>
- <module name="javax.api"/>
- <module name="javax.transaction.api"/>
- </dependencies>
+ <resources>
+ <resource-root path="postgresql.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="javax.transaction.api"/>
+ </dependencies>
+
</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml
new file mode 100644
index 0000000..f04783b
--- /dev/null
+++ b/backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.quartz">
+
+ <resources>
+ <resource-root path="quartz.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.slf4j"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
new file mode 100644
index 0000000..efd9a4b
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.springframework">
+
+ <resources>
+ <resource-root path="spring-aop.jar"/>
+ <resource-root path="spring-asm.jar"/>
+ <resource-root path="spring-beans.jar"/>
+ <resource-root path="spring-context.jar"/>
+ <resource-root path="spring-core.jar"/>
+ <resource-root path="spring-expression.jar"/>
+ <resource-root path="spring-instrument.jar"/>
+ <resource-root path="spring-jdbc.jar"/>
+ <resource-root path="spring-ldap-core.jar"/>
+ <resource-root path="spring-tx.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.lang"/>
+ <module name="org.apache.commons.logging"/>
+ <module name="sun.jdk"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml
b/backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml
index 59f830b..1b0a723 100644
---
a/backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml
+++
b/backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.ovirt.engine.core.common">
+<module xmlns="urn:jboss:module:1.1" name="org.ovirt.engine.core.common">
- <resources>
- <resource-root path="common.jar"/>
- </resources>
+ <resources>
+ <resource-root path="common.jar"/>
+ </resources>
- <dependencies>
- <module name="javax.api"/>
- <module name="javax.validation.api"/>
- <module name="org.ovirt.engine.core.compat"/>
- <module name="org.ovirt.engine.core.dependencies"/>
- </dependencies>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="javax.validation.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.hibernate.validator"/>
+ <module name="org.ovirt.engine.core.compat"/>
+ </dependencies>
</module>
diff --git
a/backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml
b/backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml
index cc52a86..50cf235 100644
---
a/backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml
+++
b/backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.ovirt.engine.core.compat">
+<module xmlns="urn:jboss:module:1.1" name="org.ovirt.engine.core.compat">
- <resources>
- <resource-root path="compat.jar"/>
- </resources>
+ <resources>
+ <resource-root path="compat.jar"/>
+ </resources>
- <dependencies>
- <module name="javax.api"/>
- <module name="org.apache.commons.logging"/>
- <module name="org.ovirt.engine.core.dependencies"/>
- </dependencies>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.logging"/>
+ </dependencies>
</module>
diff --git
a/backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml
b/backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml
index 02eb7a8..c68250b 100644
---
a/backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml
+++
b/backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.ovirt.engine.core.dal">
+<module xmlns="urn:jboss:module:1.1" name="org.ovirt.engine.core.dal">
- <resources>
- <resource-root path="dal.jar"/>
- </resources>
+ <resources>
+ <resource-root path="dal.jar"/>
+ </resources>
- <dependencies>
- <module name="javax.api"/>
- <module name="org.apache.commons.collections"/>
- <module name="org.apache.commons.lang"/>
- <module name="org.ovirt.engine.core.common"/>
- <module name="org.ovirt.engine.core.compat"/>
- <module name="org.ovirt.engine.core.dependencies"/>
- <module name="org.ovirt.engine.core.utils"/>
- <module name="org.infinispan"/>
- </dependencies>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="javax.transaction.api"/>
+ <module name="org.apache.commons.collections"/>
+ <module name="org.apache.commons.lang"/>
+ <module name="org.infinispan"/>
+ <module name="org.ovirt.engine.core.common"/>
+ <module name="org.ovirt.engine.core.compat"/>
+ <module name="org.ovirt.engine.core.utils"/>
+ <module name="org.springframework"/>
+ </dependencies>
</module>
diff --git
a/backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml
b/backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml
index 56ed52a..96abcb5 100644
---
a/backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml
+++
b/backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0"
name="org.ovirt.engine.core.searchbackend">
+<module xmlns="urn:jboss:module:1.1"
name="org.ovirt.engine.core.searchbackend">
- <resources>
- <resource-root path="searchbackend.jar"/>
- </resources>
+ <resources>
+ <resource-root path="searchbackend.jar"/>
+ </resources>
- <dependencies>
- <module name="javax.api"/>
- <module name="org.apache.commons.logging"/>
- <module name="org.ovirt.engine.core.common"/>
- <module name="org.ovirt.engine.core.compat"/>
- <module name="org.ovirt.engine.core.dependencies"/>
- <module name="org.ovirt.engine.core.utils"/>
- </dependencies>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.logging"/>
+ <module name="org.ovirt.engine.core.common"/>
+ <module name="org.ovirt.engine.core.compat"/>
+ <module name="org.ovirt.engine.core.utils"/>
+ </dependencies>
</module>
diff --git
a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
index b41ae29..b78493f 100644
---
a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
+++
b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
@@ -1,29 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.ovirt.engine.core.utils">
+<module xmlns="urn:jboss:module:1.1" name="org.ovirt.engine.core.utils">
- <resources>
- <resource-root path="utils.jar"/>
- </resources>
+ <resources>
+ <resource-root path="utils.jar"/>
+ </resources>
- <dependencies>
- <module name="javax.api"/>
- <module name="javax.ejb.api"/>
- <module name="javax.servlet.api"/>
- <module name="javax.servlet.jstl.api"/>
- <module name="javax.transaction.api"/>
- <module name="org.apache.commons.codec"/>
- <module name="org.apache.commons.lang"/>
- <module name="org.apache.commons.logging"/>
- <module name="org.apache.commons.beanutils"/>
- <module name="org.apache.log4j"/>
- <module name="org.codehaus.jackson.jackson-core-asl"/>
- <module name="org.codehaus.jackson.jackson-mapper-asl"/>
- <module name="org.ovirt.engine.core.common"/>
- <module name="org.ovirt.engine.core.compat"/>
- <module name="org.ovirt.engine.core.dal"/>
- <module name="org.ovirt.engine.core.dependencies"/>
- <module name="org.infinispan"/>
- </dependencies>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="javax.ejb.api"/>
+ <module name="javax.servlet.api"/>
+ <module name="javax.servlet.jstl.api"/>
+ <module name="javax.transaction.api"/>
+ <module name="org.apache.commons.beanutils"/>
+ <module name="org.apache.commons.codec"/>
+ <module name="org.apache.commons.compress"/>
+ <module name="org.apache.commons.httpclient"/>
+ <module name="org.apache.commons.lang"/>
+ <module name="org.apache.commons.logging"/>
+ <module name="org.apache.log4j"/>
+ <module name="org.apache.sshd"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.ovirt.engine.core.common"/>
+ <module name="org.ovirt.engine.core.compat"/>
+ <module name="org.ovirt.engine.core.dal"/>
+ <module name="org.infinispan"/>
+ <module name="org.springframework"/>
+ </dependencies>
</module>
diff --git
a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
index 0d82a53..cf051a4 100644
---
a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
+++
b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.ovirt.engine.core.tools">
+<module xmlns="urn:jboss:module:1.1" name="org.ovirt.engine.core.tools">
- <resources>
- <resource-root path="tools.jar"/>
- </resources>
+ <resources>
+ <resource-root path="tools.jar"/>
+ </resources>
- <dependencies>
- <module name="javax.api"/>
- <module name="javax.mail.api"/>
- <module name="org.apache.commons.configuration"/>
- <module name="org.apache.commons.lang"/>
- <module name="org.apache.commons.logging"/>
- <module name="org.apache.log4j"/>
- <module name="org.ovirt.engine.core.common"/>
- <module name="org.ovirt.engine.core.compat"/>
- <module name="org.ovirt.engine.core.dependencies"/>
- <module name="org.ovirt.engine.core.utils"/>
- <module name="org.postgresql"/>
- <module name="sun.jdk"/>
- </dependencies>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="javax.mail.api"/>
+ <module name="org.apache.commons.collections"/>
+ <module name="org.apache.commons.configuration"/>
+ <module name="org.apache.commons.lang"/>
+ <module name="org.apache.commons.logging"/>
+ <module name="org.apache.log4j"/>
+ <module name="org.ovirt.engine.core.common"/>
+ <module name="org.ovirt.engine.core.compat"/>
+ <module name="org.ovirt.engine.core.utils"/>
+ <module name="org.postgresql"/>
+ <module name="sun.jdk"/>
+ </dependencies>
</module>
diff --git a/ear/src/main/resources/META-INF/MANIFEST.MF
b/ear/src/main/resources/META-INF/MANIFEST.MF
index cc748ac..0e2ecec 100644
--- a/ear/src/main/resources/META-INF/MANIFEST.MF
+++ b/ear/src/main/resources/META-INF/MANIFEST.MF
@@ -4,8 +4,11 @@
org.apache.commons.beanutils,
org.apache.commons.codec,
org.apache.commons.collections,
+ org.apache.commons.httpclient,
org.apache.commons.lang,
org.apache.log4j,
+ org.apache.mina,
+ org.apache.xmlrpc,
org.codehaus.jackson.jackson-core-asl,
org.codehaus.jackson.jackson-mapper-asl,
org.dom4j,
@@ -14,8 +17,11 @@
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,
+ org.ovirt.otopi,
+ org.ovirt.ovirt-host-deploy,
+ org.quartz,
+ org.springframework,
com.woorea.openstack.sdk services,
org.yaml.snakeyaml
--
To view, visit http://gerrit.ovirt.org/19404
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec23626539af13f2ae3cd4edb1610198bef8eef4
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
