Yaniv Dary has uploaded a new change for review.
Change subject: packaging: setup: added patch handling for jrs pro
......................................................................
packaging: setup: added patch handling for jrs pro
Change-Id: I2cc6acf3646a3ba48733c08138b3eeaf57d8ccda
Signed-off-by: Yaniv Dary <yd...@redhat.com>
---
M .gitignore
M Makefile
R
packaging/jasper-war-patches-ce/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
R
packaging/jasper-war-patches-ce/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
R packaging/jasper-war-patches-ce/200_001_web-inf_use-war-jboss-faces.patch
R
packaging/jasper-war-patches-ce/200_002_web-inf_add-reports-status-servlet.patch
R packaging/jasper-war-patches-ce/200_003_web-inf_enforce-ssl.patch
R
packaging/jasper-war-patches-ce/200_004_web-inf_add_pgsql_driver_to_datasources.patch
R
packaging/jasper-war-patches-ce/200_005_web-inf_remove_error_on_jboss_start.patch
R packaging/jasper-war-patches-ce/300_001_jsp_change-login-help-info.patch
R packaging/jasper-war-patches-ce/300_002_jsp_fix-sso-resend-issue.patch
R packaging/jasper-war-patches-ce/300_003_jsp_rebrand-tab-headers.patch
R
packaging/jasper-war-patches-ce/900_001_props_disable-heartbeat-reporting.patch
R
packaging/jasper-war-patches-ce/900_002_props_fix-column-headers-disappearing-in-reports.patch
R
packaging/jasper-war-patches-ce/900_003_props_enable-full-text-in-supported-formats.patch
R packaging/jasper-war-patches-ce/900_004_props_change_logs_location.patch.in
A
packaging/jasper-war-patches-pro/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
C
packaging/jasper-war-patches-pro/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
A packaging/jasper-war-patches-pro/200_001_web-inf_use-war-jboss-faces.patch
A
packaging/jasper-war-patches-pro/200_002_web-inf_add-reports-status-servlet.patch
A packaging/jasper-war-patches-pro/200_003_web-inf_enforce-ssl.patch
C
packaging/jasper-war-patches-pro/200_004_web-inf_add_pgsql_driver_to_datasources.patch
A
packaging/jasper-war-patches-pro/200_005_web-inf_remove_error_on_jboss_start.patch
C packaging/jasper-war-patches-pro/300_001_jsp_change-login-help-info.patch
C packaging/jasper-war-patches-pro/300_003_jsp_rebrand-tab-headers.patch
A
packaging/jasper-war-patches-pro/900_001_props_disable-heartbeat-reporting.patch
A
packaging/jasper-war-patches-pro/900_002_props_fix-column-headers-disappearing-in-reports.patch
A
packaging/jasper-war-patches-pro/900_003_props_enable-full-text-in-supported-formats.patch
A packaging/jasper-war-patches-pro/900_004_props_change_logs_location.patch.in
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
30 files changed, 182 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/10/24910/1
diff --git a/.gitignore b/.gitignore
index 80ee987..32904d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
build/python-check.sh
ovirt-engine-reports.spec
packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml
-packaging/jasper-war-patches/900_004_props_change_logs_location.patch
+packaging/jasper-war-patches-ce/900_004_props_change_logs_location.patch
+packaging/jasper-war-patches-pro/900_004_props_change_logs_location.patch
packaging/setup/ovirt_engine_setup/reportsconfig.py
packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf
diff --git a/Makefile b/Makefile
index 99b5c08..a2d929b 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,8 @@
build/python-check.sh \
ovirt-engine-reports.spec \
packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml \
- packaging/jasper-war-patches/900_004_props_change_logs_location.patch \
+
packaging/jasper-war-patches-ce/900_004_props_change_logs_location.patch \
+
packaging/jasper-war-patches-pro/900_004_props_change_logs_location.patch \
packaging/setup/ovirt_engine_setup/reportsconfig.py \
packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf \
$(NULL)
@@ -184,7 +185,7 @@
$(NULL)
$(MAKE) copy-recursive SOURCEDIR=packaging/sys-etc
TARGETDIR="$(DESTDIR)$(SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)"
$(MAKE) copy-recursive SOURCEDIR=packaging/setup
TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/../ovirt-engine/setup"
EXCLUDE_GEN="$(GENERATED)"
- for d in conf etc jasper-customizations jasper-war-patches
ovirt-reports; do \
+ for d in conf etc jasper-customizations jasper-war-patches-ce
jasper-war-patches-pro ovirt-reports; do \
$(MAKE) copy-recursive SOURCEDIR="packaging/$${d}"
TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/$${d}" EXCLUDE_GEN="$(GENERATED)"; \
done
diff --git
a/packaging/jasper-war-patches/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
b/packaging/jasper-war-patches-ce/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
similarity index 100%
rename from
packaging/jasper-war-patches/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
rename to
packaging/jasper-war-patches-ce/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
diff --git
a/packaging/jasper-war-patches/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
b/packaging/jasper-war-patches-ce/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
similarity index 100%
rename from
packaging/jasper-war-patches/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
rename to
packaging/jasper-war-patches-ce/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
diff --git
a/packaging/jasper-war-patches/200_001_web-inf_use-war-jboss-faces.patch
b/packaging/jasper-war-patches-ce/200_001_web-inf_use-war-jboss-faces.patch
similarity index 100%
rename from
packaging/jasper-war-patches/200_001_web-inf_use-war-jboss-faces.patch
rename to
packaging/jasper-war-patches-ce/200_001_web-inf_use-war-jboss-faces.patch
diff --git
a/packaging/jasper-war-patches/200_002_web-inf_add-reports-status-servlet.patch
b/packaging/jasper-war-patches-ce/200_002_web-inf_add-reports-status-servlet.patch
similarity index 100%
rename from
packaging/jasper-war-patches/200_002_web-inf_add-reports-status-servlet.patch
rename to
packaging/jasper-war-patches-ce/200_002_web-inf_add-reports-status-servlet.patch
diff --git a/packaging/jasper-war-patches/200_003_web-inf_enforce-ssl.patch
b/packaging/jasper-war-patches-ce/200_003_web-inf_enforce-ssl.patch
similarity index 100%
rename from packaging/jasper-war-patches/200_003_web-inf_enforce-ssl.patch
rename to packaging/jasper-war-patches-ce/200_003_web-inf_enforce-ssl.patch
diff --git
a/packaging/jasper-war-patches/200_004_web-inf_add_pgsql_driver_to_datasources.patch
b/packaging/jasper-war-patches-ce/200_004_web-inf_add_pgsql_driver_to_datasources.patch
similarity index 100%
rename from
packaging/jasper-war-patches/200_004_web-inf_add_pgsql_driver_to_datasources.patch
rename to
packaging/jasper-war-patches-ce/200_004_web-inf_add_pgsql_driver_to_datasources.patch
diff --git
a/packaging/jasper-war-patches/200_005_web-inf_remove_error_on_jboss_start.patch
b/packaging/jasper-war-patches-ce/200_005_web-inf_remove_error_on_jboss_start.patch
similarity index 100%
rename from
packaging/jasper-war-patches/200_005_web-inf_remove_error_on_jboss_start.patch
rename to
packaging/jasper-war-patches-ce/200_005_web-inf_remove_error_on_jboss_start.patch
diff --git
a/packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
b/packaging/jasper-war-patches-ce/300_001_jsp_change-login-help-info.patch
similarity index 100%
rename from
packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
rename to
packaging/jasper-war-patches-ce/300_001_jsp_change-login-help-info.patch
diff --git
a/packaging/jasper-war-patches/300_002_jsp_fix-sso-resend-issue.patch
b/packaging/jasper-war-patches-ce/300_002_jsp_fix-sso-resend-issue.patch
similarity index 100%
rename from packaging/jasper-war-patches/300_002_jsp_fix-sso-resend-issue.patch
rename to packaging/jasper-war-patches-ce/300_002_jsp_fix-sso-resend-issue.patch
diff --git a/packaging/jasper-war-patches/300_003_jsp_rebrand-tab-headers.patch
b/packaging/jasper-war-patches-ce/300_003_jsp_rebrand-tab-headers.patch
similarity index 100%
rename from packaging/jasper-war-patches/300_003_jsp_rebrand-tab-headers.patch
rename to packaging/jasper-war-patches-ce/300_003_jsp_rebrand-tab-headers.patch
diff --git
a/packaging/jasper-war-patches/900_001_props_disable-heartbeat-reporting.patch
b/packaging/jasper-war-patches-ce/900_001_props_disable-heartbeat-reporting.patch
similarity index 100%
rename from
packaging/jasper-war-patches/900_001_props_disable-heartbeat-reporting.patch
rename to
packaging/jasper-war-patches-ce/900_001_props_disable-heartbeat-reporting.patch
diff --git
a/packaging/jasper-war-patches/900_002_props_fix-column-headers-disappearing-in-reports.patch
b/packaging/jasper-war-patches-ce/900_002_props_fix-column-headers-disappearing-in-reports.patch
similarity index 100%
rename from
packaging/jasper-war-patches/900_002_props_fix-column-headers-disappearing-in-reports.patch
rename to
packaging/jasper-war-patches-ce/900_002_props_fix-column-headers-disappearing-in-reports.patch
diff --git
a/packaging/jasper-war-patches/900_003_props_enable-full-text-in-supported-formats.patch
b/packaging/jasper-war-patches-ce/900_003_props_enable-full-text-in-supported-formats.patch
similarity index 100%
rename from
packaging/jasper-war-patches/900_003_props_enable-full-text-in-supported-formats.patch
rename to
packaging/jasper-war-patches-ce/900_003_props_enable-full-text-in-supported-formats.patch
diff --git
a/packaging/jasper-war-patches/900_004_props_change_logs_location.patch.in
b/packaging/jasper-war-patches-ce/900_004_props_change_logs_location.patch.in
similarity index 100%
rename from
packaging/jasper-war-patches/900_004_props_change_logs_location.patch.in
rename to
packaging/jasper-war-patches-ce/900_004_props_change_logs_location.patch.in
diff --git
a/packaging/jasper-war-patches-pro/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
b/packaging/jasper-war-patches-pro/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
new file mode 100644
index 0000000..4a9f9b4
--- /dev/null
+++
b/packaging/jasper-war-patches-pro/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
@@ -0,0 +1,8 @@
+--- a/META-INF/MANIFEST.MF
++++ b/META-INF/MANIFEST.MF
+@@ -1,4 +1,5 @@
+ Manifest-Version: 1.0
+ Ant-Version: Apache Ant 1.8.2
+ Created-By: 1.6.0_24-b24 (Sun Microsystems Inc.)
++Dependencies: org.postgresql
+
diff --git
a/packaging/jasper-war-patches/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
b/packaging/jasper-war-patches-pro/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
similarity index 100%
copy from
packaging/jasper-war-patches/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
copy to
packaging/jasper-war-patches-pro/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch
diff --git
a/packaging/jasper-war-patches-pro/200_001_web-inf_use-war-jboss-faces.patch
b/packaging/jasper-war-patches-pro/200_001_web-inf_use-war-jboss-faces.patch
new file mode 100644
index 0000000..21016ab
--- /dev/null
+++ b/packaging/jasper-war-patches-pro/200_001_web-inf_use-war-jboss-faces.patch
@@ -0,0 +1,13 @@
+--- a/WEB-INF/web.xml
++++ b/WEB-INF/web.xml
+@@ -14,6 +14,10 @@
+ <param-name>log4jConfigLocation</param-name>
+ <param-value>/WEB-INF/log4j.properties</param-value>
+ </context-param>
++ <context-param>
++ <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
++ <param-value>true</param-value>
++ </context-param>
+ <!--listener to load the root application context-->
+ <listener>
+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
diff --git
a/packaging/jasper-war-patches-pro/200_002_web-inf_add-reports-status-servlet.patch
b/packaging/jasper-war-patches-pro/200_002_web-inf_add-reports-status-servlet.patch
new file mode 100644
index 0000000..86d7a9c
--- /dev/null
+++
b/packaging/jasper-war-patches-pro/200_002_web-inf_add-reports-status-servlet.patch
@@ -0,0 +1,19 @@
+--- a/WEB-INF/web.xml
++++ b/WEB-INF/web.xml
+@@ -306,6 +306,16 @@
+ <servlet-name>JasperXmlaServlet</servlet-name>
+ <url-pattern>/xmla</url-pattern>
+ </servlet-mapping>
++ <!-- Status Servlet -->
++ <servlet>
++ <servlet-name>StatusServlet</servlet-name>
++ <servlet-class>org.ovirt.status.StatusServlet</servlet-class>
++ </servlet>
++
++ <servlet-mapping>
++ <servlet-name>StatusServlet</servlet-name>
++ <url-pattern>/Status</url-pattern>
++ </servlet-mapping>
+ <!--for drillthrough-->
+ <servlet>
+ <servlet-name>JasperDrillThroughServlet</servlet-name>
diff --git a/packaging/jasper-war-patches-pro/200_003_web-inf_enforce-ssl.patch
b/packaging/jasper-war-patches-pro/200_003_web-inf_enforce-ssl.patch
new file mode 100644
index 0000000..69805d8
--- /dev/null
+++ b/packaging/jasper-war-patches-pro/200_003_web-inf_enforce-ssl.patch
@@ -0,0 +1,17 @@
+--- a/WEB-INF/web.xml
++++ b/WEB-INF/web.xml
+@@ -499,10 +499,10 @@
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <user-data-constraint>
+- <!--SSL disabled-->
+- <transport-guarantee>NONE</transport-guarantee>
+- <!--SSL enabled
+-
<transport-guarantee>CONFIDENTIAL</transport-guarantee>-->
++ <!--SSL disabled>
++ <transport-guarantee>NONE</transport-guarantee> -->
++ <!--SSL enabled -->
++ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <!--This constraint disables the listed HTTP methods, which are not used by
JS
diff --git
a/packaging/jasper-war-patches/200_004_web-inf_add_pgsql_driver_to_datasources.patch
b/packaging/jasper-war-patches-pro/200_004_web-inf_add_pgsql_driver_to_datasources.patch
similarity index 100%
copy from
packaging/jasper-war-patches/200_004_web-inf_add_pgsql_driver_to_datasources.patch
copy to
packaging/jasper-war-patches-pro/200_004_web-inf_add_pgsql_driver_to_datasources.patch
diff --git
a/packaging/jasper-war-patches-pro/200_005_web-inf_remove_error_on_jboss_start.patch
b/packaging/jasper-war-patches-pro/200_005_web-inf_remove_error_on_jboss_start.patch
new file mode 100644
index 0000000..8ca171c
--- /dev/null
+++
b/packaging/jasper-war-patches-pro/200_005_web-inf_remove_error_on_jboss_start.patch
@@ -0,0 +1,20 @@
+--- a/WEB-INF/web.xml
++++ b/WEB-INF/web.xml
+@@ -296,7 +296,7 @@
+ <param-value>datasources.xml</param-value>
+ </init-param>
+ </servlet>-->
+- <!--XML for Analysis Servlet-->
++ <!--XML for Analysis Servlet >
+ <servlet>
+ <servlet-name>JasperXmlaServlet</servlet-name>
+
<servlet-class>com.jaspersoft.ji.ja.security.service.MTXmlaServletImpl</servlet-class>
+@@ -305,7 +305,7 @@
+ <servlet-mapping>
+ <servlet-name>JasperXmlaServlet</servlet-name>
+ <url-pattern>/xmla</url-pattern>
+- </servlet-mapping>
++ </servlet-mapping -->
+ <!-- Status Servlet -->
+ <servlet>
+ <servlet-name>StatusServlet</servlet-name>
diff --git
a/packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
b/packaging/jasper-war-patches-pro/300_001_jsp_change-login-help-info.patch
similarity index 100%
copy from packaging/jasper-war-patches/300_001_jsp_change-login-help-info.patch
copy to
packaging/jasper-war-patches-pro/300_001_jsp_change-login-help-info.patch
diff --git a/packaging/jasper-war-patches/300_003_jsp_rebrand-tab-headers.patch
b/packaging/jasper-war-patches-pro/300_003_jsp_rebrand-tab-headers.patch
similarity index 100%
copy from packaging/jasper-war-patches/300_003_jsp_rebrand-tab-headers.patch
copy to packaging/jasper-war-patches-pro/300_003_jsp_rebrand-tab-headers.patch
diff --git
a/packaging/jasper-war-patches-pro/900_001_props_disable-heartbeat-reporting.patch
b/packaging/jasper-war-patches-pro/900_001_props_disable-heartbeat-reporting.patch
new file mode 100644
index 0000000..c9ee882
--- /dev/null
+++
b/packaging/jasper-war-patches-pro/900_001_props_disable-heartbeat-reporting.patch
@@ -0,0 +1,26 @@
+--- a/WEB-INF/classes/js.config.properties
++++ b/WEB-INF/classes/js.config.properties
+@@ -6,8 +6,8 @@ audit.enabled=false
+ monitoring.enabled=false
+
+ # Enable or disable HeartBeat
+-heartbeat.enabled=true
+-heartbeat.askForPermission.enabled=true
++heartbeat.enabled=false
++heartbeat.askForPermission.enabled=false
+ heartbeat.permissionGranted.enabled=false
+
+ # Max upload file size across application in bytes
+--- a/WEB-INF/js.config.properties
++++ b/WEB-INF/js.config.properties
+@@ -6,8 +6,8 @@ audit.enabled=false
+ monitoring.enabled=false
+
+ # Enable or disable HeartBeat
+-heartbeat.enabled=true
+-heartbeat.askForPermission.enabled=true
++heartbeat.enabled=false
++heartbeat.askForPermission.enabled=false
+ heartbeat.permissionGranted.enabled=false
+
+ # Max upload file size across application in bytes
diff --git
a/packaging/jasper-war-patches-pro/900_002_props_fix-column-headers-disappearing-in-reports.patch
b/packaging/jasper-war-patches-pro/900_002_props_fix-column-headers-disappearing-in-reports.patch
new file mode 100644
index 0000000..c778079
--- /dev/null
+++
b/packaging/jasper-war-patches-pro/900_002_props_fix-column-headers-disappearing-in-reports.patch
@@ -0,0 +1,25 @@
+--- a/WEB-INF/classes/jasperreports.properties
++++ b/WEB-INF/classes/jasperreports.properties
+@@ -5,11 +5,18 @@
net.sf.jasperreports.query.executer.factory.domain=com.jaspersoft.ji.adhoc.strat
+ #limit the crosstab bucket/measure count to prevent out of memory errors
+ net.sf.jasperreports.crosstab.bucket.measure.limit=100000
+
+-#suppress page and column footers and all but the first page and column
headers when exporting to XLS
+-net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1=pageHeader
++# suppress page headers and footers when exporting to XLS
++
++net.sf.jasperreports.export.exclude.origin.band.1=pageHeader
++net.sf.jasperreports.export.exclude.origin.band.2=pageFooter
++
++# this gets rid of the repeating column headers and footers in excel exports
++net.sf.jasperreports.export.xls.exclude.origin.band.1=columnHeader
+ net.sf.jasperreports.export.xls.exclude.origin.band.2=pageFooter
+-net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.3=columnHeader
+-net.sf.jasperreports.export.xls.exclude.origin.band.4=columnFooter
++
++# keep the first column header on export
++net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1=pageHeader
++net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2=columnHeader
+
+ # report exporter hints override export parameters
+ net.sf.jasperreports.export.parameters.override.report.hints=false
diff --git
a/packaging/jasper-war-patches-pro/900_003_props_enable-full-text-in-supported-formats.patch
b/packaging/jasper-war-patches-pro/900_003_props_enable-full-text-in-supported-formats.patch
new file mode 100644
index 0000000..7dde4e3
--- /dev/null
+++
b/packaging/jasper-war-patches-pro/900_003_props_enable-full-text-in-supported-formats.patch
@@ -0,0 +1,12 @@
+--- a/WEB-INF/classes/jasperreports.properties
++++ b/WEB-INF/classes/jasperreports.properties
+@@ -84,6 +84,9 @@
com.jaspersoft.jasperreports.highcharts.highcharts.js$context.url=reportresource
+
com.jaspersoft.jasperreports.highcharts.default.service.js$context.url=reportresource?resource=com/jaspersoft/jasperreports/highcharts/charts/services/default.service.js
+
com.jaspersoft.jasperreports.highcharts.item.hyperlink.service.js$context.url=reportresource?resource=com/jaspersoft/jasperreports/highcharts/charts/services/item.hyperlink.service.js
+
++# enable full text in ods export format
++net.sf.jasperreports.print.keep.full.text=true
++
+ # highcharts: phantomjs's executable absolute path
+
#com.jaspersoft.jasperreports.highcharts.phantomjs.executable.path=path/to/phantomjs
+
diff --git
a/packaging/jasper-war-patches-pro/900_004_props_change_logs_location.patch.in
b/packaging/jasper-war-patches-pro/900_004_props_change_logs_location.patch.in
new file mode 100644
index 0000000..b143caa
--- /dev/null
+++
b/packaging/jasper-war-patches-pro/900_004_props_change_logs_location.patch.in
@@ -0,0 +1,31 @@
+--- a/WEB-INF/log4j.properties
++++ b/WEB-INF/log4j.properties
+@@ -39,7 +39,7 @@ log4j.appender.stdout.layout.conversionPattern=%d{ISO8601}
%5p %c{1},%t:%L - %m%
+ # jasperserver.root is used only by JasperServer Community Edition.
+ # JasperServer Professional users should look for jasperserver-pro.root lower
in this file.
+ log4j.appender.fileout=org.apache.log4j.RollingFileAppender
+-log4j.appender.fileout.File=${jasperserver.root}/WEB-INF/logs/jasperserver.log
++log4j.appender.fileout.File=@PKG_LOG_DIR@/jasperserver.log
+ log4j.appender.fileout.MaxFileSize=1024KB
+ log4j.appender.fileout.MaxBackupIndex=1
+ log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
+@@ -64,7 +64,7 @@ log4j.appender.fileout.layout.conversionPattern=%d{ISO8601}
%5p %c{1},%t:%L - %m
+ # jasperserver.root is used only by JasperServer Community Edition.
+ # JasperServer Professional users should look for jasperserver-pro.root lower
in this file.
+ log4j.appender.jasperanalysis=org.apache.log4j.RollingFileAppender
+-log4j.appender.jasperanalysis.File=${jasperserver.root}/WEB-INF/logs/jasperanalysis.log
++log4j.appender.jasperanalysis.File=@PKG_LOG_DIR@/jasperanalysis.log
+ log4j.appender.jasperanalysis.MaxFileSize=1024KB
+ log4j.appender.jasperanalysis.MaxBackupIndex=1
+ log4j.appender.jasperanalysis.layout=org.apache.log4j.PatternLayout
+@@ -139,8 +139,8 @@ log4j.logger.IntrusionDetector=ERROR
+
#log4j.logger.com.jaspersoft.jasperserver.jaxrs.importexport.ImportJaxrsService=DEBUG#
overriding fileout location
+ # jasperserver-pro.root is used only by JasperServer Professional.
+ # JasperServer Community Edition users should look for jasperserver.root
above in this file.
+-log4j.appender.fileout.File=${jasperserver-pro.root}/WEB-INF/logs/jasperserver.log
+-log4j.appender.jasperanalysis.File=${jasperserver-pro.root}/WEB-INF/logs/jasperanalysis.log
++log4j.appender.fileout.File=@PKG_LOG_DIR@/jasperserver.log
++log4j.appender.jasperanalysis.File=@PKG_LOG_DIR@/jasperanalysis.log
+
+ ## Show some audit related warnings
+ log4j.logger.com.jaspersoft.ji.logging.context=warn
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
index df2dcb0..fad4a8c 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
@@ -844,7 +844,12 @@
for p in sorted(
glob.glob(
os.path.join(
- oreportscons.FileLocations.OVIRT_ENGINE_WAR_PATCHES,
+ '%s-%s' % (
+ oreportscons.FileLocations.OVIRT_ENGINE_WAR_PATCHES,
+ self.environment[
+ oreportscons.JasperEnv.JASPER_NAME
+ ],
+ ),
'*.patch',
)
)
--
To view, visit http://gerrit.ovirt.org/24910
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cc6acf3646a3ba48733c08138b3eeaf57d8ccda
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <yd...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
