- fix leftover of mysql for backend (spotted by tj@)

- while here drop non-default tomcat5 as a dependency (eol coming soon)
  as well as non-default alternative xls patch
- trim historical header

Feature safe:	yes

2 files changed, 0 insertions, 46 deletions

diff --git a/databases/jasperserver/files/alt-patch-jasperserver__common__shared-config__applicationContext.xml b/databases/jasperserver/files/alt-patch-jasperserver__common__shared-config__applicationContext.xml
deleted file mode 100644
index 12438e9ec3b9..000000000000
--- a/databases/jasperserver/files/alt-patch-jasperserver__common__shared-config__applicationContext.xml
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./jasperserver/common/shared-config/applicationContext.xml.orig	2012-03-22 12:35:55.000000000 -0700
-+++ ./jasperserver/common/shared-config/applicationContext.xml	2012-03-22 12:36:00.000000000 -0700
-@@ -1092,14 +1092,14 @@
-     
-     <bean id="xlsExportParameters" class="com.jaspersoft.jasperserver.api.engine.jasperreports.common.XlsExportParametersBean">
-         <property name="detectCellType" value="true"/>
--        <property name="onePagePerSheet" value="false"/>
--        <property name="removeEmptySpaceBetweenRows" value="true"/>
-+        <property name="onePagePerSheet" value="true"/>
-+        <property name="removeEmptySpaceBetweenRows" value="false"/>
-         <property name="removeEmptySpaceBetweenColumns" value="true"/>
-         <property name="whitePageBackground" value="false"/>
-         <property name="ignoreGraphics" value="true"/>
-         <property name="collapseRowSpan" value="true"/>
-         <property name="ignoreCellBorder" value="true"/>
--        <property name="fontSizeFixEnabled" value="true"/>
-+        <property name="fontSizeFixEnabled" value="false"/>
-         <property name="maximumRowsPerSheet" value="0"/>
-         <property name="xlsFormatPatternsMap" ref="formatPatternsMap"/>
-     </bean>
-@@ -1124,6 +1124,8 @@
-     
-     <util:map id="formatPatternsMap">
-         <!-- entry key="¤ #,##0.00" value="$ #,##0.00"/-->
-+	<entry key="" value="0"/>
-+	<entry key="M/d/yyyy h:mm aa" value="m/d/yyyy h:mm"/>
-     </util:map> 
- 
-     <!-- end export parameters -->
diff --git a/databases/jasperserver/files/alt-patch-jasperserver__jasperserver-war__src__main__webappAdditions__WEB-INF__classes__jasperreports.properties b/databases/jasperserver/files/alt-patch-jasperserver__jasperserver-war__src__main__webappAdditions__WEB-INF__classes__jasperreports.properties
deleted file mode 100644
index 479fd409c8cf..000000000000
--- a/databases/jasperserver/files/alt-patch-jasperserver__jasperserver-war__src__main__webappAdditions__WEB-INF__classes__jasperreports.properties
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./jasperserver/jasperserver-war/src/main/webappAdditions/WEB-INF/classes/jasperreports.properties.orig	2012-03-22 12:38:28.000000000 -0700
-+++ ./jasperserver/jasperserver-war/src/main/webappAdditions/WEB-INF/classes/jasperreports.properties	2012-03-22 12:39:04.000000000 -0700
-@@ -5,10 +5,10 @@
- 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

--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

-+#net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1=pageHeader

-+#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

- 

- # report exporter hints override export parameters

- net.sf.jasperreports.export.parameters.override.report.hints=false