Yaniv Dary has uploaded a new change for review. Change subject: Revert "packaging: setup: now deploys with correct app name with jrs pro" ......................................................................
Revert "packaging: setup: now deploys with correct app name with jrs pro" This reverts commit 813cec66e69a5a2db3430973508b2e6e0902bdba. Change-Id: I99b88114416de1ce6022a546e3c15f6a5d9d485c Signed-off-by: Yaniv Dary <[email protected]> --- M packaging/conf/jasper-master.properties.in M packaging/setup/ovirt_engine_setup/reportsconfig.py.in M packaging/setup/ovirt_engine_setup/reportsconstants.py 3 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/25/24825/1 diff --git a/packaging/conf/jasper-master.properties.in b/packaging/conf/jasper-master.properties.in index b2a490f..fadfa3d 100644 --- a/packaging/conf/jasper-master.properties.in +++ b/packaging/conf/jasper-master.properties.in @@ -19,7 +19,6 @@ # web app name # (set one of these to deploy to a non-default war file name) webAppNameCE=@PACKAGE_NAME@ -webAppNamePro=@PACKAGE_NAME@ # Database maven.jdbc.groupId=postgresql diff --git a/packaging/setup/ovirt_engine_setup/reportsconfig.py.in b/packaging/setup/ovirt_engine_setup/reportsconfig.py.in index b0953a7..0fe8f7c 100644 --- a/packaging/setup/ovirt_engine_setup/reportsconfig.py.in +++ b/packaging/setup/ovirt_engine_setup/reportsconfig.py.in @@ -23,6 +23,7 @@ PKG_STATE_DIR = '@PKG_STATE_DIR@' PKG_DATA_DIR = '@PKG_DATA_DIR@' PKG_JAVA_DIR = '@PKG_JAVA_DIR@' +PACKAGE_NAME = '@PACKAGE_NAME@' PACKAGE_VERSION = '@PACKAGE_VERSION@' DISPLAY_VERSION = '@DISPLAY_VERSION@' RPM_VERSION = '@RPM_VERSION@' diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py b/packaging/setup/ovirt_engine_setup/reportsconstants.py index 96e61a5..0bd4b65 100644 --- a/packaging/setup/ovirt_engine_setup/reportsconstants.py +++ b/packaging/setup/ovirt_engine_setup/reportsconstants.py @@ -36,7 +36,7 @@ @util.export @util.codegen class Const(object): - PACKAGE_NAME = 'ovirt-engine-reports' + PACKAGE_NAME = reportsconfig.PACKAGE_NAME PACKAGE_VERSION = reportsconfig.PACKAGE_VERSION DISPLAY_VERSION = reportsconfig.DISPLAY_VERSION RPM_VERSION = reportsconfig.RPM_VERSION -- To view, visit http://gerrit.ovirt.org/24825 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99b88114416de1ce6022a546e3c15f6a5d9d485c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
