Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: move server-customizations->packaging/jasperserver-customizations ......................................................................
packaging: setup: move server-customizations->packaging/jasperserver-customizations Change-Id: Ice45dd476d68ddf0c5190e05d6fd17e15526ed8b Signed-off-by: Alon Bar-Lev <[email protected]> --- M .gitignore M Makefile R packaging/jasper-customizations/META-INF/MANIFEST.MF R packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml R packaging/jasper-customizations/WEB-INF/classes/jasperreports.properties R packaging/jasper-customizations/WEB-INF/decorators/decorator.jsp R packaging/jasper-customizations/WEB-INF/decorators/minimalDecorator.jsp R packaging/jasper-customizations/WEB-INF/js.config.properties R packaging/jasper-customizations/WEB-INF/jsp/modules/login/loginHelp.jsp R packaging/jasper-customizations/WEB-INF/jsp/modules/viewReport/ViewReportState.jsp R packaging/jasper-customizations/WEB-INF/log4j.properties.in R packaging/jasper-customizations/WEB-INF/web.xml M packaging/legacy-setup/ovirt-engine-reports-setup.py 13 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/16/23416/1 diff --git a/.gitignore b/.gitignore index fae2f8d..78f7108 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,5 @@ ########################### build/python-check.sh ovirt-engine-reports.spec +packaging/jasper-customizations/WEB-INF/log4j.properties packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf -server-customizations/WEB-INF/log4j.properties diff --git a/Makefile b/Makefile index 1c18992..32e75e2 100644 --- a/Makefile +++ b/Makefile @@ -120,8 +120,8 @@ GENERATED = \ build/python-check.sh \ ovirt-engine-reports.spec \ + packaging/jasper-customizations/WEB-INF/log4j.properties \ packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf \ - server-customizations/WEB-INF/log4j.properties \ $(NULL) all: \ @@ -213,8 +213,7 @@ $(GENERATED) \ $(NULL) $(MAKE) copy-recursive SOURCEDIR=packaging/sys-etc TARGETDIR="$(DESTDIR)$(SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)" - $(MAKE) copy-recursive SOURCEDIR=server-customizations TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/server-customizations" EXCLUDE_GEN="$(GENERATED)" - for d in conf ovirt-reports legacy-setup; do \ + for d in conf jasper-customizations ovirt-reports legacy-setup; do \ $(MAKE) copy-recursive SOURCEDIR="packaging/$${d}" TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/$${d}" EXCLUDE_GEN="$(GENERATED)"; \ done diff --git a/server-customizations/META-INF/MANIFEST.MF b/packaging/jasper-customizations/META-INF/MANIFEST.MF similarity index 100% rename from server-customizations/META-INF/MANIFEST.MF rename to packaging/jasper-customizations/META-INF/MANIFEST.MF diff --git a/server-customizations/WEB-INF/applicationContext-ovirt-override.xml b/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml similarity index 100% rename from server-customizations/WEB-INF/applicationContext-ovirt-override.xml rename to packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml diff --git a/server-customizations/WEB-INF/classes/jasperreports.properties b/packaging/jasper-customizations/WEB-INF/classes/jasperreports.properties similarity index 100% rename from server-customizations/WEB-INF/classes/jasperreports.properties rename to packaging/jasper-customizations/WEB-INF/classes/jasperreports.properties diff --git a/server-customizations/WEB-INF/decorators/decorator.jsp b/packaging/jasper-customizations/WEB-INF/decorators/decorator.jsp similarity index 100% rename from server-customizations/WEB-INF/decorators/decorator.jsp rename to packaging/jasper-customizations/WEB-INF/decorators/decorator.jsp diff --git a/server-customizations/WEB-INF/decorators/minimalDecorator.jsp b/packaging/jasper-customizations/WEB-INF/decorators/minimalDecorator.jsp similarity index 100% rename from server-customizations/WEB-INF/decorators/minimalDecorator.jsp rename to packaging/jasper-customizations/WEB-INF/decorators/minimalDecorator.jsp diff --git a/server-customizations/WEB-INF/js.config.properties b/packaging/jasper-customizations/WEB-INF/js.config.properties similarity index 100% rename from server-customizations/WEB-INF/js.config.properties rename to packaging/jasper-customizations/WEB-INF/js.config.properties diff --git a/server-customizations/WEB-INF/jsp/modules/login/loginHelp.jsp b/packaging/jasper-customizations/WEB-INF/jsp/modules/login/loginHelp.jsp similarity index 100% rename from server-customizations/WEB-INF/jsp/modules/login/loginHelp.jsp rename to packaging/jasper-customizations/WEB-INF/jsp/modules/login/loginHelp.jsp diff --git a/server-customizations/WEB-INF/jsp/modules/viewReport/ViewReportState.jsp b/packaging/jasper-customizations/WEB-INF/jsp/modules/viewReport/ViewReportState.jsp similarity index 100% rename from server-customizations/WEB-INF/jsp/modules/viewReport/ViewReportState.jsp rename to packaging/jasper-customizations/WEB-INF/jsp/modules/viewReport/ViewReportState.jsp diff --git a/server-customizations/WEB-INF/log4j.properties.in b/packaging/jasper-customizations/WEB-INF/log4j.properties.in similarity index 100% rename from server-customizations/WEB-INF/log4j.properties.in rename to packaging/jasper-customizations/WEB-INF/log4j.properties.in diff --git a/server-customizations/WEB-INF/web.xml b/packaging/jasper-customizations/WEB-INF/web.xml similarity index 100% rename from server-customizations/WEB-INF/web.xml rename to packaging/jasper-customizations/WEB-INF/web.xml diff --git a/packaging/legacy-setup/ovirt-engine-reports-setup.py b/packaging/legacy-setup/ovirt-engine-reports-setup.py index a93c445..f96078f 100755 --- a/packaging/legacy-setup/ovirt-engine-reports-setup.py +++ b/packaging/legacy-setup/ovirt-engine-reports-setup.py @@ -63,7 +63,7 @@ REPORTS_PACKAGE_DIR = "/usr/share/ovirt-engine-reports" SSL2JKSTRUST = "%s/legacy-setup/ssl2jkstrust.py" % REPORTS_PACKAGE_DIR -DIR_REPORTS_CUSTOMIZATION="%s/server-customizations" % REPORTS_PACKAGE_DIR +DIR_REPORTS_CUSTOMIZATION="%s/jasper-customizations" % REPORTS_PACKAGE_DIR DIR_OVIRT_THEME="%s/reports/resources/themes/ovirt-002dreports-002dtheme" % REPORTS_PACKAGE_DIR REPORTS_JARS_DIR = "/usr/share/java/ovirt-engine-reports" -- To view, visit http://gerrit.ovirt.org/23416 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice45dd476d68ddf0c5190e05d6fd17e15526ed8b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
