Martin Peřina has uploaded a new change for review. Change subject: pkg: Addapt packaging to use splitted modules dirs ......................................................................
pkg: Addapt packaging to use splitted modules dirs Addapt packaging stuff to use splitted modules directories. Change-Id: I1b5c6efcf013350380a88db4b5b5f5973ba41eeb Related-To: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <mper...@redhat.com> --- M Makefile M ovirt-engine.spec.in M packaging/bin/engine-prolog.sh.in M packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in M packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py M packaging/services/ovirt-engine/ovirt-engine.conf.in M packaging/services/ovirt-engine/ovirt-engine.py 7 files changed, 85 insertions(+), 76 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/32846/1 diff --git a/Makefile b/Makefile index 55b7b9b..e9087d7 100644 --- a/Makefile +++ b/Makefile @@ -355,7 +355,10 @@ # we should use search MAVEN_OUTPUT_DIR as it may contain # pre-compiled artifacts at different hierarchy. install -dm 0755 "$(DESTDIR)$(PKG_JBOSS_MODULES)" - find "$(MAVEN_OUTPUT_DIR)" -name '*-modules.zip' | grep -v tmp.repos | xargs -n 1 unzip -q -o -d "$(DESTDIR)$(PKG_JBOSS_MODULES)" + for category in common instance standalone; do \ + install -dm 0755 "$(DESTDIR)$(PKG_JBOSS_MODULES)/$${category}"; \ + find "$(MAVEN_OUTPUT_DIR)" -name '*'"-$${category}-modules.zip" | grep -v tmp.repos | xargs -r -n 1 unzip -q -o -d "$(DESTDIR)$(PKG_JBOSS_MODULES)/$${category}"; \ + done install -dm 0755 "$(DESTDIR)$(PKG_EAR_DIR)" find "$(MAVEN_OUTPUT_DIR)" -name '*.ear' -type f | grep -v tmp.repos | xargs -n 1 unzip -q -o -d "$(DESTDIR)$(PKG_EAR_DIR)" install -dm 0755 "$(DESTDIR)$(DATA_DIR)/restapi.war" @@ -378,7 +381,7 @@ # extract embedded artifacts as doc # no need to relay on source tree for these install -d -m 755 "$(DESTDIR)$(PKG_DOC_DIR)" - unzip -q -c "$(DESTDIR)$(PKG_JBOSS_MODULES)/org/ovirt/engine/core/dal/main/dal.jar" bundles/AuditLogMessages.properties > \ + unzip -q -c "$(DESTDIR)$(PKG_JBOSS_MODULES)/common/org/ovirt/engine/core/dal/main/dal.jar" bundles/AuditLogMessages.properties > \ "$(DESTDIR)$(PKG_DOC_DIR)/AuditLogMessages.properties" chmod 0644 "$(DESTDIR)$(PKG_DOC_DIR)/AuditLogMessages.properties" diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 6fdcd9a..faabaa0 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -606,22 +606,22 @@ %{engine_ear}/userportal.war/WEB-INF/lib/branding.jar %{engine_ear}/webadmin.war/WEB-INF/lib/branding.jar %{engine_ear}/welcome.war/WEB-INF/lib/branding.jar -%{engine_jboss_modules}/org/ovirt/engine/api/interface-common-jaxrs/main/interface-common-jaxrs.jar -%{engine_jboss_modules}/org/ovirt/engine/api/ovirt-engine-extensions-api/main/ovirt-engine-extensions-api.jar -%{engine_jboss_modules}/org/ovirt/engine/api/restapi-definition/main/restapi-definition.jar -%{engine_jboss_modules}/org/ovirt/engine/api/restapi-jaxrs/main/restapi-jaxrs.jar -%{engine_jboss_modules}/org/ovirt/engine/api/restapi-types/main/restapi-types.jar -%{engine_jboss_modules}/org/ovirt/engine/core/aaa/main/aaa.jar -%{engine_jboss_modules}/org/ovirt/engine/core/branding/main/branding.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 -%{engine_jboss_modules}/org/ovirt/engine/core/extensions-manager/main/extensions-manager.jar -%{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/uutils/main/uutils.jar -%{engine_jboss_modules}/org/ovirt/engine/extensions/builtin/main/builtin.jar +%{engine_jboss_modules}/common/org/ovirt/engine/api/interface-common-jaxrs/main/interface-common-jaxrs.jar +%{engine_jboss_modules}/common/org/ovirt/engine/api/ovirt-engine-extensions-api/main/ovirt-engine-extensions-api.jar +%{engine_jboss_modules}/common/org/ovirt/engine/api/restapi-definition/main/restapi-definition.jar +%{engine_jboss_modules}/common/org/ovirt/engine/api/restapi-jaxrs/main/restapi-jaxrs.jar +%{engine_jboss_modules}/common/org/ovirt/engine/api/restapi-types/main/restapi-types.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/aaa/main/aaa.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/branding/main/branding.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/common/main/common.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/compat/main/compat.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/dal/main/dal.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/extensions-manager/main/extensions-manager.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/searchbackend/main/searchbackend.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/tools/main/tools.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/utils/main/utils.jar +%{engine_jboss_modules}/common/org/ovirt/engine/core/uutils/main/uutils.jar +%{engine_jboss_modules}/common/org/ovirt/engine/extensions/builtin/main/builtin.jar __EOF__ # Needed for compatibility if package is different than the directory structure @@ -691,61 +691,61 @@ rm -f "%{buildroot}${dst}" ln -s "${src}" "%{buildroot}${dst}" done << __EOF__ -org/apache/commons/io/main/commons-io.jar -org/apache/ws/commons/main/ws-commons-util.jar -org/apache/xmlgraphics/batik/main/batik-awt-util.jar batik/batik-awt-util.jar -org/apache/xmlgraphics/batik/main/batik-bridge.jar batik/batik-bridge.jar -org/apache/xmlgraphics/batik/main/batik-css.jar batik/batik-css.jar -org/apache/xmlgraphics/batik/main/batik-ext.jar batik/batik-ext.jar -org/apache/xmlgraphics/batik/main/batik-extension.jar batik/batik-extension.jar -org/apache/xmlgraphics/batik/main/batik-gvt.jar batik/batik-gvt.jar -org/apache/xmlgraphics/batik/main/batik-svg-dom.jar batik/batik-svg-dom.jar -org/apache/xmlgraphics/batik/main/batik-transcoder.jar batik/batik-transcoder.jar -org/apache/xmlgraphics/batik/main/batik-util.jar batik/batik-util.jar -org/apache/xmlgraphics/commons/main/xmlgraphics-commons.jar -org/apache/xmlgraphics/fop/main/fop.jar -org/ovirt/otopi/main/otopi.jar otopi/otopi.jar -org/ovirt/ovirt-host-deploy/main/ovirt-host-deploy.jar ovirt-host-deploy/ovirt-host-deploy.jar -org/ovirt/vdsm-jsonrpc-java/main/vdsm-jsonrpc-java-client.jar vdsm-jsonrpc-java/vdsm-jsonrpc-java-client.jar +common/org/apache/commons/io/main/commons-io.jar +common/org/apache/ws/commons/main/ws-commons-util.jar +common/org/apache/xmlgraphics/batik/main/batik-awt-util.jar batik/batik-awt-util.jar +common/org/apache/xmlgraphics/batik/main/batik-bridge.jar batik/batik-bridge.jar +common/org/apache/xmlgraphics/batik/main/batik-css.jar batik/batik-css.jar +common/org/apache/xmlgraphics/batik/main/batik-ext.jar batik/batik-ext.jar +common/org/apache/xmlgraphics/batik/main/batik-extension.jar batik/batik-extension.jar +common/org/apache/xmlgraphics/batik/main/batik-gvt.jar batik/batik-gvt.jar +common/org/apache/xmlgraphics/batik/main/batik-svg-dom.jar batik/batik-svg-dom.jar +common/org/apache/xmlgraphics/batik/main/batik-transcoder.jar batik/batik-transcoder.jar +common/org/apache/xmlgraphics/batik/main/batik-util.jar batik/batik-util.jar +common/org/apache/xmlgraphics/commons/main/xmlgraphics-commons.jar +common/org/apache/xmlgraphics/fop/main/fop.jar +common/org/ovirt/otopi/main/otopi.jar otopi/otopi.jar +common/org/ovirt/ovirt-host-deploy/main/ovirt-host-deploy.jar ovirt-host-deploy/ovirt-host-deploy.jar +common/org/ovirt/vdsm-jsonrpc-java/main/vdsm-jsonrpc-java-client.jar vdsm-jsonrpc-java/vdsm-jsonrpc-java-client.jar %if 0%{?fedora} %if %{fedora} >= 19 -com/mchange/c3p0/main/c3p0.jar -com/woorea/openstack/sdk/main/glance-client.jar openstack-java-sdk/glance-client.jar -com/woorea/openstack/sdk/main/glance-model.jar openstack-java-sdk/glance-model.jar -com/woorea/openstack/sdk/main/keystone-client.jar openstack-java-sdk/keystone-client.jar -com/woorea/openstack/sdk/main/keystone-model.jar openstack-java-sdk/keystone-model.jar -com/woorea/openstack/sdk/main/openstack-client.jar openstack-java-sdk/openstack-client.jar -com/woorea/openstack/sdk/main/quantum-client.jar openstack-java-sdk/quantum-client.jar -com/woorea/openstack/sdk/main/quantum-model.jar openstack-java-sdk/quantum-model.jar -com/woorea/openstack/sdk/main/resteasy-connector.jar openstack-java-sdk/resteasy-connector.jar -org/aopalliance/main/aopalliance.jar -org/apache/avalon/framework/main/avalon-framework-api.jar -org/apache/avalon/framework/main/avalon-framework-impl.jar -org/apache/commons/compress/main/commons-compress.jar -org/apache/commons/configuration/main/commons-configuration.jar commons-configuration.jar -org/apache/commons/httpclient/main/commons-httpclient.jar -org/apache/commons/jxpath/main/commons-jxpath.jar commons-jxpath.jar -org/apache/xmlrpc/main/xmlrpc-client.jar -org/apache/xmlrpc/main/xmlrpc-common.jar -org/postgresql/main/postgresql.jar postgresql-jdbc.jar -org/quartz/main/quartz.jar -org/snmp4j/main/snmp4j.jar -org/springframework/ldap/main/spring-ldap-core.jar spring-ldap/spring-ldap-core.jar -org/springframework/main/spring-aop.jar springframework/spring-aop.jar -org/springframework/main/spring-asm.jar objectweb-asm/asm.jar -org/springframework/main/spring-beans.jar springframework/spring-beans.jar -org/springframework/main/spring-context.jar springframework/spring-context.jar -org/springframework/main/spring-core.jar springframework/spring-core.jar -org/springframework/main/spring-expression.jar springframework/spring-expression.jar -org/springframework/main/spring-instrument.jar springframework/spring-instrument.jar -org/springframework/main/spring-jdbc.jar springframework/spring-jdbc.jar -org/springframework/main/spring-tx.jar springframework/spring-tx.jar -org/tukaani/xz/main/xz.jar +common/com/mchange/c3p0/main/c3p0.jar +common/com/woorea/openstack/sdk/main/glance-client.jar openstack-java-sdk/glance-client.jar +common/com/woorea/openstack/sdk/main/glance-model.jar openstack-java-sdk/glance-model.jar +common/com/woorea/openstack/sdk/main/keystone-client.jar openstack-java-sdk/keystone-client.jar +common/com/woorea/openstack/sdk/main/keystone-model.jar openstack-java-sdk/keystone-model.jar +common/com/woorea/openstack/sdk/main/openstack-client.jar openstack-java-sdk/openstack-client.jar +common/com/woorea/openstack/sdk/main/quantum-client.jar openstack-java-sdk/quantum-client.jar +common/com/woorea/openstack/sdk/main/quantum-model.jar openstack-java-sdk/quantum-model.jar +common/com/woorea/openstack/sdk/main/resteasy-connector.jar openstack-java-sdk/resteasy-connector.jar +common/org/aopalliance/main/aopalliance.jar +common/org/apache/avalon/framework/main/avalon-framework-api.jar +common/org/apache/avalon/framework/main/avalon-framework-impl.jar +common/org/apache/commons/compress/main/commons-compress.jar +common/org/apache/commons/configuration/main/commons-configuration.jar commons-configuration.jar +common/org/apache/commons/httpclient/main/commons-httpclient.jar +common/org/apache/commons/jxpath/main/commons-jxpath.jar commons-jxpath.jar +common/org/apache/xmlrpc/main/xmlrpc-client.jar +common/org/apache/xmlrpc/main/xmlrpc-common.jar +common/org/postgresql/main/postgresql.jar postgresql-jdbc.jar +common/org/quartz/main/quartz.jar +common/org/snmp4j/main/snmp4j.jar +common/org/springframework/ldap/main/spring-ldap-core.jar spring-ldap/spring-ldap-core.jar +common/org/springframework/main/spring-aop.jar springframework/spring-aop.jar +common/org/springframework/main/spring-asm.jar objectweb-asm/asm.jar +common/org/springframework/main/spring-beans.jar springframework/spring-beans.jar +common/org/springframework/main/spring-context.jar springframework/spring-context.jar +common/org/springframework/main/spring-core.jar springframework/spring-core.jar +common/org/springframework/main/spring-expression.jar springframework/spring-expression.jar +common/org/springframework/main/spring-instrument.jar springframework/spring-instrument.jar +common/org/springframework/main/spring-jdbc.jar springframework/spring-jdbc.jar +common/org/springframework/main/spring-tx.jar springframework/spring-tx.jar +common/org/tukaani/xz/main/xz.jar %endif %endif %if 0%{?rhel} -org/apache/avalon/framework/main/avalon-framework-api.jar avalon-framework.jar -org/apache/avalon/framework/main/avalon-framework-impl.jar avalon-framework.jar +common/org/apache/avalon/framework/main/avalon-framework-api.jar avalon-framework.jar +common/org/apache/avalon/framework/main/avalon-framework-impl.jar avalon-framework.jar %endif __EOF__ diff --git a/packaging/bin/engine-prolog.sh.in b/packaging/bin/engine-prolog.sh.in index 51bb028..f12d3fd 100644 --- a/packaging/bin/engine-prolog.sh.in +++ b/packaging/bin/engine-prolog.sh.in @@ -28,8 +28,8 @@ export JAVA_HOME # we use jboss specific loader (jboss-modules.jar) - # setup module path - export JAVA_MODULEPATH="${ENGINE_JAVA_MODULEPATH}:${JBOSS_HOME}/modules" + # setup module path to be used in standalone tools + export JAVA_MODULEPATH="${ENGINE_TOOLS_JAVA_MODULEPATH}:${JBOSS_HOME}/modules" # clean the class path # jboss module loader will not run otherwise. diff --git a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in index 1cdbe24..684775a 100644 --- a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in +++ b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in @@ -22,14 +22,14 @@ ENGINE_USR="@ENGINE_USR@" # -# Module path +# Module path to be used for standalone tools # # Colon separated list of paths. # # JBoss is always appended, cannot be appended here # as it may be resolved to different value. # -ENGINE_JAVA_MODULEPATH="${ENGINE_USR}/modules" +ENGINE_TOOLS_JAVA_MODULEPATH="${ENGINE_USR}/modules/standalone:${ENGINE_USR}/modules/common" # # Use this if you want to enable remote debugging of the notifier java virtual diff --git a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py index 49de95b9..f93cef4 100755 --- a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py +++ b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py @@ -168,7 +168,7 @@ 'LC_ALL': 'en_US.UTF-8', 'CLASSPATH': '', 'JAVA_MODULEPATH': '%s:%s' % ( - self._config.get('ENGINE_JAVA_MODULEPATH'), + self._config.get('ENGINE_TOOLS_JAVA_MODULEPATH'), os.path.join( self._config.get('JBOSS_HOME'), 'modules', diff --git a/packaging/services/ovirt-engine/ovirt-engine.conf.in b/packaging/services/ovirt-engine/ovirt-engine.conf.in index 8d7b966..be4cefc 100644 --- a/packaging/services/ovirt-engine/ovirt-engine.conf.in +++ b/packaging/services/ovirt-engine/ovirt-engine.conf.in @@ -113,14 +113,20 @@ ENGINE_JVM_ARGS="${ENGINE_JVM_ARGS} -XX:HeapDumpPath=\"${ENGINE_LOG}/dump\"" # -# Module path +# Module paths # # Colon separated list of paths. # # JBoss is always appended, cannot be appended here # as it may be resolved to different value. # -ENGINE_JAVA_MODULEPATH="${ENGINE_USR}/modules" +# +# Module path used inside JBoss instance +# +ENGINE_JBOSS_JAVA_MODULEPATH="${ENGINE_USR}/modules/instance:${ENGINE_USR}/modules/common" +# +# Module path used in standalone tools +ENGINE_TOOLS_JAVA_MODULEPATH="${ENGINE_USR}/modules/standalone:${ENGINE_USR}/modules/common" # # Additional applications to be deployed in the instance of the diff --git a/packaging/services/ovirt-engine/ovirt-engine.py b/packaging/services/ovirt-engine/ovirt-engine.py index 3735388..a12dd4f 100755 --- a/packaging/services/ovirt-engine/ovirt-engine.py +++ b/packaging/services/ovirt-engine/ovirt-engine.py @@ -272,7 +272,7 @@ 'modules', ), '%s:%s' % ( - self._config.get('ENGINE_JAVA_MODULEPATH'), + self._config.get('ENGINE_JBOSS_JAVA_MODULEPATH'), os.path.join( self._config.get('JBOSS_HOME'), 'modules', -- To view, visit http://gerrit.ovirt.org/32846 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b5c6efcf013350380a88db4b5b5f5973ba41eeb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
