Juan Hernandez has uploaded a new change for review. Change subject: core: JBoss module for vdsbroker ......................................................................
core: JBoss module for vdsbroker Create a JBoss module for the vdsbroker component. Change-Id: Idace10fd50c59237b7ae2bea1552d9634d9ee99a Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/vdsbroker/pom.xml A backend/manager/modules/vdsbroker/src/main/modules/org/ovirt/engine/core/vdsbroker/main/module.xml M ear/pom.xml M ear/src/main/resources/META-INF/MANIFEST.MF M packaging/fedora/spec/ovirt-engine.spec.in 5 files changed, 35 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/13223/1 diff --git a/backend/manager/modules/vdsbroker/pom.xml b/backend/manager/modules/vdsbroker/pom.xml index 35b4190..23b129d 100644 --- a/backend/manager/modules/vdsbroker/pom.xml +++ b/backend/manager/modules/vdsbroker/pom.xml @@ -63,9 +63,8 @@ </dependency> <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <version>${javax.ejb.api.version}</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> </dependency> <dependency> @@ -73,20 +72,6 @@ <artifactId>jta</artifactId> </dependency> - <!-- - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <version>5.1.0.CR1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jbossall-client</artifactId> - <version>5.0.0.GA</version> - <scope>test</scope> - </dependency> - --> </dependencies> <build> @@ -101,6 +86,13 @@ <argLine>-Djava.endorsed.dirs='${jbossHome}/lib/endorsed'/</argLine> </configuration> </plugin> + + <!-- Create the JBoss module: --> + <plugin> + <groupId>org.ovirt.engine</groupId> + <artifactId>jboss-modules-maven-plugin</artifactId> + </plugin> + </plugins> </build> diff --git a/backend/manager/modules/vdsbroker/src/main/modules/org/ovirt/engine/core/vdsbroker/main/module.xml b/backend/manager/modules/vdsbroker/src/main/modules/org/ovirt/engine/core/vdsbroker/main/module.xml new file mode 100644 index 0000000..c01ee9d --- /dev/null +++ b/backend/manager/modules/vdsbroker/src/main/modules/org/ovirt/engine/core/vdsbroker/main/module.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.0" name="org.ovirt.engine.core.vdsbroker"> + + <resources> + <resource-root path="vdsbroker.jar"/> + </resources> + + <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.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.ovirt.engine.core.scheduler"/> + <module name="org.ovirt.engine.core.utils"/> + </dependencies> + +</module> diff --git a/ear/pom.xml b/ear/pom.xml index 171b92e..97f16bb 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -26,15 +26,6 @@ </properties> <dependencies> - <!-- Internal Deps --> - <!-- ** JARs --> - <dependency> - <groupId>org.ovirt.engine.core</groupId> - <artifactId>vdsbroker</artifactId> - <version>${engine.version}</version> - <type>jar</type> - </dependency> - <!-- WARS --> <dependency> <groupId>org.ovirt.engine.core</groupId> @@ -200,7 +191,7 @@ </modules> - <!-- Add a the manifest that contains the required dependencies + <!-- Add the manifest that contains the required dependencies for JBoss modules: --> <archive> <addMavenDescriptor>false</addMavenDescriptor> @@ -216,7 +207,6 @@ *.jar/**, *.war/**, META-INF/**, - lib/vdsbroker.jar/**, </packagingIncludes> </configuration> diff --git a/ear/src/main/resources/META-INF/MANIFEST.MF b/ear/src/main/resources/META-INF/MANIFEST.MF index df3d12b..3791bcc 100644 --- a/ear/src/main/resources/META-INF/MANIFEST.MF +++ b/ear/src/main/resources/META-INF/MANIFEST.MF @@ -16,4 +16,5 @@ org.ovirt.engine.core.dependencies, org.ovirt.engine.core.scheduler, org.ovirt.engine.core.searchbackend, - org.ovirt.engine.core.utils + org.ovirt.engine.core.utils, + org.ovirt.engine.core.vdsbroker diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 020cbe8..5e2cfd1 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -308,7 +308,6 @@ ln -s ${java_path} %{buildroot}${lib_path} done <<'.' %{engine_ear}/bll.jar -%{engine_ear}/lib/vdsbroker.jar %{engine_jboss_modules}/org/ovirt/engine/core/common/main/common.jar %{engine_jboss_modules}/org/ovirt/engine/core/compat/main/compat.jar %{engine_jboss_modules}/org/ovirt/engine/core/dal/main/dal.jar @@ -316,6 +315,7 @@ %{engine_jboss_modules}/org/ovirt/engine/core/searchbackend/main/searchbackend.jar %{engine_jboss_modules}/org/ovirt/engine/core/tools/main/tools.jar %{engine_jboss_modules}/org/ovirt/engine/core/utils/main/utils.jar +%{engine_jboss_modules}/org/ovirt/engine/core/vdsbroker/main/vdsbroker.jar %{restapi_war}/WEB-INF/lib/interface-common-jaxrs.jar %{restapi_war}/WEB-INF/lib/restapi-definition.jar %{restapi_war}/WEB-INF/lib/restapi-jaxrs.jar -- To view, visit http://gerrit.ovirt.org/13223 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idace10fd50c59237b7ae2bea1552d9634d9ee99a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
