Yaniv Dary has uploaded a new change for review.
Change subject: packaging: customization: added patch to fix jrs pro start
......................................................................
packaging: customization: added patch to fix jrs pro start
This also required a changed in deployment order, since a bean
we add needed to be removed.
Change-Id: Icccd1e62680e756f8de26c8c8f76dd0947750ccf
Signed-off-by: Yaniv Dary <yd...@redhat.com>
---
A
packaging/jasper-war-patches/pro/200_006_web-inf_remove_query_manipulator_override.patch
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
2 files changed, 54 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/39/25039/1
diff --git
a/packaging/jasper-war-patches/pro/200_006_web-inf_remove_query_manipulator_override.patch
b/packaging/jasper-war-patches/pro/200_006_web-inf_remove_query_manipulator_override.patch
new file mode 100644
index 0000000..92380e5
--- /dev/null
+++
b/packaging/jasper-war-patches/pro/200_006_web-inf_remove_query_manipulator_override.patch
@@ -0,0 +1,36 @@
+[PATCH] Remove query manipulator override
+
+This is due to a change in JRS pro causing the override to fail
+application start. For now we will apply it directly on the
+applicationContext file.
+
+--- a/WEB-INF/applicationContext-ovirt-override.xml
++++ b/WEB-INF/applicationContext-ovirt-override.xml
+@@ -41,14 +41,6 @@
+ </bean>
+
+ <bean
class="com.jaspersoft.jasperserver.api.common.util.spring.BeanPropertyOverrider">
+- <property name="beanName" value="engineService"/>
+- <property name="propertyName" value="queryManipulator"/>
+- <property name="override">
+- <ref bean="CustomOvirtReportsQueryManipulator"/>
+- </property>
+- </bean>
+-
+- <bean
class="com.jaspersoft.jasperserver.api.common.util.spring.BeanPropertyOverrider">
+ <property name="beanName" value="xlsExportParameters"/>
+ <property name="propertyName" value="ignoreGraphics"/>
+ <property name="override">
+--- a/WEB-INF/applicationContext.xml
++++ b/WEB-INF/applicationContext.xml
+@@ -469,9 +469,7 @@
+ <property name="compiledReportsCache">
+ <ref bean="${bean.engineService.compiledReportsCache}"/>
+ </property>
+- <property name="queryManipulator">
+- <ref bean="CascadeQueryManipulator"/>
+- </property>
++ <property name="queryManipulator"
ref="CustomOvirtReportsQueryManipulator"/>
+ <property name="securityContextProvider"
ref="${bean.securityContextProvider}"/>
+ <property name="builtInParameterProviders"
ref="builtInParameterProviders"/>
+ <property name="reportParameterLabelKeyPrefix"
value="net.sf.jasperreports.prompt.label."/>
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 677ff2f..7099764 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
@@ -735,6 +735,24 @@
self.logger.info(_('Customizing Jasper'))
+ base = oreportscons.FileLocations.OVIRT_ENGINE_JASPER_CUSTOMIZATION
+ for directory, dirs, files in os.walk(base):
+ for f in files:
+ shutil.copy2(
+ os.path.join(
+ directory,
+ f,
+ ),
+ os.path.join(
+ oreportscons.FileLocations.
+ OVIRT_ENGINE_REPORTS_JASPER_WAR,
+ os.path.relpath(
+ directory,
+ base,
+ ),
+ )
+ )
+
for p in sorted(
(
glob.glob(
@@ -771,24 +789,6 @@
'--silent',
),
)
-
- base = oreportscons.FileLocations.OVIRT_ENGINE_JASPER_CUSTOMIZATION
- for directory, dirs, files in os.walk(base):
- for f in files:
- shutil.copy2(
- os.path.join(
- directory,
- f,
- ),
- os.path.join(
- oreportscons.FileLocations.
- OVIRT_ENGINE_REPORTS_JASPER_WAR,
- os.path.relpath(
- directory,
- base,
- ),
- )
- )
self.logger.info(_('Customizing Jasper metadata'))
--
To view, visit http://gerrit.ovirt.org/25039
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icccd1e62680e756f8de26c8c8f76dd0947750ccf
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
