Shirly Radco has uploaded a new change for review. Change subject: packaging: fix patch files for jasper upgrade 6.0.1 ......................................................................
packaging: fix patch files for jasper upgrade 6.0.1 Change-Id: I0b9a59db119d6243ced10ecd96b28eff78a6bf23 Signed-off-by: Shirly Radco <[email protected]> --- M ovirt-engine-reports.spec.in M packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml.in D packaging/jasper-war-patches/ce/100_003_meta-inf_remove_dependecy_to_missing_jars.patch M packaging/jasper-war-patches/ce/300_002_jsp_fix-sso-resend-issue.patch M packaging/jasper-war-patches/ce/900_003_props_enable-full-text-in-supported-formats.patch M packaging/jasper-war-patches/common/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch A packaging/jasper-war-patches/common/200_008_web-inf_add_EngineSimplePreAuthFilter.patch A packaging/jasper-war-patches/common/200_009_web-inf-application_context_override.patch M packaging/jasper-war-patches/common/300_003_jsp_rebrand-tab-headers.patch 9 files changed, 67 insertions(+), 71 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/38/38338/1 diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in index a3c0b4a..e4b4788 100644 --- a/ovirt-engine-reports.spec.in +++ b/ovirt-engine-reports.spec.in @@ -81,7 +81,7 @@ BuildArch: noarch Source0: http://resources.ovirt.org/pub/ovirt-master-snapshot/src/@PACKAGE_NAME@/@PACKAGE_NAME@-@[email protected] -BuildRequires: jasperreports-server%{reports_jasper_suffix} >= 5.5.0-7 +BuildRequires: jasperreports-server%{reports_jasper_suffix} >= 6.0.1 BuildRequires: %{java_devel} BuildRequires: jpackage-utils BuildRequires: make @@ -93,8 +93,8 @@ Requires: %{jboss} Requires: %{name}-setup >= %{version}-%{release} -Requires: jasperreports-server%{reports_jasper_suffix} < 5.6.0 -Requires: jasperreports-server%{reports_jasper_suffix} >= 5.5.0-7 +Requires: jasperreports-server%{reports_jasper_suffix} < 6.1.0 +Requires: jasperreports-server%{reports_jasper_suffix} >= 6.0.1 Requires: java-1.7.0-openjdk >= 1:1.7.0.9-2.3.3.2 Requires: jpackage-utils Requires: logrotate diff --git a/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml.in b/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml.in index c8c0fab..8c4060c 100644 --- a/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml.in +++ b/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml.in @@ -2,30 +2,11 @@ <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:tx="http://www.springframework.org/schema/tx"; - xmlns:context="http://www.springframework.org/schema/context"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd";> - - <bean class="com.jaspersoft.jasperserver.api.common.util.spring.BeanPropertyOverrider"> - <property name="beanName" value="filterChainProxy"/> - <property name="propertyName" value="filterInvocationDefinitionSource"/> - <property name="override"> - <value> - CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON - PATTERN_TYPE_APACHE_ANT - /xmla=httpSessionContextIntegrationFilter,${bean.loggingFilter},${bean.basicProcessingFilter},JIAuthenticationSynchronizer,anonymousProcessingFilter,basicAuthExceptionTranslationFilter,filterInvocationInterceptor - /services/**=httpSessionContextIntegrationFilter,${bean.loggingFilter},${bean.portletAuthenticationProcessingFilter}, delegatingBasicProcessingFilter,${bean.passwordExpirationProcessingFilter},JIAuthenticationSynchronizer,anonymousProcessingFilter,wsBasicAuthExceptionTranslationFilter,filterInvocationInterceptor - /rest/login=httpSessionContextIntegrationFilter,${bean.loggingFilter}, encryptionFilter,delegatingAuthenticationRestProcessingFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,filterInvocationInterceptor - /rest/**=httpSessionContextIntegrationFilter,${bean.loggingFilter},${bean.portletAuthenticationProcessingFilter},delegatingBasicProcessingFilter,${bean.passwordExpirationProcessingFilter},JIAuthenticationSynchronizer,anonymousProcessingFilter,wsBasicAuthExceptionTranslationFilter,filterInvocationInterceptor - /rest_v2/**=httpSessionContextIntegrationFilter,encryptionFilter,textOnlyResponseWebAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},${bean.authenticationProcessingFilter},${bean.userPreferencesFilter},delegatingBasicProcessingFilter,delegatingRequestParameterAuthenticationFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,restExceptionTranslationFilter,filterInvocationInterceptor - /**=httpSessionContextIntegrationFilter,encryptionFilter,multipartRequestWrapperFilter,webAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},delegatingAuthenticationProcessingFilter,${bean.userPreferencesFilter},delegatingBasicProcessingFilter,EngineSimplePreAuthFilter,delegatingRequestParameterAuthenticationFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,delegatingExceptionTranslationFilter,filterInvocationInterceptor,switchUserProcessingFilter,iPadSupportFilter - </value> - </property> - </bean> + xmlns:security="http://www.springframework.org/schema/security"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.2.xsd + http://www.springframework.org/schema/security + http://www.springframework.org/schema/security/spring-security-3.2.xsd";> <bean id="EngineSimplePreAuthFilter" class="org.ovirt.authentication.EngineSimplePreAuthFilter"> <property name="authenticationManager"> @@ -37,22 +18,6 @@ <bean class="org.ovirt.jasperreports.querymodifier.CustomOvirtReportsQueryManipulator" id="CustomOvirtReportsQueryManipulator"> <property name ="cascading"> <ref bean="CascadeQueryManipulator"/> - </property> - </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"> - <value>false</value> </property> </bean> </beans> diff --git a/packaging/jasper-war-patches/ce/100_003_meta-inf_remove_dependecy_to_missing_jars.patch b/packaging/jasper-war-patches/ce/100_003_meta-inf_remove_dependecy_to_missing_jars.patch deleted file mode 100644 index 579399e..0000000 --- a/packaging/jasper-war-patches/ce/100_003_meta-inf_remove_dependecy_to_missing_jars.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/META-INF/jboss-deployment-structure.xml -+++ b/META-INF/jboss-deployment-structure.xml -@@ -169,12 +169,6 @@ - Add JDBC jars for UI DataSource drop down here - --> - <resource-root path="WEB-INF/lib/mariadb-java-client-1.1.2.jar" use-physical-code-source="true"/> -- <resource-root path="WEB-INF/lib/ingres-jdbc-9.2.0.jar" use-physical-code-source="true"/> -- <resource-root path="WEB-INF/lib/ojdbc6-11.2.0.2.jar" use-physical-code-source="true"/> -- <resource-root path="WEB-INF/lib/db2jcc-9.7.jar" use-physical-code-source="true"/> -- <resource-root path="WEB-INF/lib/sqljdbc-1.6-2206.100.jar" use-physical-code-source="true"/> -- <resource-root path="WEB-INF/lib/vertica_4.1.19_jdk_5.jar" use-physical-code-source="true"/> -- - - <!-- 2013-07-15 thorick - http://bugzilla.jaspersoft.com/show_bug.cgi?id=33137 diff --git a/packaging/jasper-war-patches/ce/300_002_jsp_fix-sso-resend-issue.patch b/packaging/jasper-war-patches/ce/300_002_jsp_fix-sso-resend-issue.patch index 7606b06..f49dcac 100644 --- a/packaging/jasper-war-patches/ce/300_002_jsp_fix-sso-resend-issue.patch +++ b/packaging/jasper-war-patches/ce/300_002_jsp_fix-sso-resend-issue.patch @@ -1,10 +1,13 @@ --- a/WEB-INF/jsp/modules/viewReport/ViewReportState.jsp +++ b/WEB-INF/jsp/modules/viewReport/ViewReportState.jsp @@ -24,7 +24,6 @@ - <c:if test="${needPageRefresh}"> + <c:if test="${!pageContext.request.requestedSessionIdValid and pageContext.request.method == 'GET'}"> <script type="text/javascript"> - <%-- HTTP redirect can't be applied here because it adds jsessionid parameter --%> + <%--[18280] HTTP redirect can't be applied here because it adds jsessionid parameter --%> - window.location.reload(); </script> </c:if> +-- +1.9.3 + diff --git a/packaging/jasper-war-patches/ce/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 index e8a60dc..08816ad 100644 --- a/packaging/jasper-war-patches/ce/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 @@ -1,9 +1,15 @@ --- a/WEB-INF/classes/jasperreports.properties +++ b/WEB-INF/classes/jasperreports.properties -@@ -57,3 +57,6 @@ - +@@ -58,6 +58,9 @@ com.jaspersoft.jasperreports.export.html.type=html2 net.sf.jasperreports.web.report.resources.path=/reportresource/reportresource net.sf.jasperreports.web.request.parameter.resource.uri=resource -+ -+# enable full text in ods export format + ++enable full text in ods export format +net.sf.jasperreports.print.keep.full.text=true ++ + net.sf.jasperreports.print.transfer.jrs.export=com.jaspersoft.jrs.export + #com.jaspersoft.jrs.export.csv.paginated=true + #com.jaspersoft.jrs.export.xls.paginated=true +-- +1.9.3 + diff --git a/packaging/jasper-war-patches/common/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch b/packaging/jasper-war-patches/common/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch index c62e311..77eff85 100644 --- a/packaging/jasper-war-patches/common/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch +++ b/packaging/jasper-war-patches/common/100_002_meta-inf_remove_pgsql_jar_from_exclude.patch @@ -1,10 +1,13 @@ --- a/META-INF/jboss-deployment-structure.xml +++ b/META-INF/jboss-deployment-structure.xml -@@ -174,7 +174,6 @@ - <resource-root path="WEB-INF/lib/db2jcc-9.7.jar" use-physical-code-source="true"/> - <resource-root path="WEB-INF/lib/sqljdbc-1.6-2206.100.jar" use-physical-code-source="true"/> - <resource-root path="WEB-INF/lib/vertica_4.1.19_jdk_5.jar" use-physical-code-source="true"/> -- <resource-root path="WEB-INF/lib/postgresql-9.2-1002.jdbc4.jar" use-physical-code-source="true"/> +@@ -201,7 +201,6 @@ + <!-- Add JDBC jars for installation and/or for the DataSource drop list in the UI --> + <!-- =============================================================================== --> +- <resource-root path="WEB-INF/lib/postgresql-9.2-1002.jdbc4.jar" use-physical-code-source="true"/> + <resource-root path="WEB-INF/lib/mariadb-java-client-1.1.2.jar" use-physical-code-source="true"/> - <!-- 2013-07-15 thorick + <!-- Uncomment out JDBC driver line below to add to the JDBC driver dropdown list in the UI. --> +-- +1.9.3 + diff --git a/packaging/jasper-war-patches/common/200_008_web-inf_add_EngineSimplePreAuthFilter.patch b/packaging/jasper-war-patches/common/200_008_web-inf_add_EngineSimplePreAuthFilter.patch new file mode 100644 index 0000000..1339ce5 --- /dev/null +++ b/packaging/jasper-war-patches/common/200_008_web-inf_add_EngineSimplePreAuthFilter.patch @@ -0,0 +1,11 @@ +--- a/WEB-INF/applicationContext-security-web.xml ++++ b/WEB-INF/applicationContext-security-web.xml +@@ -23,7 +23,7 @@ + <security:filter-chain pattern="/rest/login" filters="httpSessionContextIntegrationFilter,${bean.loggingFilter}, encryptionFilter,delegatingCASSingleSignOutFilter,delegatingPreAuthenticatedFilter,delegatingAuthenticationRestProcessingFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,filterInvocationInterceptor"/> + <security:filter-chain pattern="/rest/**" filters="httpSessionContextIntegrationFilter,${bean.loggingFilter},delegatingCASSingleSignOutFilter,delegatingPreAuthenticatedFilter,${bean.portletAuthenticationProcessingFilter},delegatingBasicProcessingFilter,${bean.passwordExpirationProcessingFilter},JIAuthenticationSynchronizer,anonymousProcessingFilter,wsBasicAuthExceptionTranslationFilter,filterInvocationInterceptor"/> + <security:filter-chain pattern="/rest_v2/**" filters="httpSessionContextIntegrationFilter,encryptionFilter,delegatingCASSingleSignOutFilter,textOnlyResponseWebAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},delegatingPreAuthenticatedFilter,${bean.authenticationProcessingFilter},${bean.userPreferencesFilter},delegatingBasicProcessingFilter,delegatingRequestParameterAuthenticationFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,restExceptionTranslationFilter,filterInvocationInterceptor"/> +- <security:filter-chain pattern="/**" filters="httpSessionContextIntegrationFilter,encryptionFilter,delegatingCASSingleSignOutFilter,multipartRequestWrapperFilter,webAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},delegatingPreAuthenticatedFilter,delegatingAuthenticationProcessingFilter,${bean.userPreferencesFilter},delegatingBasicProcessingFilter,delegatingRequestParameterAuthenticationFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,delegatingExceptionTranslationFilter,filterInvocationInterceptor,switchUserProcessingFilter,iPadSupportFilter"/> ++ <security:filter-chain pattern="/**" filters="httpSessionContextIntegrationFilter,encryptionFilter,delegatingCASSingleSignOutFilter,multipartRequestWrapperFilter,webAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},delegatingPreAuthenticatedFilter,delegatingAuthenticationProcessingFilter,${bean.userPreferencesFilter},delegatingBasicProcessingFilter,EngineSimplePreAuthFilter,delegatingRequestParameterAuthenticationFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,delegatingExceptionTranslationFilter,filterInvocationInterceptor,switchUserProcessingFilter,iPadSupportFilter"/> + </security:filter-chain-map> + </bean> + diff --git a/packaging/jasper-war-patches/common/200_009_web-inf-application_context_override.patch b/packaging/jasper-war-patches/common/200_009_web-inf-application_context_override.patch new file mode 100644 index 0000000..6b37999 --- /dev/null +++ b/packaging/jasper-war-patches/common/200_009_web-inf-application_context_override.patch @@ -0,0 +1,20 @@ +--- a/WEB-INF/applicationContext.xml ++++ b/WEB-INF/applicationContext.xml +@@ -678,7 +678,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"/> +@@ -1432,7 +1432,7 @@ + <property name="removeEmptySpaceBetweenRows" value="true"/> + <property name="removeEmptySpaceBetweenColumns" value="true"/> + <property name="whitePageBackground" value="false"/> +- <property name="ignoreGraphics" value="true"/> ++ <property name="ignoreGraphics" value="false"/> + <property name="collapseRowSpan" value="true"/> + <property name="ignoreCellBorder" value="true"/> + <property name="fontSizeFixEnabled" value="true"/> diff --git a/packaging/jasper-war-patches/common/300_003_jsp_rebrand-tab-headers.patch b/packaging/jasper-war-patches/common/300_003_jsp_rebrand-tab-headers.patch index 80c7d75..23cd54f 100644 --- a/packaging/jasper-war-patches/common/300_003_jsp_rebrand-tab-headers.patch +++ b/packaging/jasper-war-patches/common/300_003_jsp_rebrand-tab-headers.patch @@ -4,11 +4,14 @@ <html> <head> -- <title>Jaspersoft: <decorator:title /></title> +- <title>TIBCO Jaspersoft: <decorator:title /></title> + <title>oVirt Engine Reports: <decorator:title /></title> <meta http-equiv="Content-Type" content="text/html; charset=${requestScope['com.jaspersoft.ji.characterEncoding']}"> <!-- +-- +1.9.3 + --- a/WEB-INF/decorators/minimalDecorator.jsp +++ b/WEB-INF/decorators/minimalDecorator.jsp @@ -33,7 +33,7 @@ -- To view, visit https://gerrit.ovirt.org/38338 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b9a59db119d6243ced10ecd96b28eff78a6bf23 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Shirly Radco <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
