diff --git a/core/build.gradle b/core/build.gradle index 9618c315c0..34dfc53bb6 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -162,12 +162,15 @@ dependencies { 'org.geotools:gt-cql:33.2', ) jasper( - 'net.sf.jasperreports:jasperreports:6.21.4', - 'net.sf.jasperreports:jasperreports-fonts:6.21.4', - 'net.sf.jasperreports:jasperreports-functions:6.21.4', - 'org.codehaus.groovy:groovy-all:3.0.23', 'ar.com.fdvs:DynamicJasper:5.3.9', - 'joda-time:joda-time:2.13.1', + 'com.itextpdf:itextpdf:5.5.13.4', + 'net.sf.jasperreports:jasperreports:7.0.2', + 'net.sf.jasperreports:jasperreports-excel-poi:7.0.2', + 'net.sf.jasperreports:jasperreports-fonts:7.0.2', + 'net.sf.jasperreports:jasperreports-functions:7.0.2', + 'net.sf.jasperreports:jasperreports-json:7.0.2', + 'net.sf.jasperreports:jasperreports-jdt:7.0.2', + 'net.sf.jasperreports:jasperreports-pdf:7.0.2', ) implementation( 'org.slf4j:slf4j-api:2.0.16', @@ -185,6 +188,11 @@ dependencies { 'net.logstash.logback:logstash-logback-encoder:8.0', // For PDF/A 'com.adobe.xmp:xmpcore:6.1.11', + // For JasperReports + 'joda-time:joda-time:2.14.0', + 'org.jfree:jcommon:1.0.24', + 'org.apache.groovy:groovy-all:4.0.26', + 'xalan:serializer:2.7.3', ) implementation( diff --git a/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java b/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java index 4906c29919..89ab76b617 100644 --- a/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java +++ b/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java @@ -5,7 +5,7 @@ import java.util.List; import javax.annotation.Nonnull; import net.sf.jasperreports.engine.JRException; -import net.sf.jasperreports.engine.data.JsonDataSource; +import net.sf.jasperreports.json.data.JsonDataSource; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONWriter; diff --git a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java index b10b6cf783..aad768042e 100644 --- a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java +++ b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java @@ -321,6 +321,10 @@ private void checkRequiredValues( for (int i = 0; i < parameters.getLength(); i++) { final Element param = (Element) parameters.item(i); final String name = param.getAttribute("name"); + if (param.getParentNode() != null + && !"jasperReport".equals(param.getParentNode().getNodeName())) { + continue; + } if (!values.containsKey(name)) { if (param.getElementsByTagName("defaultValueExpression").getLength() == 0) { missing.append("\t* ").append(name).append("\n"); diff --git a/core/src/main/java/org/mapfish/print/output/JRPdfExporterWeakHashMap.java b/core/src/main/java/org/mapfish/print/output/JRPdfExporterWeakHashMap.java index 1b6671cfce..57ac487df0 100644 --- a/core/src/main/java/org/mapfish/print/output/JRPdfExporterWeakHashMap.java +++ b/core/src/main/java/org/mapfish/print/output/JRPdfExporterWeakHashMap.java @@ -2,10 +2,10 @@ import java.util.WeakHashMap; import net.sf.jasperreports.engine.JasperReportsContext; -import net.sf.jasperreports.engine.export.JRPdfExporter; import net.sf.jasperreports.engine.util.ExifOrientationEnum; import net.sf.jasperreports.engine.util.Pair; -import net.sf.jasperreports.export.pdf.PdfImage; +import net.sf.jasperreports.pdf.JRPdfExporter; +import net.sf.jasperreports.pdf.common.PdfImage; public class JRPdfExporterWeakHashMap extends JRPdfExporter { diff --git a/core/src/main/java/org/mapfish/print/output/JasperReportExcelOutputFormat.java b/core/src/main/java/org/mapfish/print/output/JasperReportExcelOutputFormat.java index 154174cc8d..364bdef686 100644 --- a/core/src/main/java/org/mapfish/print/output/JasperReportExcelOutputFormat.java +++ b/core/src/main/java/org/mapfish/print/output/JasperReportExcelOutputFormat.java @@ -2,9 +2,9 @@ import java.io.OutputStream; import net.sf.jasperreports.engine.JRException; -import net.sf.jasperreports.engine.export.JRXlsExporter; import net.sf.jasperreports.export.SimpleExporterInput; import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput; +import net.sf.jasperreports.poi.export.JRXlsExporter; /** An PDF output format that uses Jasper reports to generate the result. */ public final class JasperReportExcelOutputFormat extends AbstractJasperReportOutputFormat diff --git a/core/src/main/java/org/mapfish/print/output/JasperReportPDFOutputFormat.java b/core/src/main/java/org/mapfish/print/output/JasperReportPDFOutputFormat.java index 3593a54319..8ab70eb176 100644 --- a/core/src/main/java/org/mapfish/print/output/JasperReportPDFOutputFormat.java +++ b/core/src/main/java/org/mapfish/print/output/JasperReportPDFOutputFormat.java @@ -4,11 +4,11 @@ import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.engine.PrintPageFormat; -import net.sf.jasperreports.engine.export.JRPdfExporter; import net.sf.jasperreports.export.SimpleExporterInput; import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput; -import net.sf.jasperreports.export.SimplePdfExporterConfiguration; -import net.sf.jasperreports.export.type.PdfVersionEnum; +import net.sf.jasperreports.pdf.JRPdfExporter; +import net.sf.jasperreports.pdf.SimplePdfExporterConfiguration; +import net.sf.jasperreports.pdf.type.PdfVersionEnum; import org.mapfish.print.config.PDFConfig; import org.mapfish.print.processor.ExecutionStats; diff --git a/core/src/main/resources/org/mapfish/print/processor/jasper/dynamic-table-default.jrxml b/core/src/main/resources/org/mapfish/print/processor/jasper/dynamic-table-default.jrxml index b911453a74..47848ea42d 100644 --- a/core/src/main/resources/org/mapfish/print/processor/jasper/dynamic-table-default.jrxml +++ b/core/src/main/resources/org/mapfish/print/processor/jasper/dynamic-table-default.jrxml @@ -1,9 +1,7 @@ - - - + - - - - - - @@ -73,66 +68,43 @@ - - - + - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + diff --git a/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java index 92eef62072..db405ae238 100644 --- a/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java +++ b/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java @@ -7,8 +7,8 @@ import java.util.HashMap; import java.util.concurrent.atomic.AtomicBoolean; import net.sf.jasperreports.engine.JRException; -import net.sf.jasperreports.engine.data.JsonDataSource; import net.sf.jasperreports.engine.design.JRDesignField; +import net.sf.jasperreports.json.data.JsonDataSource; import org.junit.Test; import org.mapfish.print.AbstractMapfishSpringTest; import org.mapfish.print.TestHttpClientFactory; diff --git a/core/src/test/resources/org/mapfish/print/cli/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/cli/simpleReport.jrxml index b30bd1d67b..8998ca41bc 100644 --- a/core/src/test/resources/org/mapfish/print/cli/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/cli/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -12,24 +10,16 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> diff --git a/core/src/test/resources/org/mapfish/print/config/font/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/config/font/simpleReport.jrxml index 794a8a98b2..471ff7320b 100644 --- a/core/src/test/resources/org/mapfish/print/config/font/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/config/font/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -13,23 +11,15 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font fontName="Coming Soon" size="36"/> - </textElement> - <text><![CDATA[Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"/> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - <subreport> - <reportElement x="540" y="341" width="240" height="40" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"/> - <subreportExpression><![CDATA[$P{scalebarSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontName="Coming Soon" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="540" y="341" width="240" height="40"> + <expression><![CDATA[$P{scalebarSubReport}]]></expression> + </element> diff --git a/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/multi-images.jrxml b/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/multi-images.jrxml index 0d86f7dfaf..4f6fd87037 100644 --- a/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/multi-images.jrxml +++ b/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/multi-images.jrxml @@ -1,52 +1,32 @@ - - - + - - - - - - - - <band height="500" splitType="Stretch"> - <image> - <reportElement x="0" y="0" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4dd"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - <image> - <reportElement x="90" y="0" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4ee"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - <image> - <reportElement x="180" y="0" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4ff"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - <image> - <reportElement x="270" y="0" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4aa"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - - <!-- line 2 --> - <image> - <reportElement x="0" y="82" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - <image> - <reportElement x="90" y="82" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4ce"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - <image> - <reportElement x="180" y="82" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4c1"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - <image> - <reportElement x="270" y="82" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4c2"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - </band> + <query language="sql"><![CDATA[]]></query> + <background splitType="Stretch"/> + <title height="500" splitType="Stretch"> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4dd" x="0" y="0" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4ee" x="90" y="0" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4ff" x="180" y="0" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4aa" x="270" y="0" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf" x="0" y="82" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4ce" x="90" y="82" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4c1" x="180" y="82" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4c2" x="270" y="82" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> - - diff --git a/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/no-image.jrxml b/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/no-image.jrxml index df88f75bac..0d58e86626 100644 --- a/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/no-image.jrxml +++ b/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/no-image.jrxml @@ -1,16 +1,6 @@ - - - + - - - - - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/one-image.jrxml b/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/one-image.jrxml index 0c31d32d2d..fc6bea88b4 100644 --- a/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/one-image.jrxml +++ b/core/src/test/resources/org/mapfish/print/output/pdf-config-multi-images/one-image.jrxml @@ -1,22 +1,11 @@ - - - + - - - - - - - - <band height="500" splitType="Stretch"> - <image> - <reportElement x="0" y="0" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf"/> - <imageExpression><![CDATA["map.png"]]></imageExpression> - </image> - </band> + <query language="sql"><![CDATA[]]></query> + <background splitType="Stretch"/> + <title height="500" splitType="Stretch"> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf" x="0" y="0" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["map.png"]]></expression> + </element> - - diff --git a/core/src/test/resources/org/mapfish/print/output/pdf-config/simple-map.jrxml b/core/src/test/resources/org/mapfish/print/output/pdf-config/simple-map.jrxml index 83c478ccc8..d4b95dfa02 100644 --- a/core/src/test/resources/org/mapfish/print/output/pdf-config/simple-map.jrxml +++ b/core/src/test/resources/org/mapfish/print/output/pdf-config/simple-map.jrxml @@ -1,47 +1,31 @@ - - - + - - - - - - - - <band height="40" splitType="Stretch"> - <staticText> - <reportElement x="0" y="0" width="580" height="30" uuid="213ea5bb-0b20-4478-ac53-f2935b69f2e9"/> - <textElement> - <font size="20"/> - </textElement> - <text><![CDATA[Report Title]]></text> - </staticText> - <image> - <reportElement x="460" y="0" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <imageExpression><![CDATA["logo.png"]]></imageExpression> - </image> - </band> + <query language="sql"><![CDATA[]]></query> + <background splitType="Stretch"/> + <title height="40" splitType="Stretch"> + <element kind="staticText" uuid="213ea5bb-0b20-4478-ac53-f2935b69f2e9" x="0" y="0" width="580" height="30" fontSize="20.0"> + <text><![CDATA[Report Title]]></text> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf" x="460" y="0" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["logo.png"]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <box> + <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + </box> + </element> - - - - - - - + + + + + diff --git a/core/src/test/resources/org/mapfish/print/output/simple_map/simple-map-wrong-type.jrxml b/core/src/test/resources/org/mapfish/print/output/simple_map/simple-map-wrong-type.jrxml index 155b20ee60..5374205532 100644 --- a/core/src/test/resources/org/mapfish/print/output/simple_map/simple-map-wrong-type.jrxml +++ b/core/src/test/resources/org/mapfish/print/output/simple_map/simple-map-wrong-type.jrxml @@ -1,47 +1,31 @@ - - - + - - - - - - - - <band height="40" splitType="Stretch"> - <staticText> - <reportElement x="0" y="0" width="580" height="30" uuid="213ea5bb-0b20-4478-ac53-f2935b69f2e9"/> - <textElement> - <font size="20"/> - </textElement> - <text><![CDATA[Report Title]]></text> - </staticText> - <image> - <reportElement x="460" y="0" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <imageExpression><![CDATA["logo.png"]]></imageExpression> - </image> - </band> + <query language="sql"><![CDATA[]]></query> + <background splitType="Stretch"/> + <title height="40" splitType="Stretch"> + <element kind="staticText" uuid="213ea5bb-0b20-4478-ac53-f2935b69f2e9" x="0" y="0" width="580" height="30" fontSize="20.0"> + <text><![CDATA[Report Title]]></text> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf" x="460" y="0" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["logo.png"]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <box> + <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + </box> + </element> - - - - - - - + + + + + diff --git a/core/src/test/resources/org/mapfish/print/output/simple_map/simple-map.jrxml b/core/src/test/resources/org/mapfish/print/output/simple_map/simple-map.jrxml index 83c478ccc8..d4b95dfa02 100644 --- a/core/src/test/resources/org/mapfish/print/output/simple_map/simple-map.jrxml +++ b/core/src/test/resources/org/mapfish/print/output/simple_map/simple-map.jrxml @@ -1,47 +1,31 @@ - - - + - - - - - - - - <band height="40" splitType="Stretch"> - <staticText> - <reportElement x="0" y="0" width="580" height="30" uuid="213ea5bb-0b20-4478-ac53-f2935b69f2e9"/> - <textElement> - <font size="20"/> - </textElement> - <text><![CDATA[Report Title]]></text> - </staticText> - <image> - <reportElement x="460" y="0" width="82" height="40" backcolor="#FF7F27" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <imageExpression><![CDATA["logo.png"]]></imageExpression> - </image> - </band> + <query language="sql"><![CDATA[]]></query> + <background splitType="Stretch"/> + <title height="40" splitType="Stretch"> + <element kind="staticText" uuid="213ea5bb-0b20-4478-ac53-f2935b69f2e9" x="0" y="0" width="580" height="30" fontSize="20.0"> + <text><![CDATA[Report Title]]></text> + </element> + <element kind="image" uuid="a1d586d7-ed6a-4b0f-9194-3186eecfb4cf" x="460" y="0" width="82" height="40" backcolor="#FF7F27"> + <expression><![CDATA["logo.png"]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <box> + <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> + </box> + </element> - - - - - - - + + + + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/incorrectly-configured-DataSourceProcessor/table.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/incorrectly-configured-DataSourceProcessor/table.jrxml index c5a1caad31..c5a31b8682 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/incorrectly-configured-DataSourceProcessor/table.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/incorrectly-configured-DataSourceProcessor/table.jrxml @@ -1,16 +1,14 @@ - - - + - - - - - - @@ -72,66 +67,43 @@ - - - + - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/legend/legend.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/legend/legend.jrxml index 5d8a904058..17781c017e 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/legend/legend.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/legend/legend.jrxml @@ -1,6 +1,4 @@ - - - + @@ -10,17 +8,15 @@ - - - - + + + - - - - + + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic-defaults/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic-defaults/simpleReport.jrxml index 41bfd47bce..bc2c416318 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic-defaults/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic-defaults/simpleReport.jrxml @@ -1,15 +1,12 @@ - - - + - - + - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic/simpleReport.jrxml index 41bfd47bce..bc2c416318 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic/simpleReport.jrxml @@ -1,15 +1,12 @@ - - - + - - + - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic/table.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic/table.jrxml index c5a1caad31..c5a31b8682 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic/table.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table-dynamic/table.jrxml @@ -1,16 +1,14 @@ - - - + - - - - - - @@ -72,66 +67,43 @@ - - - + - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table-image-column-resolver/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table-image-column-resolver/simpleReport.jrxml index 0b04b295ad..594081b34a 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table-image-column-resolver/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table-image-column-resolver/simpleReport.jrxml @@ -1,86 +1,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table/simpleReport-wrong-field-type.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table/simpleReport-wrong-field-type.jrxml index 3a9d7f7fd8..bf844107ee 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table/simpleReport-wrong-field-type.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table/simpleReport-wrong-field-type.jrxml @@ -1,86 +1,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table/simpleReport.jrxml index 85d1119b36..84a01396cf 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table/simpleReport.jrxml @@ -1,85 +1,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters/simpleReport.jrxml index 15e06b4ab7..0a0211bece 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters/simpleReport.jrxml @@ -1,94 +1,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters_dyn/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters_dyn/simpleReport.jrxml index 41bfd47bce..bc2c416318 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters_dyn/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters_dyn/simpleReport.jrxml @@ -1,15 +1,12 @@ - - - + - - + - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters_dyn/table.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters_dyn/table.jrxml index c5a1caad31..c5a31b8682 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters_dyn/table.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/table_converters_dyn/table.jrxml @@ -1,16 +1,14 @@ - - - + - - - - - - @@ -72,66 +67,43 @@ - - - + - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/tablelist/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/tablelist/simpleReport.jrxml index 6e86d406f7..d5344c7bf9 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/tablelist/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/tablelist/simpleReport.jrxml @@ -1,17 +1,14 @@ - - - + - - + - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/jasper/tablelist/table.jrxml b/core/src/test/resources/org/mapfish/print/processor/jasper/tablelist/table.jrxml index a2accfaea7..eee0a4918f 100644 --- a/core/src/test/resources/org/mapfish/print/processor/jasper/tablelist/table.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/jasper/tablelist/table.jrxml @@ -1,41 +1,37 @@ - - - - - - - @@ -51,45 +47,31 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - + + diff --git a/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_fail_on_error_test/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_fail_on_error_test/simpleReport.jrxml index 4ead4ce24d..ef017ce28c 100644 --- a/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_fail_on_error_test/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_fail_on_error_test/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -19,106 +17,75 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Full Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Full Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - - - + + + + diff --git a/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_force_fail_on_error_test/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_force_fail_on_error_test/simpleReport.jrxml index 4ead4ce24d..ef017ce28c 100644 --- a/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_force_fail_on_error_test/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_force_fail_on_error_test/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -19,106 +17,75 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Full Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Full Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - - - + + + + diff --git a/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_test/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_test/simpleReport.jrxml index 4ead4ce24d..ef017ce28c 100644 --- a/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_test/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_test/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -19,106 +17,75 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Full Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Full Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - + + + - - - - - - - - - + + + + diff --git a/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_zoom_to_features_test/simpleReport.jrxml b/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_zoom_to_features_test/simpleReport.jrxml index 7c4fbfcf69..879fbb7c08 100644 --- a/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_zoom_to_features_test/simpleReport.jrxml +++ b/core/src/test/resources/org/mapfish/print/processor/map/paging_processor_zoom_to_features_test/simpleReport.jrxml @@ -1,147 +1,104 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Full Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - <subreport> - <reportElement mode="Opaque" x="627" y="17" width="143" height="20" backcolor="#E61D19" uuid="cc9824c4-f11e-4fcd-afc8-10893848cd0c"/> - <subreportExpression><![CDATA[$P{scalebarSubReport}]]></subreportExpression> - </subreport> - <textField> - <reportElement x="30" y="17" width="143" height="20" uuid="91e14cb5-2292-47d9-89a5-307d2d757e63"/> - <textElement verticalAlignment="Middle"> - <font size="10"/> - </textElement> - <textFieldExpression><![CDATA[String.format("Scale 1:%.0f", $P{mapContext}.getRoundedScaleDenominator())]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Full Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> + <element kind="subreport" uuid="cc9824c4-f11e-4fcd-afc8-10893848cd0c" mode="Opaque" x="627" y="17" width="143" height="20" backcolor="#E61D19"> + <expression><![CDATA[$P{scalebarSubReport}]]></expression> + </element> + <element kind="textField" uuid="91e14cb5-2292-47d9-89a5-307d2d757e63" x="30" y="17" width="143" height="20" fontSize="10.0" vTextAlign="Middle"> + <expression><![CDATA[String.format("Scale 1:%.0f", $P{mapContext}.getRoundedScaleDenominator())]]></expression> + </element> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/src/test/resources/org/mapfish/print/servlet/MapOnly_A4.jrxml b/core/src/test/resources/org/mapfish/print/servlet/MapOnly_A4.jrxml index 1ba8e2caca..723f3c123b 100644 --- a/core/src/test/resources/org/mapfish/print/servlet/MapOnly_A4.jrxml +++ b/core/src/test/resources/org/mapfish/print/servlet/MapOnly_A4.jrxml @@ -1,40 +1,28 @@ - - - + - + - + - - - - - - + + - - - - - - - + + + + + - - - - - - - - - - + + + + + + diff --git a/docs/build.gradle b/docs/build.gradle index 0557d03179..2109ba0789 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -16,7 +16,9 @@ repositories { dependencies { implementation project(':core') - implementation ("org.codehaus.groovy:groovy-all:3.0.23", + implementation ( + 'org.apache.groovy:groovy-xml:4.0.26', + 'org.apache.groovy:groovy-json:4.0.26', "org.springframework:spring-test:5.3.39", 'org.ccil.cowan.tagsoup:tagsoup:1.2.1', 'com.samskivert:jmustache:1.16', diff --git a/docs/src/main/groovy/DocsXmlSupport.groovy b/docs/src/main/groovy/DocsXmlSupport.groovy index db256f5951..9ccfe84286 100644 --- a/docs/src/main/groovy/DocsXmlSupport.groovy +++ b/docs/src/main/groovy/DocsXmlSupport.groovy @@ -1,4 +1,4 @@ -import groovy.util.slurpersupport.NoChildren +import groovy.xml.XmlSlurper import org.ccil.cowan.tagsoup.Parser import java.lang.reflect.Field @@ -17,7 +17,7 @@ class DocsXmlSupport { static String appendXmlToBuilder(node, StringBuilder stringBuilder) { stringBuilder.append("<").append(node.name()) - if (node instanceof NoChildren) { + if (node.children().isEmpty()) { stringBuilder.append(">") } else { node.attributes().each { name, value -> diff --git a/docs/src/main/groovy/Javadoc7Parser.groovy b/docs/src/main/groovy/Javadoc7Parser.groovy index 6dc1a6c9c1..206a11c2c5 100644 --- a/docs/src/main/groovy/Javadoc7Parser.groovy +++ b/docs/src/main/groovy/Javadoc7Parser.groovy @@ -1,5 +1,6 @@ import java.lang.reflect.Field import java.lang.reflect.Method +import groovy.xml.XmlSlurper /** * Strategy for parsing out the field, class and method descriptions from Javadoc 7 compatible javadocs. diff --git a/examples/src/test/resources/examples/add_overlay_layer/simpleReport.jrxml b/examples/src/test/resources/examples/add_overlay_layer/simpleReport.jrxml index 29ccff8663..7f3c7e6534 100644 --- a/examples/src/test/resources/examples/add_overlay_layer/simpleReport.jrxml +++ b/examples/src/test/resources/examples/add_overlay_layer/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -13,33 +11,23 @@ - - <band height="554" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - <subreport> - <reportElement x="480" y="390" width="300" height="150" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{overviewMapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="554" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="480" y="390" width="300" height="150"> + <expression><![CDATA[$P{overviewMapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> diff --git a/examples/src/test/resources/examples/config_aliases_defaults/pdf-preview-landscape.jrxml b/examples/src/test/resources/examples/config_aliases_defaults/pdf-preview-landscape.jrxml index 3503c598f5..e54ef91762 100644 --- a/examples/src/test/resources/examples/config_aliases_defaults/pdf-preview-landscape.jrxml +++ b/examples/src/test/resources/examples/config_aliases_defaults/pdf-preview-landscape.jrxml @@ -1,49 +1,29 @@ - - - + - - - - - <band height="790" splitType="Stretch"> + <query language="sql"><![CDATA[]]></query> + <title height="790" splitType="Stretch"> + <element kind="textField" uuid="023b2447-bf55-447c-b0f1-399775e61ec6" x="0" y="0" width="1151" height="79" fontSize="18.0" hTextAlign="Center"> + <expression><![CDATA[$P{mapTitle}]]></expression> <property name="local_mesure_unitheight" value="pixel"/> - <textField> - <reportElement x="0" y="0" width="1151" height="79" uuid="023b2447-bf55-447c-b0f1-399775e61ec6"> - <property name="local_mesure_unitheight" value="pixel"/> - </reportElement> - <textElement textAlignment="Center"> - <font size="18"/> - </textElement> - <textFieldExpression><![CDATA[$P{mapTitle}]]></textFieldExpression> - </textField> - <subreport> - <reportElement x="0" y="79" width="1151" height="711" uuid="9181d342-d448-4c00-b548-6ab402f0480f"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mainMapSubReport}]]></subreportExpression> - </subreport> - </band> + </element> + <element kind="subreport" uuid="9181d342-d448-4c00-b548-6ab402f0480f" x="0" y="79" width="1151" height="711"> + <expression><![CDATA[$P{mainMapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + </element> + <property name="local_mesure_unitheight" value="pixel"/> - - + + + - - - - - - - - - - - + + + diff --git a/examples/src/test/resources/examples/config_aliases_defaults/pdf-preview-portrait.jrxml b/examples/src/test/resources/examples/config_aliases_defaults/pdf-preview-portrait.jrxml index 5cd3f4354d..61a859b98a 100644 --- a/examples/src/test/resources/examples/config_aliases_defaults/pdf-preview-portrait.jrxml +++ b/examples/src/test/resources/examples/config_aliases_defaults/pdf-preview-portrait.jrxml @@ -1,44 +1,27 @@ - - - + - - - - - <band height="790" splitType="Stretch"> + <query language="sql"><![CDATA[]]></query> + <title height="790" splitType="Stretch"> + <element kind="textField" uuid="023b2447-bf55-447c-b0f1-399775e61ec6" x="0" y="0" width="555" height="79"> + <expression><![CDATA[$P{mapTitle}]]></expression> <property name="local_mesure_unitheight" value="pixel"/> - <textField> - <reportElement x="0" y="0" width="555" height="79" uuid="023b2447-bf55-447c-b0f1-399775e61ec6"> - <property name="local_mesure_unitheight" value="pixel"/> - </reportElement> - <textFieldExpression><![CDATA[$P{mapTitle}]]></textFieldExpression> - </textField> - <subreport> - <reportElement x="0" y="79" width="555" height="711" uuid="9181d342-d448-4c00-b548-6ab402f0480f"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mainMapSubReport}]]></subreportExpression> - </subreport> - </band> + </element> + <element kind="subreport" uuid="9181d342-d448-4c00-b548-6ab402f0480f" x="0" y="79" width="555" height="711"> + <expression><![CDATA[$P{mainMapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> + <property name="local_mesure_unitheight" value="pixel"/> - - + + + - - - - - - - - - - - + + + diff --git a/examples/src/test/resources/examples/crosses_point_grid/simpleReport.jrxml b/examples/src/test/resources/examples/crosses_point_grid/simpleReport.jrxml index daed906ead..8998ca41bc 100644 --- a/examples/src/test/resources/examples/crosses_point_grid/simpleReport.jrxml +++ b/examples/src/test/resources/examples/crosses_point_grid/simpleReport.jrxml @@ -1,11 +1,4 @@ - - - + @@ -17,24 +10,16 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> diff --git a/examples/src/test/resources/examples/customDynamicReport/simpleReport.jrxml b/examples/src/test/resources/examples/customDynamicReport/simpleReport.jrxml index aba1dba427..da34fab46b 100644 --- a/examples/src/test/resources/examples/customDynamicReport/simpleReport.jrxml +++ b/examples/src/test/resources/examples/customDynamicReport/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -9,55 +7,31 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="555" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[The Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="555" height="230" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"/> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - <textField> - <reportElement x="0" y="280" width="555" height="23" uuid="245a4b0e-d6e2-4c82-a5ec-072b3cc182e4"/> - <textElement> - <font size="16" isBold="true" isItalic="true"/> - </textElement> - <textFieldExpression><![CDATA[$P{name}]]></textFieldExpression> - </textField> - <textField> - <reportElement x="0" y="300" width="555" height="23" uuid="5b59bca0-4d72-4f52-889c-833479a3edc2"/> - <textElement> - <font size="16" isBold="true" isItalic="true"/> - </textElement> - <textFieldExpression><![CDATA[$P{description}]]></textFieldExpression> - </textField> - <break> - <reportElement x="0" y="360" width="100" height="1" uuid="63e34d7f-6ef9-4306-9b19-45d6f38fc760"/> - </break> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="555" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[The Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="555" height="230"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + </element> + <element kind="textField" uuid="245a4b0e-d6e2-4c82-a5ec-072b3cc182e4" x="0" y="280" width="555" height="23" fontSize="16.0" bold="true" italic="true"> + <expression><![CDATA[$P{name}]]></expression> + </element> + <element kind="textField" uuid="5b59bca0-4d72-4f52-889c-833479a3edc2" x="0" y="300" width="555" height="23" fontSize="16.0" bold="true" italic="true"> + <expression><![CDATA[$P{description}]]></expression> + </element> + <element kind="break" uuid="63e34d7f-6ef9-4306-9b19-45d6f38fc760" x="0" y="360" width="100" height="1"/> - - - - - - - - - + + + + - - - - - + + + diff --git a/examples/src/test/resources/examples/customDynamicReport/table.jrxml b/examples/src/test/resources/examples/customDynamicReport/table.jrxml index a2accfaea7..eee0a4918f 100644 --- a/examples/src/test/resources/examples/customDynamicReport/table.jrxml +++ b/examples/src/test/resources/examples/customDynamicReport/table.jrxml @@ -1,41 +1,37 @@ - - - - - - - @@ -51,45 +47,31 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - + + diff --git a/examples/src/test/resources/examples/data_uri_json/simpleReport.jrxml b/examples/src/test/resources/examples/data_uri_json/simpleReport.jrxml index 1c6158e6c4..300cba5275 100644 --- a/examples/src/test/resources/examples/data_uri_json/simpleReport.jrxml +++ b/examples/src/test/resources/examples/data_uri_json/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -12,24 +10,16 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="470" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="470" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> diff --git a/examples/src/test/resources/examples/datasource_dynamic_tables/A4_Portrait.jrxml b/examples/src/test/resources/examples/datasource_dynamic_tables/A4_Portrait.jrxml index 7039499e21..d06c093fe8 100644 --- a/examples/src/test/resources/examples/datasource_dynamic_tables/A4_Portrait.jrxml +++ b/examples/src/test/resources/examples/datasource_dynamic_tables/A4_Portrait.jrxml @@ -1,45 +1,31 @@ - - - + - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + + + diff --git a/examples/src/test/resources/examples/datasource_dynamic_tables/A4_landscape.jrxml b/examples/src/test/resources/examples/datasource_dynamic_tables/A4_landscape.jrxml index 8ce73757f8..ef8d482f6a 100644 --- a/examples/src/test/resources/examples/datasource_dynamic_tables/A4_landscape.jrxml +++ b/examples/src/test/resources/examples/datasource_dynamic_tables/A4_landscape.jrxml @@ -1,6 +1,4 @@ - - - + @@ -13,42 +11,30 @@ - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + + + diff --git a/examples/src/test/resources/examples/datasource_dynamic_tables/results_landscape.jrxml b/examples/src/test/resources/examples/datasource_dynamic_tables/results_landscape.jrxml index c953e94990..538532de7c 100644 --- a/examples/src/test/resources/examples/datasource_dynamic_tables/results_landscape.jrxml +++ b/examples/src/test/resources/examples/datasource_dynamic_tables/results_landscape.jrxml @@ -1,24 +1,17 @@ - - - + - - + - - - - - - - - - + + + + + diff --git a/examples/src/test/resources/examples/datasource_dynamic_tables/results_portrait.jrxml b/examples/src/test/resources/examples/datasource_dynamic_tables/results_portrait.jrxml index ef95a67591..9ffef489e4 100644 --- a/examples/src/test/resources/examples/datasource_dynamic_tables/results_portrait.jrxml +++ b/examples/src/test/resources/examples/datasource_dynamic_tables/results_portrait.jrxml @@ -1,6 +1,4 @@ - - - + @@ -15,18 +13,13 @@ - - + - - - - - - - - - + + + + + diff --git a/examples/src/test/resources/examples/datasource_many_dynamictables_legend/A4_Portrait.jrxml b/examples/src/test/resources/examples/datasource_many_dynamictables_legend/A4_Portrait.jrxml index 9593662639..ad3f54ad2a 100644 --- a/examples/src/test/resources/examples/datasource_many_dynamictables_legend/A4_Portrait.jrxml +++ b/examples/src/test/resources/examples/datasource_many_dynamictables_legend/A4_Portrait.jrxml @@ -1,7 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - + + diff --git a/examples/src/test/resources/examples/multiple_maps/report.jrxml b/examples/src/test/resources/examples/multiple_maps/report.jrxml index 0566d0d304..c9a26d3393 100644 --- a/examples/src/test/resources/examples/multiple_maps/report.jrxml +++ b/examples/src/test/resources/examples/multiple_maps/report.jrxml @@ -1,7 +1,4 @@ - - - - + @@ -16,50 +13,35 @@ - - <band height="50" splitType="Stretch"> - <property name="com.jaspersoft.studio.unit.height" value="pixel"/> - <textField> - <reportElement x="0" y="0" width="800" height="50" forecolor="#187ECC" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"> - <property name="com.jaspersoft.studio.unit.y" value="pixel"/> - </reportElement> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> - </textField> - </band> + <title height="50" splitType="Stretch"> + <element kind="textField" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="0" width="800" height="50" forecolor="#187ECC" fontSize="36.0" hTextAlign="Center"> + <expression><![CDATA[$P{title}]]></expression> + <property name="com.jaspersoft.studio.unit.y" value="pixel"/> + </element> + <property name="com.jaspersoft.studio.unit.height" value="pixel"/> + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/src/test/resources/examples/native_mix/report.jrxml b/examples/src/test/resources/examples/native_mix/report.jrxml index ffc106cf0e..f636da374e 100644 --- a/examples/src/test/resources/examples/native_mix/report.jrxml +++ b/examples/src/test/resources/examples/native_mix/report.jrxml @@ -1,7 +1,4 @@ - - - - + @@ -15,24 +12,16 @@ - - <band height="390" splitType="Stretch"> - <textField> - <reportElement x="0" y="1" width="800" height="50" forecolor="#187ECC" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> - </textField> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="textField" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" forecolor="#187ECC" fontSize="36.0" hTextAlign="Center"> + <expression><![CDATA[$P{title}]]></expression> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> diff --git a/examples/src/test/resources/examples/oereb/exclusion_of_liability.jrxml b/examples/src/test/resources/examples/oereb/exclusion_of_liability.jrxml index 3e2a5b705f..e2117bf4d0 100644 --- a/examples/src/test/resources/examples/oereb/exclusion_of_liability.jrxml +++ b/examples/src/test/resources/examples/oereb/exclusion_of_liability.jrxml @@ -1,46 +1,34 @@ - - - - - @@ -80,303 +78,210 @@ - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - + + + - - - - - - - - - - - - + + - - - - + + + + + + - - - - - - + + + + + + + + - - - - - - + + + - - - - - - - + - - + + + + + + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/examples/src/test/resources/examples/oereb/tocFull.jrxml b/examples/src/test/resources/examples/oereb/tocFull.jrxml index 650a7dc2fe..cfd2d4ae6c 100644 --- a/examples/src/test/resources/examples/oereb/tocFull.jrxml +++ b/examples/src/test/resources/examples/oereb/tocFull.jrxml @@ -1,6 +1,4 @@ - - - + @@ -12,67 +10,52 @@ - - - - - @@ -51,45 +47,31 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - + + diff --git a/examples/src/test/resources/examples_to_port/print_tms_tyger_ny_EPSG_3857/simpleReport.jrxml b/examples/src/test/resources/examples_to_port/print_tms_tyger_ny_EPSG_3857/simpleReport.jrxml index b30bd1d67b..8998ca41bc 100644 --- a/examples/src/test/resources/examples_to_port/print_tms_tyger_ny_EPSG_3857/simpleReport.jrxml +++ b/examples/src/test/resources/examples_to_port/print_tms_tyger_ny_EPSG_3857/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -12,24 +10,16 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element> diff --git a/examples/src/test/resources/examples_to_port/print_vector_new_york_EPSG_3857/simpleReport.jrxml b/examples/src/test/resources/examples_to_port/print_vector_new_york_EPSG_3857/simpleReport.jrxml index b30bd1d67b..8998ca41bc 100644 --- a/examples/src/test/resources/examples_to_port/print_vector_new_york_EPSG_3857/simpleReport.jrxml +++ b/examples/src/test/resources/examples_to_port/print_vector_new_york_EPSG_3857/simpleReport.jrxml @@ -1,6 +1,4 @@ - - - + @@ -12,24 +10,16 @@ - - <band height="390" splitType="Stretch"> - <staticText> - <reportElement x="0" y="1" width="800" height="50" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc"/> - <textElement textAlignment="Center"> - <font size="36"/> - </textElement> - <text><![CDATA[Map]]></text> - </staticText> - <subreport> - <reportElement x="0" y="51" width="780" height="330" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression> - </subreport> - </band> + <title height="390" splitType="Stretch"> + <element kind="staticText" uuid="3988392b-f1e2-4eda-9cb4-7caa2b3eb0cc" x="0" y="1" width="800" height="50" fontSize="36.0" hTextAlign="Center"> + <text><![CDATA[Map]]></text> + </element> + <element kind="subreport" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d" x="0" y="51" width="780" height="330"> + <expression><![CDATA[$P{mapSubReport}]]></expression> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </element>