Roy Golan has uploaded a new change for review. Change subject: core: EAR use jboss-deployment-structure.xml instead manifest ......................................................................
core: EAR use jboss-deployment-structure.xml instead manifest Change-Id: I157edc033927ea3bb1a32448498e03e289bf55c4 Signed-off-by: Roy Golan <[email protected]> --- M ear/src/main/application/META-INF/jboss-deployment-structure.xml M ear/src/main/resources/META-INF/MANIFEST.MF 2 files changed, 38 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/29440/1 diff --git a/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/ear/src/main/application/META-INF/jboss-deployment-structure.xml index cec2758..57233fa 100644 --- a/ear/src/main/application/META-INF/jboss-deployment-structure.xml +++ b/ear/src/main/application/META-INF/jboss-deployment-structure.xml @@ -1,15 +1,42 @@ <jboss-deployment-structure> <deployment> - <dependencies> - <module name="javax.annotation.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.inject.api"/> - <module name="javax.interceptor.api"/> - <module name="org.ovirt.engine.core.common" export="true" meta-inf="import"/> - <module name="org.ovirt.engine.core.utils" export="true" meta-inf="import"/> - <module name="org.ovirt.engine.core.dal" export="true" meta-inf="import"/> - <module name="org.ovirt.engine.core.aaa" export="true" meta-inf="import"/> - <module name="org.ovirt.engine.extensions.builtin" export="true" meta-inf="import"/> - </dependencies> + <dependencies> + <module name="javax.annotation.api"/> + <module name="javax.enterprise.api"/> + <module name="javax.inject.api"/> + <module name="javax.interceptor.api"/> + <module name="javax.validation.api"/> + <module name="com.woorea.openstack.sdk"/> + <module name="asm.asm"/> + <module name="org.apache.commons.beanutils"/> + <module name="org.apache.commons.codec"/> + <module name="org.apache.commons.collections"/> + <module name="org.apache.commons.httpclient"/> + <module name="org.apache.commons.lang"/> + <module name="org.apache.log4j"/> + <module name="org.apache.xmlgraphics.fop"/> + <module name="org.apache.xmlrpc"/> + <module name="org.codehaus.jackson.jackson-core-asl"/> + <module name="org.codehaus.jackson.jackson-mapper-asl"/> + <module name="org.dom4j"/> + <module name="org.hibernate.validator"/> + <module name="org.infinispan"/> + <module name="org.quartz" export="true"/> + <module name="org.springframework"/> + <module name="org.yaml.snakeyaml"/> + <module name="org.ovirt.engine.api.ovirt-engine-extensions-api"/> + <module name="org.ovirt.engine.core.aaa" export="true" meta-inf="import"/> + <module name="org.ovirt.engine.core.common" export="true" meta-inf="import"/> + <module name="org.ovirt.engine.core.compat" export="true"/> + <module name="org.ovirt.engine.core.dal" export="true" meta-inf="import"/> + <module name="org.ovirt.engine.core.extensions-manager"/> + <module name="org.ovirt.engine.core.searchbackend"/> + <module name="org.ovirt.engine.core.utils" export="true" meta-inf="import"/> + <module name="org.ovirt.engine.core.uutils"/> + <module name="org.ovirt.engine.extensions.builtin"/> + <module name="org.ovirt.otopi"/> + <module name="org.ovirt.ovirt-host-deploy"/> + <module name="org.ovirt.vdsm-jsonrpc-java"/> + </dependencies> </deployment> </jboss-deployment-structure> diff --git a/ear/src/main/resources/META-INF/MANIFEST.MF b/ear/src/main/resources/META-INF/MANIFEST.MF index 6485e4a..e69de29 100644 --- a/ear/src/main/resources/META-INF/MANIFEST.MF +++ b/ear/src/main/resources/META-INF/MANIFEST.MF @@ -1,33 +0,0 @@ -Manifest-Version: 1.0 -Dependencies: asm.asm, - javax.validation.api, - 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.xmlrpc, - org.codehaus.jackson.jackson-core-asl, - org.codehaus.jackson.jackson-mapper-asl, - org.dom4j, - org.hibernate.validator, - org.infinispan, - org.ovirt.engine.core.common, - org.ovirt.engine.core.compat, - org.ovirt.engine.core.dal, - org.ovirt.engine.core.searchbackend, - org.ovirt.engine.core.utils, - org.ovirt.engine.core.uutils, - org.ovirt.otopi, - org.ovirt.ovirt-host-deploy, - org.ovirt.engine.core.aaa, - org.ovirt.engine.core.extensions-manager, - org.ovirt.engine.extensions.builtin, - org.ovirt.engine.api.ovirt-engine-extensions-api, - org.ovirt.vdsm-jsonrpc-java, - org.quartz, - org.apache.xmlgraphics.fop, - org.springframework, - com.woorea.openstack.sdk services, - org.yaml.snakeyaml -- To view, visit http://gerrit.ovirt.org/29440 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I157edc033927ea3bb1a32448498e03e289bf55c4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
