Shirly Radco has uploaded a new change for review. Change subject: packaging: updataed jasper war pro addition patches ......................................................................
packaging: updataed jasper war pro addition patches Upfated jasper war patches for pro addition. Change-Id: I2a3c42a8fe37d15920a3e142c4e86a7ed6160442 Bug-Url:https://bugzilla.redhat.com/1182125 Signed-off-by: Shirly Radco <sra...@redhat.com> --- M packaging/jasper-war-patches/pro/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch M packaging/jasper-war-patches/pro/200_006_web-inf_remove_query_manipulator_override.patch 2 files changed, 17 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/22/37022/1 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 index 4a9f9b4..3ee3b91 100644 --- 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 @@ -1,8 +1,10 @@ --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF -@@ -1,4 +1,5 @@ +@@ -1,3 +1,4 @@ Manifest-Version: 1.0 - Ant-Version: Apache Ant 1.8.2 - Created-By: 1.6.0_24-b24 (Sun Microsystems Inc.) + Created-By: 1.7.0_71 (Oracle Corporation) +Dependencies: org.postgresql +-- +1.9.3 + 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 index c91de84..47a7bbf 100644 --- 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 @@ -23,12 +23,15 @@ <property name="override"> --- a/WEB-INF/applicationContext.xml +++ b/WEB-INF/applicationContext.xml -@@ -470,7 +470,7 @@ - <ref bean="${bean.engineService.compiledReportsCache}"/> - </property> - <property name="queryManipulator"> -- <ref bean="CascadeQueryManipulator"/> -+ <ref bean="CustomOvirtReportsQueryManipulator"/> - </property> - <property name="securityContextProvider" ref="${bean.securityContextProvider}"/> - <property name="builtInParameterProviders" ref="builtInParameterProviders"/> +@@ -633,7 +633,7 @@ + <ref bean="${bean.engineService.compiledReportsCache}"/> + </property> + <property name="queryManipulator"> +- <ref bean="CascadeQueryManipulator"/> ++ <ref bean="CustomOvirtReportsQueryManipulator"/> + </property> + <property name="securityContextProvider" ref="${bean.securityContextProvider}"/> + <property name="builtInParameterProviders" ref="builtInParameterProviders"/> +-- +1.9.3 + -- To view, visit http://gerrit.ovirt.org/37022 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a3c42a8fe37d15920a3e142c4e86a7ed6160442 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-engine-reports-3.5 Gerrit-Owner: Shirly Radco <sra...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
