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: I1794a49d9e210dfaccd6d5847eb531a856c05a1f
Signed-off-by: Shirly Radco <sra...@redhat.com>
---
R
packaging/jasper-war-patches/ce/200_009_web-inf-application_context_override.patch
M
packaging/jasper-war-patches/pro/100_001_meta-inf_add-postgresql-jdbc-module-dependency.patch
M
packaging/jasper-war-patches/pro/200_005_web-inf_remove_error_on_jboss_start.patch
D
packaging/jasper-war-patches/pro/200_006_web-inf_remove_query_manipulator_override.patch
A
packaging/jasper-war-patches/pro/200_009_web-inf-application_context_override.patch
M
packaging/jasper-war-patches/pro/900_001_props_disable-heartbeat-reporting.patch
6 files changed, 30 insertions(+), 50 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/11/40011/1
diff --git
a/packaging/jasper-war-patches/common/200_009_web-inf-application_context_override.patch
b/packaging/jasper-war-patches/ce/200_009_web-inf-application_context_override.patch
similarity index 100%
rename from
packaging/jasper-war-patches/common/200_009_web-inf-application_context_override.patch
rename to
packaging/jasper-war-patches/ce/200_009_web-inf-application_context_override.patch
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..ae0201a 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
@@ -3,6 +3,6 @@
@@ -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.)
+ Created-By: 1.6.0_29-b11 (Sun Microsystems Inc.)
+Dependencies: org.postgresql
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
index 04f93c4..94723ef 100644
---
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
@@ -8,14 +8,14 @@
This removed the problemtic servlet.
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
-@@ -296,16 +296,6 @@
+@@ -290,16 +290,6 @@
<param-value>datasources.xml</param-value>
</init-param>
</servlet>-->
- <!--XML for Analysis Servlet-->
- <servlet>
- <servlet-name>JasperXmlaServlet</servlet-name>
--
<servlet-class>com.jaspersoft.ji.ja.security.service.MTXmlaServletImpl</servlet-class>
+-
<servlet-class>com.jaspersoft.jasperserver.war.xmla.XmlaServletImpl</servlet-class>
- <load-on-startup>50</load-on-startup>
- </servlet>
- <servlet-mapping>
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
deleted file mode 100644
index c91de84..0000000
---
a/packaging/jasper-war-patches/pro/200_006_web-inf_remove_query_manipulator_override.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-[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
-@@ -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"/>
diff --git
a/packaging/jasper-war-patches/pro/200_009_web-inf-application_context_override.patch
b/packaging/jasper-war-patches/pro/200_009_web-inf-application_context_override.patch
new file mode 100644
index 0000000..6927dc5
--- /dev/null
+++
b/packaging/jasper-war-patches/pro/200_009_web-inf-application_context_override.patch
@@ -0,0 +1,27 @@
+--- a/WEB-INF/applicationContext.xml
++++ b/WEB-INF/applicationContext.xml
+@@ -508,7 +508,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"/>
+@@ -1147,7 +1147,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"/>
+@@ -1379,4 +1379,4 @@
+ <aop:around pointcut-ref="awsCredentialsResolver"
method="resolveAwsCredentialAttributes"/>
+ </aop:aspect>
+ </aop:config>
+-</beans>
+\ No newline at end of file
++</beans>
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
index c9ee882..77f0789 100644
---
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
@@ -1,16 +1,3 @@
---- 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
--
To view, visit https://gerrit.ovirt.org/40011
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1794a49d9e210dfaccd6d5847eb531a856c05a1f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Shirly Radco <sra...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
