From 3b92644c6e9450e0dd6a7dc864ccbe83fcacbb01 Mon Sep 17 00:00:00 2001
From: Maxim Solodovnik <solomax@apache.org>
Date: Sun, 22 Mar 2026 18:29:34 +0700
Subject: [PATCH 1/5] Jasperreports are updated to 7.x

Signed-off-by: Maxim Solodovnik <solomax@apache.org>
---
 .../jasperreports-examples/pom.xml            |  20 +-
 .../examples/JasperReportsApplication.java    |  52 +++-
 .../examples/ReportLinksPage.java             |  44 ++-
 .../jasperreports/examples/SimplePdfPage.html |  11 +-
 .../jasperreports/examples/SimplePdfPage.java |  27 +-
 .../examples/WebappDataSource.java            | 105 +++----
 .../jasperreports/WebappReport.jasper         | Bin 0 -> 24306 bytes
 .../jasperreports/WebappReport.jrxml          |  88 ++++++
 .../jasperreports/WebappReport_v6.jrxml}      |   0
 .../jasperreports}/jasperreports.gif          | Bin
 .../main/webapp/reports/WebappReport.jasper   | Bin 24550 -> 0 bytes
 jasperreports-parent/jasperreports/pom.xml    |   8 +
 .../jasperreports/EmbeddedJRReport.java       |   9 +-
 .../jasperreports/JRImageResource.java        |  39 +--
 .../wicketstuff/jasperreports/JRResource.java | 271 ++++++++----------
 .../handlers/PdfResourceHandler.java          |   8 +-
 .../handlers/TextResourceHandler.java         |  22 +-
 .../handlers/XlsResourceHandler.java          |   8 +-
 pom.xml                                       |  12 +-
 19 files changed, 406 insertions(+), 318 deletions(-)
 create mode 100644 jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport.jasper
 create mode 100644 jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport.jrxml
 rename jasperreports-parent/jasperreports-examples/src/main/{jasperreports/WebappReport.jrxml => resources/jasperreports/WebappReport_v6.jrxml} (100%)
 rename jasperreports-parent/jasperreports-examples/src/main/{webapp/images => resources/jasperreports}/jasperreports.gif (100%)
 delete mode 100644 jasperreports-parent/jasperreports-examples/src/main/webapp/reports/WebappReport.jasper

diff --git a/jasperreports-parent/jasperreports-examples/pom.xml b/jasperreports-parent/jasperreports-examples/pom.xml
index ebeb35421c..0578683bf4 100644
--- a/jasperreports-parent/jasperreports-examples/pom.xml
+++ b/jasperreports-parent/jasperreports-examples/pom.xml
@@ -17,7 +17,7 @@
 	<description>JasperReports integration components and resources for Wicket.</description>
 
 	<properties>
-		<jasperreports.outputDirectory>${project.build.sourceDirectory}/../webapp/reports</jasperreports.outputDirectory>
+		<jasperreportsDirectory>${project.build.directory}/reports</jasperreportsDirectory>
 		<javadoc.disabled>true</javadoc.disabled>
 		<deployment.disabled>true</deployment.disabled>
 		<sources.disabled>true</sources.disabled>
@@ -62,6 +62,22 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-reload4j</artifactId>
 		</dependency>
-
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<configuration>
+					<systemProperties>
+						<jasperreportsDirectory>${jasperreportsDirectory}</jasperreportsDirectory>
+					</systemProperties>
+					<resourceBases>
+						<resourceBase>src/main/webapp</resourceBase>
+						<resourceBase>${jasperreportsDirectory}</resourceBase>
+					</resourceBases>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/JasperReportsApplication.java b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/JasperReportsApplication.java
index ad89bb6000..21acf4f754 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/JasperReportsApplication.java
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/JasperReportsApplication.java
@@ -1,14 +1,14 @@
 /*
  * $Id$
  * $Revision$ $Date$
- * 
+ *
  * ==================================================================== Licensed
  * under the Apache License, Version 2.0 (the "License"); you may not use this
  * file except in compliance with the License. You may obtain a copy of the
  * License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,40 +17,68 @@
  */
 package org.wicketstuff.jasperreports.examples;
 
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.time.Duration;
 
 import org.apache.wicket.Page;
 import org.apache.wicket.protocol.http.WebApplication;
 
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.design.JasperDesign;
+import net.sf.jasperreports.engine.export.JRXmlExporter;
+import net.sf.jasperreports.engine.util.JRLoader;
+import net.sf.jasperreports.engine.xml.JRXmlLoader;
+
 /**
  * Wicket application class for jasper reports example.
- * 
+ *
  * @author Eelco Hillenius
  */
-public class JasperReportsApplication extends WebApplication
-{
+public class JasperReportsApplication extends WebApplication {
 	/**
 	 * Constructor.
 	 */
-	public JasperReportsApplication()
-	{
+	public JasperReportsApplication() {
 	}
 
 	/**
 	 * @see org.apache.wicket.protocol.http.WebApplication#init()
 	 */
 	@Override
-	protected void init()
-	{
+	protected void init() {
+		getCspSettings().blocking().disabled();
 		getResourceSettings().setResourcePollFrequency(Duration.ofSeconds(1));
+
+		final File base = new File(System.getProperty("jasperreportsDirectory"));
+		final File reportFile = new File(base, "WebappReport.jasper");
+		try {
+			if (!base.exists()) {
+				base.mkdirs();
+			}
+			try (InputStream rep = getClass().getResourceAsStream("/jasperreports/WebappReport.jasper")) {
+				Files.copy(rep, reportFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+			}
+			final File images = new File(base, "../images");
+			if (!images.exists()) {
+				images.mkdirs();
+			}
+			try (InputStream rep = getClass().getResourceAsStream("/jasperreports/jasperreports.gif")) {
+				Files.copy(rep, new File(images, "jasperreports.gif").toPath(), StandardCopyOption.REPLACE_EXISTING);
+			}
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	/**
 	 * @see org.apache.wicket.Application#getHomePage()
 	 */
 	@Override
-	public Class<? extends Page> getHomePage()
-	{
+	public Class<? extends Page> getHomePage() {
 		return Index.class;
 	}
 }
diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.java b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.java
index 31c56381b1..3ae10f4c56 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.java
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.java
@@ -12,15 +12,11 @@
  */
 package org.wicketstuff.jasperreports.examples;
 
-import jakarta.servlet.ServletContext;
-
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.link.ResourceLink;
-import org.apache.wicket.protocol.http.WebApplication;
 import org.wicketstuff.jasperreports.JRConcreteResource;
 import org.wicketstuff.jasperreports.JRImageResource;
 import org.wicketstuff.jasperreports.JRResource;
@@ -32,51 +28,48 @@
 
 /**
  * Simple Jasper reports example with PDF output and a jasper reports panel..
- * 
+ *
  * @author Eelco Hillenius
  */
-public class ReportLinksPage extends WebPage
-{
+public class ReportLinksPage extends WebPage {
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * Constructor.
 	 */
-	public ReportLinksPage()
-	{
-		ServletContext context = ((WebApplication)getApplication()).getServletContext();
-		final File reportFile = new File(context.getRealPath("/reports/WebappReport.jasper"));
+	public ReportLinksPage() {
+		final File base = new File(System.getProperty("jasperreportsDirectory"));
+		final File reportFile = new File(base, "WebappReport.jasper");
 
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("BaseDir", new File(context.getRealPath("/reports")));
+		final Map<String, Object> parameters = Map.of("BaseDir", base);
 
 		JRResource pdfResource = new JRConcreteResource<PdfResourceHandler>(reportFile,
-			new PdfResourceHandler()).setReportParameters(parameters).setReportDataSource(
-			new WebappDataSource());
+				new PdfResourceHandler()).setReportParameters(parameters).setReportDataSource(
+						new WebappDataSource());
 		add(new ResourceLink<Void>("linkToPdf", pdfResource));
 
 		JRResource rtfResource = new JRConcreteResource<RtfResourceHandler>(reportFile,
-			new RtfResourceHandler()).setReportParameters(parameters).setReportDataSource(
-			new WebappDataSource());
+				new RtfResourceHandler()).setReportParameters(parameters).setReportDataSource(
+						new WebappDataSource());
 		add(new ResourceLink<Void>("linkToRtf", rtfResource));
 
 		JRResource htmlResource = new JRConcreteResource<HtmlResourceHandler>(reportFile,
-			new HtmlResourceHandler()).setReportParameters(parameters).setReportDataSource(
-			new WebappDataSource());
+				new HtmlResourceHandler()).setReportParameters(parameters).setReportDataSource(
+						new WebappDataSource());
 		add(new ResourceLink<Void>("linkToHtml", htmlResource));
 
 		JRResource textResource = new JRConcreteResource<TextResourceHandler>(reportFile,
-			new TextResourceHandler()).setReportParameters(parameters).setReportDataSource(
-			new WebappDataSource());
+				new TextResourceHandler()).setReportParameters(parameters).setReportDataSource(
+						new WebappDataSource());
 		add(new ResourceLink<Void>("linkToText", textResource));
 
 		JRResource imageResource = new JRImageResource(reportFile).setReportParameters(parameters)
-			.setReportDataSource(new WebappDataSource());
+				.setReportDataSource(new WebappDataSource());
 		add(new ResourceLink<Void>("linkToImage", imageResource));
 
 		JRResource csvResource = new JRConcreteResource<CsvResourceHandler>(reportFile,
-			new CsvResourceHandler()).setReportParameters(parameters).setReportDataSource(
-			new WebappDataSource());
+				new CsvResourceHandler()).setReportParameters(parameters).setReportDataSource(
+						new WebappDataSource());
 		add(new ResourceLink<Void>("linkToCsv", csvResource));
 	}
 
@@ -84,8 +77,7 @@ public ReportLinksPage()
 	 * @see org.apache.wicket.Component#isVersioned()
 	 */
 	@Override
-	public boolean isVersioned()
-	{
+	public boolean isVersioned() {
 		return false;
 	}
 }
\ No newline at end of file
diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.html b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.html
index dca6c4989b..bf0ef335b5 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.html
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.html
@@ -3,14 +3,19 @@
 	xml:lang="en" lang="en">
 	<head>
 		<title>WicketStuff JasperReports Integration - Embedded PDF</title>
+		<style>
+			object {
+				width: 80vw;
+				height: 60vh;
+				display: block;
+			}
+		</style>
 	</head>
 	<body>
 		<div>
 			Before
 			<br />
-
-                        <object wicket:id="report" height="60%" width="80%"></object>
-
+			<object wicket:id="report" />
 			<br />
 			After
 		</div>
diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.java b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.java
index 9478dbe715..5d332dd519 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.java
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.java
@@ -12,14 +12,10 @@
  */
 package org.wicketstuff.jasperreports.examples;
 
-import jakarta.servlet.ServletContext;
-
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.WebApplication;
 import org.wicketstuff.jasperreports.EmbeddedJRReport;
 import org.wicketstuff.jasperreports.JRConcreteResource;
 import org.wicketstuff.jasperreports.JRResource;
@@ -27,26 +23,22 @@
 
 /**
  * Simple Jasper reports example with PDF output and a jasper reports panel..
- * 
+ *
  * @author Eelco Hillenius
  */
-public class SimplePdfPage extends WebPage
-{
+public class SimplePdfPage extends WebPage {
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * Constructor.
 	 */
-	public SimplePdfPage()
-	{
-		ServletContext context = ((WebApplication)getApplication()).getServletContext();
-		final File reportFile = new File(context.getRealPath("/reports/WebappReport.jasper"));
+	public SimplePdfPage() {
+		final File base = new File(System.getProperty("jasperreportsDirectory"));
+		final File reportFile = new File(base, "WebappReport.jasper");
 
-		final Map<String, Object> parameters = new HashMap<String, Object>();
-		parameters.put("BaseDir", new File(context.getRealPath("/reports")));
-		JRResource pdfResource = new JRConcreteResource<PdfResourceHandler>(reportFile,
-			new PdfResourceHandler()).setReportParameters(parameters).setReportDataSource(
-			new WebappDataSource());
+		JRResource pdfResource = new JRConcreteResource<PdfResourceHandler>(reportFile, new PdfResourceHandler())
+				.setReportParameters(Map.of("BaseDir", base))
+				.setReportDataSource(new WebappDataSource());
 		add(new EmbeddedJRReport("report", pdfResource));
 	}
 
@@ -54,8 +46,7 @@ public SimplePdfPage()
 	 * @see org.apache.wicket.Component#isVersioned()
 	 */
 	@Override
-	public boolean isVersioned()
-	{
+	public boolean isVersioned() {
 		return false;
 	}
 }
\ No newline at end of file
diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/WebappDataSource.java b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/WebappDataSource.java
index 9a3f4119c9..56522dff54 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/WebappDataSource.java
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/WebappDataSource.java
@@ -5,21 +5,21 @@
  *
  * JasperReports - Free Java report-generating library.
  * Copyright (C) 2001-2009 JasperSoft Corporation http://www.jaspersoft.com
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
- * 
+ *
  * JasperSoft Corporation
  * 539 Bryant Street, Suite 100
  * San Francisco, CA 94107
@@ -33,101 +33,84 @@
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRField;
 
-
 /**
  * @author Teodor Danciu (teodord@users.sourceforge.net)
  * @version $Id: WebappDataSource.java 2692 2009-03-24 17:17:32Z teodord $
  */
-public class WebappDataSource implements Serializable, JRDataSource
-{
-
-
+public class WebappDataSource implements Serializable, JRDataSource {
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 *
 	 */
-	private Object[][] data = { { "Berne", new Integer(22), "Bill Ott", "250 - 20th Ave." },
-			{ "Berne", new Integer(9), "James Schneider", "277 Seventh Av." },
-			{ "Boston", new Integer(32), "Michael Ott", "339 College Av." },
-			{ "Boston", new Integer(23), "Julia Heiniger", "358 College Av." },
-			{ "Chicago", new Integer(39), "Mary Karsen", "202 College Av." },
-			{ "Chicago", new Integer(35), "George Karsen", "412 College Av." },
-			{ "Chicago", new Integer(11), "Julia White", "412 Upland Pl." },
-			{ "Dallas", new Integer(47), "Janet Fuller", "445 Upland Pl." },
-			{ "Dallas", new Integer(43), "Susanne Smith", "2 Upland Pl." },
-			{ "Dallas", new Integer(40), "Susanne Miller", "440 - 20th Ave." },
-			{ "Dallas", new Integer(36), "John Steel", "276 Upland Pl." },
-			{ "Dallas", new Integer(37), "Michael Clancy", "19 Seventh Av." },
-			{ "Dallas", new Integer(19), "Susanne Heiniger", "86 - 20th Ave." },
-			{ "Dallas", new Integer(10), "Anne Fuller", "135 Upland Pl." },
-			{ "Dallas", new Integer(4), "Sylvia Ringer", "365 College Av." },
-			{ "Dallas", new Integer(0), "Laura Steel", "429 Seventh Av." },
-			{ "Lyon", new Integer(38), "Andrew Heiniger", "347 College Av." },
-			{ "Lyon", new Integer(28), "Susanne White", "74 - 20th Ave." },
-			{ "Lyon", new Integer(17), "Laura Ott", "443 Seventh Av." },
-			{ "Lyon", new Integer(2), "Anne Miller", "20 Upland Pl." },
-			{ "New York", new Integer(46), "Andrew May", "172 Seventh Av." },
-			{ "New York", new Integer(44), "Sylvia Ott", "361 College Av." },
-			{ "New York", new Integer(41), "Bill King", "546 College Av." },
-			{ "Oslo", new Integer(45), "Janet May", "396 Seventh Av." },
-			{ "Oslo", new Integer(42), "Robert Ott", "503 Seventh Av." },
-			{ "Paris", new Integer(25), "Sylvia Steel", "269 College Av." },
-			{ "Paris", new Integer(18), "Sylvia Fuller", "158 - 20th Ave." },
-			{ "Paris", new Integer(5), "Laura Miller", "294 Seventh Av." },
-			{ "San Francisco", new Integer(48), "Robert White", "549 Seventh Av." },
-			{ "San Francisco", new Integer(7), "James Peterson", "231 Upland Pl." } };
+	private Object[][] data = { { "Berne", Integer.valueOf(22), "Bill Ott", "250 - 20th Ave." },
+			{ "Berne", Integer.valueOf(9), "James Schneider", "277 Seventh Av." },
+			{ "Boston", Integer.valueOf(32), "Michael Ott", "339 College Av." },
+			{ "Boston", Integer.valueOf(23), "Julia Heiniger", "358 College Av." },
+			{ "Chicago", Integer.valueOf(39), "Mary Karsen", "202 College Av." },
+			{ "Chicago", Integer.valueOf(35), "George Karsen", "412 College Av." },
+			{ "Chicago", Integer.valueOf(11), "Julia White", "412 Upland Pl." },
+			{ "Dallas", Integer.valueOf(47), "Janet Fuller", "445 Upland Pl." },
+			{ "Dallas", Integer.valueOf(43), "Susanne Smith", "2 Upland Pl." },
+			{ "Dallas", Integer.valueOf(40), "Susanne Miller", "440 - 20th Ave." },
+			{ "Dallas", Integer.valueOf(36), "John Steel", "276 Upland Pl." },
+			{ "Dallas", Integer.valueOf(37), "Michael Clancy", "19 Seventh Av." },
+			{ "Dallas", Integer.valueOf(19), "Susanne Heiniger", "86 - 20th Ave." },
+			{ "Dallas", Integer.valueOf(10), "Anne Fuller", "135 Upland Pl." },
+			{ "Dallas", Integer.valueOf(4), "Sylvia Ringer", "365 College Av." },
+			{ "Dallas", Integer.valueOf(0), "Laura Steel", "429 Seventh Av." },
+			{ "Lyon", Integer.valueOf(38), "Andrew Heiniger", "347 College Av." },
+			{ "Lyon", Integer.valueOf(28), "Susanne White", "74 - 20th Ave." },
+			{ "Lyon", Integer.valueOf(17), "Laura Ott", "443 Seventh Av." },
+			{ "Lyon", Integer.valueOf(2), "Anne Miller", "20 Upland Pl." },
+			{ "New York", Integer.valueOf(46), "Andrew May", "172 Seventh Av." },
+			{ "New York", Integer.valueOf(44), "Sylvia Ott", "361 College Av." },
+			{ "New York", Integer.valueOf(41), "Bill King", "546 College Av." },
+			{ "Oslo", Integer.valueOf(45), "Janet May", "396 Seventh Av." },
+			{ "Oslo", Integer.valueOf(42), "Robert Ott", "503 Seventh Av." },
+			{ "Paris", Integer.valueOf(25), "Sylvia Steel", "269 College Av." },
+			{ "Paris", Integer.valueOf(18), "Sylvia Fuller", "158 - 20th Ave." },
+			{ "Paris", Integer.valueOf(5), "Laura Miller", "294 Seventh Av." },
+			{ "San Francisco", Integer.valueOf(48), "Robert White", "549 Seventh Av." },
+			{ "San Francisco", Integer.valueOf(7), "James Peterson", "231 Upland Pl." } };
 
 	private int index = -1;
 
-
 	/**
 	 *
 	 */
-	public WebappDataSource()
-	{
+	public WebappDataSource() {
 	}
 
-
 	/**
 	 *
 	 */
-	public boolean next() throws JRException
-	{
+	@Override
+	public boolean next() throws JRException {
 		index++;
 
 		return (index < data.length);
 	}
 
-
 	/**
 	 *
 	 */
-	public Object getFieldValue(JRField field) throws JRException
-	{
+	@Override
+	public Object getFieldValue(JRField field) throws JRException {
 		Object value = null;
 
 		String fieldName = field.getName();
 
-		if ("City".equals(fieldName))
-		{
+		if ("City".equals(fieldName)) {
 			value = data[index][0];
-		}
-		else if ("Id".equals(fieldName))
-		{
+		} else if ("Id".equals(fieldName)) {
 			value = data[index][1];
-		}
-		else if ("Name".equals(fieldName))
-		{
+		} else if ("Name".equals(fieldName)) {
 			value = data[index][2];
-		}
-		else if ("Street".equals(fieldName))
-		{
+		} else if ("Street".equals(fieldName)) {
 			value = data[index][3];
 		}
 
 		return value;
 	}
-
-
 }
diff --git a/jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport.jasper b/jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..1768ab2b7be6a53195e3e767faac2c6274bfeef6
GIT binary patch
literal 24306
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%0D9Hx?P^!B{C<U4s$)jLqH}
z86S?$A(_qDm2y5t;hw;6lu#%57I7T`BZFm<Ep+D7DWOw*IqAY=cgg!H8@eHW;w>aE
z9G7ui^!E*E<e#^@7@C5u&B4}|U~6lzwH-pJe2UCVdnJU9FoW{&kg)AOd607+4qT9`
z-*;WAmI8C-w+VQdoyfXA<c1tA5`nO`E5FOfL++-R^<fW9x}?hvY3MbO6j?5?Q@#oC
hH7>Br1O631lYt^^MT^q!t#^wkhY`O|52_M@^}p;Y!)yQm

literal 0
HcmV?d00001

diff --git a/jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport.jrxml b/jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport.jrxml
new file mode 100644
index 0000000000..28a3dc8a09
--- /dev/null
+++ b/jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport.jrxml
@@ -0,0 +1,88 @@
+<!-- Created with Jaspersoft Studio version 7.0.3.final using JasperReports Library version 7.0.3-41034ca841d452f3305ba55b9042260aaa1ab5dd  -->
+<jasperReport name="WebappReport" language="java" pageWidth="595" pageHeight="842" columnWidth="515" leftMargin="40" rightMargin="40" topMargin="50" bottomMargin="50" uuid="d8a021ba-3a58-4a08-a7c0-c8d5ed79763f">
+	<style name="Sans_Normal" default="true" fontName="DejaVu Sans" fontSize="12.0" bold="false" italic="false" underline="false" strikeThrough="false"/>
+	<style name="Sans_Bold" fontName="DejaVu Sans" fontSize="12.0" bold="true" italic="false" underline="false" strikeThrough="false"/>
+	<style name="Sans_Italic" fontName="DejaVu Sans" fontSize="12.0" bold="false" italic="true" underline="false" strikeThrough="false"/>
+	<style name="pageHeader" style="Sans_Bold" forecolor="#FFFFFF" backcolor="#333333"/>
+	<parameter name="ReportTitle" class="java.lang.String"/>
+	<parameter name="BaseDir" class="java.io.File"/>
+	<field name="Id" class="java.lang.Integer"/>
+	<field name="Name" class="java.lang.String"/>
+	<field name="Street" class="java.lang.String"/>
+	<field name="City" class="java.lang.String"/>
+	<variable name="CityNumber" resetType="Group" calculation="System" resetGroup="CityGroup" class="java.lang.Integer">
+		<initialValueExpression><![CDATA[($V{CityNumber} != null)?(new Integer($V{CityNumber}.intValue() + 1)):(new Integer(1))]]></initialValueExpression>
+	</variable>
+	<group name="CityGroup" minHeightToStartNewPage="60">
+		<expression><![CDATA[$F{City}]]></expression>
+		<groupHeader>
+			<band height="20">
+				<element kind="textField" uuid="8d4cbbd5-36a5-4333-8cbf-101f6edcc782" mode="Opaque" x="0" y="4" width="515" height="15" backcolor="#C0C0C0" style="Sans_Bold">
+					<expression><![CDATA["  " + String.valueOf($V{CityNumber}) + ". " + String.valueOf($F{City})]]></expression>
+					<box style="Sans_Bold">
+						<bottomPen lineWidth="1.0"/>
+					</box>
+				</element>
+			</band>
+		</groupHeader>
+		<groupFooter>
+			<band height="20">
+				<element kind="line" uuid="cae7f1ce-4008-4bc3-b92c-1b88a058fa52" x="0" y="-1" width="515" height="1"/>
+				<element kind="staticText" uuid="4789acab-2ad0-4be2-835e-4f002d348a8d" x="400" y="0" width="60" height="15" hTextAlign="Right" style="Sans_Bold">
+					<text><![CDATA[Count :]]></text>
+				</element>
+				<element kind="textField" uuid="93b39a31-defe-4df4-b4d9-b677d774788f" x="460" y="0" width="30" height="15" hTextAlign="Right" style="Sans_Bold">
+					<expression><![CDATA[$V{CityGroup_COUNT}]]></expression>
+				</element>
+			</band>
+		</groupFooter>
+	</group>
+	<title height="50">
+		<element kind="frame" uuid="b0d87596-ca00-4d1d-9bd9-bcdf49952105" x="0" y="0" width="515" height="40" backcolor="#E0E0E0">
+			<element kind="image" uuid="81007dee-ba99-4c93-9017-7a85b6c02bd7" x="5" y="5" width="165" height="30" scaleImage="Clip" linkType="Reference">
+				<expression><![CDATA[new File($P{BaseDir}, "../images/jasperreports.gif")]]></expression>
+				<hyperlinkReferenceExpression><![CDATA["http://jasperreports.sourceforge.net"]]></hyperlinkReferenceExpression>
+			</element>
+			<element kind="textField" uuid="56328e27-1b98-43f0-b436-da99aa27cc61" x="175" y="5" width="335" height="30" fontSize="22.0" blankWhenNull="true" hTextAlign="Right">
+				<expression><![CDATA[$P{ReportTitle}]]></expression>
+			</element>
+			<box>
+				<topPen lineWidth="1.0"/>
+			</box>
+		</element>
+	</title>
+	<pageHeader height="20">
+		<element kind="staticText" uuid="f7a1396c-33d2-40fe-a5bc-a1f4b193fd08" mode="Opaque" x="0" y="5" width="55" height="15" hTextAlign="Center" style="pageHeader">
+			<text><![CDATA[ID]]></text>
+		</element>
+		<element kind="staticText" uuid="138ccb79-acbf-4d8c-b59c-97ec134d202b" mode="Opaque" x="55" y="5" width="205" height="15" style="pageHeader">
+			<text><![CDATA[Name]]></text>
+		</element>
+		<element kind="staticText" uuid="322a80da-1dd2-4f3b-aa3a-3562b3ef5069" mode="Opaque" x="260" y="5" width="255" height="15" style="pageHeader">
+			<text><![CDATA[Street]]></text>
+		</element>
+	</pageHeader>
+	<detail>
+		<band height="20">
+			<element kind="textField" uuid="5fca9745-2296-4596-ba0b-263977b97b10" x="0" y="4" width="50" height="15" hTextAlign="Right">
+				<expression><![CDATA[$F{Id}]]></expression>
+			</element>
+			<element kind="textField" uuid="4b2bfcc7-50e9-4498-808f-95e1ae3ef0ed" positionType="Float" x="55" y="4" width="200" height="15" textAdjust="StretchHeight">
+				<expression><![CDATA[$F{Name}]]></expression>
+			</element>
+			<element kind="textField" uuid="2703bba7-0afa-4490-80f0-805e216f4834" positionType="Float" x="260" y="4" width="255" height="15" textAdjust="StretchHeight">
+				<expression><![CDATA[$F{Street}]]></expression>
+			</element>
+			<element kind="line" uuid="4a4ea8f7-ad08-4fac-8831-763b36ca450b" positionType="Float" x="0" y="19" width="515" height="1" forecolor="#808080"/>
+		</band>
+	</detail>
+	<pageFooter height="40">
+		<element kind="line" uuid="1b8e2f02-db69-4690-8363-7375a1567f57" x="0" y="10" width="515" height="1"/>
+		<element kind="textField" uuid="77f67e67-3135-44ca-832d-88ab90f9dee5" x="200" y="20" width="80" height="15" hTextAlign="Right">
+			<expression><![CDATA["Page " + String.valueOf($V{PAGE_NUMBER}) + " of"]]></expression>
+		</element>
+		<element kind="textField" uuid="fa52aae5-b62b-40d0-bb7b-3beb23b40f7f" x="280" y="20" width="75" height="15" evaluationTime="Report">
+			<expression><![CDATA[" " + String.valueOf($V{PAGE_NUMBER})]]></expression>
+		</element>
+	</pageFooter>
+</jasperReport>
diff --git a/jasperreports-parent/jasperreports-examples/src/main/jasperreports/WebappReport.jrxml b/jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport_v6.jrxml
similarity index 100%
rename from jasperreports-parent/jasperreports-examples/src/main/jasperreports/WebappReport.jrxml
rename to jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/WebappReport_v6.jrxml
diff --git a/jasperreports-parent/jasperreports-examples/src/main/webapp/images/jasperreports.gif b/jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/jasperreports.gif
similarity index 100%
rename from jasperreports-parent/jasperreports-examples/src/main/webapp/images/jasperreports.gif
rename to jasperreports-parent/jasperreports-examples/src/main/resources/jasperreports/jasperreports.gif
diff --git a/jasperreports-parent/jasperreports-examples/src/main/webapp/reports/WebappReport.jasper b/jasperreports-parent/jasperreports-examples/src/main/webapp/reports/WebappReport.jasper
deleted file mode 100644
index 83896dcd87ff0b3418263abe228d20c504d406af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jasperreports-parent/jasperreports/pom.xml b/jasperreports-parent/jasperreports/pom.xml
index 08c961ff70..ace0928c51 100644
--- a/jasperreports-parent/jasperreports/pom.xml
+++ b/jasperreports-parent/jasperreports/pom.xml
@@ -28,6 +28,14 @@
 			<groupId>net.sf.jasperreports</groupId>
 			<artifactId>jasperreports</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>net.sf.jasperreports</groupId>
+			<artifactId>jasperreports-pdf</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.jasperreports</groupId>
+			<artifactId>jasperreports-excel-poi</artifactId>
+		</dependency>
 
 		<!-- Provided -->
 		<dependency>
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
index bf3868e580..467aa06efb 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
@@ -29,7 +29,7 @@
  * Component for embedding a jasper report in a page. This component must be attached to an
  * &lt;object&gt; tag. If you don't want to embed the report, but have a link to it instead, use
  * {@link ResourceReference}.
- * 
+ *
  * @author <a href="mailto:evanchooly@gmail.com">Justin Lee</a>
  */
 public final class EmbeddedJRReport extends WebComponent implements IRequestListener
@@ -40,7 +40,7 @@ public final class EmbeddedJRReport extends WebComponent implements IRequestList
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param componentID
 	 *            component componentID
 	 * @param resource
@@ -57,8 +57,9 @@ public void onRequest()
 	{
 		PageParameters pageParams = null;
 		final Page page = findPage();
-		if (page != null)
+		if (page != null) {
 			pageParams = page.getPageParameters();
+		}
 
 		ResourceRequestHandler reqh = new ResourceRequestHandler(resource, pageParams);
 
@@ -67,7 +68,7 @@ public void onRequest()
 
 	/**
 	 * Make sure we work only with object tags
-	 * 
+	 *
 	 * @param tag
 	 *            tag applied to component.
 	 * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag)
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRImageResource.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRImageResource.java
index 9db370ce2b..8b66914be0 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRImageResource.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRImageResource.java
@@ -29,16 +29,17 @@
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
 import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRExporterParameter;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
-import net.sf.jasperreports.engine.export.JRGraphics2DExporterParameter;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
+import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
 
 import org.apache.wicket.WicketRuntimeException;
 
 /**
  * Resource class for jasper reports PDF resources.
- * 
+ *
  * @author Eelco Hillenius
  */
 public final class JRImageResource extends JRResource
@@ -70,7 +71,7 @@ public JRImageResource()
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param report
 	 *            the report input stream
 	 */
@@ -81,7 +82,7 @@ public JRImageResource(InputStream report)
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param report
 	 *            the report input stream
 	 */
@@ -92,7 +93,7 @@ public JRImageResource(URL report)
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param report
 	 *            the report input stream
 	 */
@@ -123,16 +124,18 @@ protected byte[] getExporterData(JasperPrint print, JRAbstractExporter exporter)
 		throws JRException
 	{
 		// prepare a stream to trap the exporter's output
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		exporter.setParameter(JRExporterParameter.JASPER_PRINT, print);
-		exporter.setParameter(JRExporterParameter.OUTPUT_STREAM, baos);
+		exporter.setExporterInput(new SimpleExporterInput(print));
 
 		// create an image object
 		int width = (int)(print.getPageWidth() * getZoomRatio());
 		int height = (int)(print.getPageHeight() * getZoomRatio());
 		BufferedImage image = new BufferedImage(width, height, type);
-		exporter.setParameter(JRGraphics2DExporterParameter.GRAPHICS_2D, image.getGraphics());
-		exporter.setParameter(JRGraphics2DExporterParameter.ZOOM_RATIO, new Float(zoomRatio));
+		SimpleGraphics2DExporterOutput out = new SimpleGraphics2DExporterOutput();
+		out.setGraphics2D(image.createGraphics());
+		exporter.setExporterOutput(out);
+		SimpleGraphics2DReportConfiguration cfg = new SimpleGraphics2DReportConfiguration();
+		cfg.setZoomRatio(zoomRatio);
+		exporter.setConfiguration(cfg);
 
 		// execute the export and return the trapped result
 		exporter.exportReport();
@@ -142,7 +145,7 @@ protected byte[] getExporterData(JasperPrint print, JRAbstractExporter exporter)
 	/**
 	 * @param image
 	 *            The image to turn into data
-	 * 
+	 *
 	 * @return The image data for this dynamic image
 	 */
 	protected byte[] toImageData(final BufferedImage image)
@@ -179,7 +182,7 @@ public String getContentType()
 
 	/**
 	 * Gets the zoom ratio.
-	 * 
+	 *
 	 * @return the zoom ratio used for the export. The default value is 1
 	 */
 	public float getZoomRatio()
@@ -189,7 +192,7 @@ public float getZoomRatio()
 
 	/**
 	 * Sets the zoom ratio.
-	 * 
+	 *
 	 * @param ratio
 	 *            the zoom ratio used for the export. The default value is 1
 	 */
@@ -200,7 +203,7 @@ public void setZoomRatio(float ratio)
 
 	/**
 	 * Gets the image type.
-	 * 
+	 *
 	 * @return the image type. The default value is 'png'
 	 */
 	public String getFormat()
@@ -210,7 +213,7 @@ public String getFormat()
 
 	/**
 	 * Sets the image type.
-	 * 
+	 *
 	 * @param format
 	 *            the image type. The default value is 'png'
 	 */
@@ -221,7 +224,7 @@ public void setFormat(String format)
 
 	/**
 	 * Gets type of image (one of BufferedImage.TYPE_*).
-	 * 
+	 *
 	 * @return type of image
 	 */
 	public int getType()
@@ -231,7 +234,7 @@ public int getType()
 
 	/**
 	 * Sets type of image (one of BufferedImage.TYPE_*).
-	 * 
+	 *
 	 * @param type
 	 *            type of image
 	 */
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
index 5f34ae2b09..345e4d6d27 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
@@ -18,7 +18,9 @@
 package org.wicketstuff.jasperreports;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -26,11 +28,12 @@
 import net.sf.jasperreports.engine.JRAbstractExporter;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRExporterParameter;
 import net.sf.jasperreports.engine.JasperFillManager;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.engine.util.JRLoader;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
 
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.request.resource.AbstractResource;
@@ -41,14 +44,13 @@
 
 /**
  * Base class for jasper reports resources.
- * 
+ *
  * @author Eelco Hillenius
  * @author Matej Knopp
  * @author Luciano Montebove
  */
 @SuppressWarnings("serial")
-public abstract class JRResource extends AbstractResource
-{
+public abstract class JRResource extends AbstractResource {
 	/**
 	 * logger.
 	 */
@@ -65,8 +67,10 @@ public abstract class JRResource extends AbstractResource
 	private IJasperReportFactory jasperReportFactory;
 
 	/**
-	 * The compiled report this resource references. Made transient as we don't want our report to
-	 * be serialized while we can recreate it at other servers at will using the factory.
+	 * The compiled report this resource references. Made transient as we don't want
+	 * our report to
+	 * be serialized while we can recreate it at other servers at will using the
+	 * factory.
 	 */
 	private transient JasperReport jasperReport;
 
@@ -81,107 +85,90 @@ public abstract class JRResource extends AbstractResource
 	private JRDataSource reportDataSource;
 
 	/**
-	 * When set, a header 'Content-Disposition: attachment; filename="${fileName}"' will be added to
-	 * the response, resulting in a download dialog. No magical extensions are added, so you should
+	 * When set, a header 'Content-Disposition: attachment; filename="${fileName}"'
+	 * will be added to
+	 * the response, resulting in a download dialog. No magical extensions are
+	 * added, so you should
 	 * make sure the file has the extension you want yourself.
 	 */
 	private String fileName;
 
 	/**
-	 * Construct without a report. You must provide a report before you can use this resource.
+	 * Construct without a report. You must provide a report before you can use this
+	 * resource.
 	 */
-	public JRResource()
-	{
+	public JRResource() {
 		super();
 	}
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param report
-	 *            the report input stream
+	 *               the report input stream
 	 */
-	public JRResource(final InputStream report)
-	{
-		this(new IJasperReportFactory()
-		{
-			public JasperReport newJasperReport() throws JRException
-			{
-				return (JasperReport)JRLoader.loadObject(report);
+	public JRResource(final InputStream report) {
+		this(new IJasperReportFactory() {
+			public JasperReport newJasperReport() throws JRException {
+				return (JasperReport) JRLoader.loadObject(report);
 			}
-
-			;
 		});
 	}
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param report
-	 *            the report input stream
+	 *               the report input stream
 	 */
-	public JRResource(final URL report)
-	{
-		this(new IJasperReportFactory()
-		{
-			public JasperReport newJasperReport() throws JRException
-			{
-				return (JasperReport)JRLoader.loadObject(report);
+	public JRResource(final URL report) {
+		this(new IJasperReportFactory() {
+			public JasperReport newJasperReport() throws JRException {
+				return (JasperReport) JRLoader.loadObject(report);
 			}
-
-			;
 		});
 	}
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param report
-	 *            the report input stream
+	 *               the report input stream
 	 */
-	public JRResource(final File report)
-	{
-		this(new IJasperReportFactory()
-		{
-			public JasperReport newJasperReport() throws JRException
-			{
-				return (JasperReport)JRLoader.loadObject(report);
+	public JRResource(final File report) {
+		this(new IJasperReportFactory() {
+			public JasperReport newJasperReport() throws JRException {
+				return (JasperReport) JRLoader.loadObject(report);
 			}
-
-			;
 		});
 	}
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param factory
-	 *            report factory for lazy initialization
+	 *                report factory for lazy initialization
 	 */
-	public JRResource(IJasperReportFactory factory)
-	{
+	public JRResource(IJasperReportFactory factory) {
 		super();
 		jasperReportFactory = factory;
 	}
 
 	/**
-	 * Gets jasperReport. This implementation uses an internal factory to lazily create the report.
-	 * After creation the report is cached (set as the jasperReport property). Override this method
+	 * Gets jasperReport. This implementation uses an internal factory to lazily
+	 * create the report.
+	 * After creation the report is cached (set as the jasperReport property).
+	 * Override this method
 	 * in case you want to provide some alternative creation/ caching scheme.
-	 * 
+	 *
 	 * @return jasperReport
 	 */
-	public JasperReport getJasperReport()
-	{
+	public JasperReport getJasperReport() {
 		// if the report has not yet been initialized and can be, initialize it
-		if (jasperReport == null && jasperReportFactory != null)
-		{
-			try
-			{
+		if (jasperReport == null && jasperReportFactory != null) {
+			try {
 				setJasperReport(jasperReportFactory.newJasperReport());
-			}
-			catch (JRException e)
-			{
+			} catch (JRException e) {
 				throw new WicketRuntimeException(e);
 			}
 		}
@@ -190,189 +177,173 @@ public JasperReport getJasperReport()
 
 	/**
 	 * Sets {bjasperReport.
-	 * 
+	 *
 	 * @param report
-	 *            report
+	 *               report
 	 */
-	public final void setJasperReport(JasperReport report)
-	{
+	public final void setJasperReport(JasperReport report) {
 		jasperReport = report;
 	}
 
 	/**
-	 * Gets the report parameters. Returns a new copy of the reportParameters Map as JasperReports
+	 * Gets the report parameters. Returns a new copy of the reportParameters Map as
+	 * JasperReports
 	 * modifies it with not serializable objects
-	 * 
+	 *
 	 * @return report parameters
 	 */
-	public Map<String, Object> getReportParameters()
-	{
+	public Map<String, Object> getReportParameters() {
 		return new HashMap<String, Object>(reportParameters);
 	}
 
 	/**
 	 * Sets the report parameters.
-	 * 
+	 *
 	 * @param params
-	 *            report parameters
-	 * 
+	 *               report parameters
+	 *
 	 * @return This
 	 */
-	public final JRResource setReportParameters(Map<String, Object> params)
-	{
+	public final JRResource setReportParameters(Map<String, Object> params) {
 		reportParameters = params;
 		return this;
 	}
 
 	/**
 	 * Gets the datasource if any for filling this report.
-	 * 
+	 *
 	 * @return the datasource if any for filling this report
 	 */
-	public JRDataSource getReportDataSource()
-	{
+	public JRDataSource getReportDataSource() {
 		return reportDataSource;
 	}
 
 	/**
 	 * Sets the datasource if any for filling this report.
-	 * 
+	 *
 	 * @param dataSource
-	 *            the datasource if any for filling this report
-	 * 
+	 *                   the datasource if any for filling this report
+	 *
 	 * @return This
 	 */
-	public JRResource setReportDataSource(JRDataSource dataSource)
-	{
+	public JRResource setReportDataSource(JRDataSource dataSource) {
 		reportDataSource = dataSource;
 		return this;
 	}
 
 	/**
 	 * Gets the connection provider if any for filling this report.
-	 * 
+	 *
 	 * @return the connection provider if any for filling this report
 	 */
-	public IDatabaseConnectionProvider getConnectionProvider()
-	{
+	public IDatabaseConnectionProvider getConnectionProvider() {
 		return connectionProvider;
 	}
 
 	/**
 	 * Sets the connection provider if any for filling this report.
-	 * 
+	 *
 	 * @param provider
-	 *            the connection provider if any for filling this report
-	 * 
+	 *                 the connection provider if any for filling this report
+	 *
 	 * @return This
 	 */
-	public final JRResource setConnectionProvider(IDatabaseConnectionProvider provider)
-	{
+	public final JRResource setConnectionProvider(IDatabaseConnectionProvider provider) {
 		connectionProvider = provider;
 		return this;
 	}
 
 	/**
 	 * Gets the file name. When set, a header 'Content-Disposition: attachment;
-	 * filename="${fileName}"' will be added to the response, resulting in a download dialog. No
-	 * magical extensions are added, so you should make sure the file has the extension you want
+	 * filename="${fileName}"' will be added to the response, resulting in a
+	 * download dialog. No
+	 * magical extensions are added, so you should make sure the file has the
+	 * extension you want
 	 * yourself.
-	 * 
+	 *
 	 * @return the file name
 	 */
-	public String getFileName()
-	{
-		if (fileName == null)
-		{
+	public String getFileName() {
+		if (fileName == null) {
 			fileName = getJasperReport().getName() + "." + getExtension();
 		}
 		return fileName;
 	}
 
 	/**
-	 * Sets the file name. When set, a header 'Content-Disposition: attachment; filename="${name}"'
-	 * will be added to the response, resulting in a download dialog. No magical extensions are
+	 * Sets the file name. When set, a header 'Content-Disposition: attachment;
+	 * filename="${name}"'
+	 * will be added to the response, resulting in a download dialog. No magical
+	 * extensions are
 	 * added, so you should make sure the file has the extension you want yourself.
-	 * 
+	 *
 	 * @param name
-	 *            the file name
-	 * 
+	 *             the file name
+	 *
 	 * @return This
 	 */
-	public final JRResource setFileName(String name)
-	{
+	public final JRResource setFileName(String name) {
 		fileName = name;
 		return this;
 	}
 
 	/**
 	 * Called by getData to obtain an exporter instance.
-	 * 
+	 *
 	 * @return an exporter instance
 	 */
 	public abstract JRAbstractExporter newExporter();
 
-
 	/**
 	 * @return The content type of the reports
 	 */
 	public abstract String getContentType();
 
-
 	/**
 	 * The default is to return the content as an attachment.
-	 * 
+	 *
 	 * @return The content disposition of the reports
 	 */
-	public ContentDisposition getContentDisposition()
-	{
+	public ContentDisposition getContentDisposition() {
 		return ContentDisposition.ATTACHMENT;
 	}
 
-
 	/**
-	 * Returns the extension for the resource's file. This string should not contain the leading "."
-	 * 
+	 * Returns the extension for the resource's file. This string should not contain
+	 * the leading "."
+	 *
 	 * @return The extension for the resource's file.
 	 */
 	public abstract String getExtension();
 
 	/**
-	 * Creates a new {@link JasperPrint} instance. This instance is specific for this render, but it
+	 * Creates a new {@link JasperPrint} instance. This instance is specific for
+	 * this render, but it
 	 * not yet designated for one output format only.
-	 * 
+	 *
 	 * @return a new {@link JasperPrint} instance.
-	 * 
+	 *
 	 * @throws JRException
 	 */
-	protected JasperPrint newJasperPrint() throws JRException
-	{
+	protected JasperPrint newJasperPrint() throws JRException {
 		final JasperPrint jasperPrint;
 		JasperReport report = getJasperReport();
 		Map<String, Object> params = getReportParameters();
 		JRDataSource dataSource = getReportDataSource();
-		if (dataSource != null)
-		{
+		if (dataSource != null) {
 			jasperPrint = JasperFillManager.fillReport(report, params, dataSource);
-		}
-		else
-		{
+		} else {
 			IDatabaseConnectionProvider provider = null;
-			try
-			{
+			try {
 				provider = getConnectionProvider();
-				if (provider == null)
-				{
+				if (provider == null) {
 					throw new IllegalStateException(
-						"JasperReportsResources must either have a JRDataSource, "
-							+ "or a JDBC Connection provided");
+							"JasperReportsResources must either have a JRDataSource, "
+									+ "or a JDBC Connection provided");
 				}
 				jasperPrint = JasperFillManager.fillReport(report, params, provider.get());
-			}
-			finally
-			{
-				if (provider != null)
-				{
+			} finally {
+				if (provider != null) {
 					provider.release();
 				}
 			}
@@ -381,23 +352,18 @@ protected JasperPrint newJasperPrint() throws JRException
 	}
 
 	@Override
-	protected ResourceResponse newResourceResponse(Attributes attributes)
-	{
+	protected ResourceResponse newResourceResponse(Attributes attributes) {
 		ResourceResponse resp = new ResourceResponse();
 		resp.disableCaching();
 		resp.setContentType(getContentType());
 		resp.setFileName(getFileName());
 		resp.setContentDisposition(getContentDisposition());
-		if (resp.dataNeedsToBeWritten(attributes))
-		{
-			resp.setWriteCallback(new WriteCallback()
-			{
+		if (resp.dataNeedsToBeWritten(attributes)) {
+			resp.setWriteCallback(new WriteCallback() {
 
 				@Override
-				public void writeData(Attributes attributes)
-				{
-					try
-					{
+				public void writeData(Attributes attributes) {
+					try {
 						long t1 = System.currentTimeMillis();
 						// get a print instance for exporting
 						JasperPrint print = newJasperPrint();
@@ -405,19 +371,16 @@ public void writeData(Attributes attributes)
 						// get a fresh instance of an exporter for this report
 						JRAbstractExporter exporter = newExporter();
 
-
 						final byte[] data = getExporterData(print, exporter);
 
 						attributes.getResponse().write(data);
-						if (log.isDebugEnabled())
-						{
+
+						if (log.isDebugEnabled()) {
 							long t2 = System.currentTimeMillis();
 							log.debug("loaded report data; bytes: " + data.length + " in " +
-								(t2 - t1) + " miliseconds");
+									(t2 - t1) + " miliseconds");
 						}
-					}
-					catch (JRException e)
-					{
+					} catch (JRException e) {
 						throw new WicketRuntimeException(e);
 					}
 				}
@@ -427,17 +390,15 @@ public void writeData(Attributes attributes)
 	}
 
 	protected byte[] getExporterData(JasperPrint print, JRAbstractExporter exporter)
-		throws JRException
-	{
+			throws JRException {
 		// prepare a stream to trap the exporter's output
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		exporter.setParameter(JRExporterParameter.JASPER_PRINT, print);
-		exporter.setParameter(JRExporterParameter.OUTPUT_STREAM, baos);
 
+		exporter.setExporterInput(new SimpleExporterInput(print));
+		exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(baos));
 		// execute the export and return the trapped result
 		exporter.exportReport();
 
 		return baos.toByteArray();
 	}
-
 }
\ No newline at end of file
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/PdfResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/PdfResourceHandler.java
index d3bdcc1ea0..89ea54e8fd 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/PdfResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/PdfResourceHandler.java
@@ -1,14 +1,14 @@
 /*
  * $Id: PdfResourceHandler.java 5335 2010-06-14 13:28:39Z cdeal $ $Revision:
  * 1.4 $ $Date: 2010-06-14 09:28:39 -0400 (Mon, 14 Jun 2010) $
- * 
+ *
  * ==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@
 import java.io.Serializable;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
-import net.sf.jasperreports.engine.export.JRPdfExporter;
+import net.sf.jasperreports.pdf.JRPdfExporter;
 
 /**
  * @author cdeal
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/TextResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/TextResourceHandler.java
index 6b3bf2e948..8c85e40e59 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/TextResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/TextResourceHandler.java
@@ -1,14 +1,14 @@
 /*
  * $Id: TextResourceHandler.java 5335 2010-06-14 13:28:39Z cdeal $ $Revision:
  * 1.4 $ $Date: 2010-06-14 09:28:39 -0400 (Mon, 14 Jun 2010) $
- * 
+ *
  * ==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
 import net.sf.jasperreports.engine.export.JRTextExporter;
-import net.sf.jasperreports.engine.export.JRTextExporterParameter;
+import net.sf.jasperreports.export.SimpleTextReportConfiguration;
 
 /**
  * @author cdeal
@@ -42,7 +42,7 @@ public class TextResourceHandler implements IJRResourceHandler, Serializable
 
 	/**
 	 * Gets page height.
-	 * 
+	 *
 	 * @return an integer representing the page height in characters
 	 */
 	public int getPageHeight()
@@ -52,7 +52,7 @@ public int getPageHeight()
 
 	/**
 	 * Sets page height.
-	 * 
+	 *
 	 * @param height
 	 *            an integer representing the page height in characters
 	 */
@@ -63,7 +63,7 @@ public void setPageHeight(int height)
 
 	/**
 	 * Gets page width.
-	 * 
+	 *
 	 * @return an integer representing the page width in characters
 	 */
 	public int getPageWidth()
@@ -73,7 +73,7 @@ public int getPageWidth()
 
 	/**
 	 * Sets page width.
-	 * 
+	 *
 	 * @param width
 	 *            an integer representing the page width in characters
 	 */
@@ -88,8 +88,10 @@ public void setPageWidth(int width)
 	public JRAbstractExporter newExporter()
 	{
 		JRTextExporter exporter = new JRTextExporter();
-		exporter.setParameter(JRTextExporterParameter.PAGE_WIDTH, Integer.valueOf(pageWidth));
-		exporter.setParameter(JRTextExporterParameter.PAGE_HEIGHT, Integer.valueOf(pageHeight));
+		SimpleTextReportConfiguration cfg = new SimpleTextReportConfiguration();
+		cfg.setPageWidthInChars(pageWidth);
+		cfg.setPageHeightInChars(pageHeight);
+		exporter.setConfiguration(cfg);
 		return exporter;
 	}
 
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/XlsResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/XlsResourceHandler.java
index 4d3b6c1755..d8a3791c44 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/XlsResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/XlsResourceHandler.java
@@ -1,14 +1,14 @@
 /*
  * $Id: XlsResourceHandler.java 5335 2010-06-14 13:28:39Z cdeal $ $Revision:
  * 1.4 $ $Date: 2010-06-14 09:28:39 -0400 (Mon, 14 Jun 2010) $
- * 
+ *
  * ==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@
 import java.io.Serializable;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
-import net.sf.jasperreports.engine.export.JRXlsExporter;
+import net.sf.jasperreports.poi.export.JRXlsExporter;
 
 /**
  * @author cdeal
diff --git a/pom.xml b/pom.xml
index 68f5bab93c..eadfd0c76c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,7 +367,7 @@
 		<jts.version>1.13</jts.version>
 		<gson.version>2.13.2</gson.version>
 		<wicket-bootstrap-core.version>7.0.14</wicket-bootstrap-core.version>
-		<jasperreports.version>6.21.5</jasperreports.version>
+		<jasperreports.version>7.0.6</jasperreports.version>
 		<joda-time.version>2.14.1</joda-time.version>
 		<ehcache.version>3.11.1</ehcache.version>
 		<jakartaee-api.version>10.0.0</jakartaee-api.version>
@@ -887,6 +887,16 @@
 				<artifactId>jasperreports</artifactId>
 				<version>${jasperreports.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>net.sf.jasperreports</groupId>
+				<artifactId>jasperreports-pdf</artifactId>
+				<version>${jasperreports.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sf.jasperreports</groupId>
+				<artifactId>jasperreports-excel-poi</artifactId>
+				<version>${jasperreports.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time</artifactId>

From 2397dd585267b9687fecb967aaf3dac5cc775a49 Mon Sep 17 00:00:00 2001
From: Maxim Solodovnik <solomax@apache.org>
Date: Tue, 24 Mar 2026 15:58:29 +0700
Subject: [PATCH 2/5] Examples more or less works as expected

Signed-off-by: Maxim Solodovnik <solomax@apache.org>
---
 .../examples/ReportLinksPage.html             |  3 ++
 .../examples/ReportLinksPage.java             |  6 +++
 .../jasperreports/examples/SimplePdfPage.html |  4 +-
 .../jasperreports/EmbeddedJRReport.java       | 48 +++++++++----------
 .../jasperreports/JRConcreteResource.java     | 25 ++++++----
 .../jasperreports/JRImageResource.java        |  6 +++
 .../wicketstuff/jasperreports/JRResource.java | 13 +++--
 .../handlers/CsvResourceHandler.java          | 14 ++++--
 .../handlers/HtmlResourceHandler.java         | 14 ++++--
 .../handlers/IJRResourceHandler.java          | 14 ++++--
 .../handlers/PdfResourceHandler.java          |  8 ++++
 .../handlers/RtfResourceHandler.java          | 14 ++++--
 .../handlers/TextResourceHandler.java         |  8 ++++
 .../handlers/XlsResourceHandler.java          |  8 ++++
 14 files changed, 133 insertions(+), 52 deletions(-)

diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.html b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.html
index 2653647f81..79c150533c 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.html
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.html
@@ -25,6 +25,9 @@
 				<li>
 					<a href="#" wicket:id="linkToCsv">display CSV report</a>
 				</li>
+				<li>
+					<a href="#" wicket:id="linkToXls">display XLS report</a>
+				</li>
 			</ul>
 		</div>
 		<div>
diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.java b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.java
index 3ae10f4c56..db535f4046 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.java
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/ReportLinksPage.java
@@ -25,6 +25,7 @@
 import org.wicketstuff.jasperreports.handlers.PdfResourceHandler;
 import org.wicketstuff.jasperreports.handlers.RtfResourceHandler;
 import org.wicketstuff.jasperreports.handlers.TextResourceHandler;
+import org.wicketstuff.jasperreports.handlers.XlsResourceHandler;
 
 /**
  * Simple Jasper reports example with PDF output and a jasper reports panel..
@@ -71,6 +72,11 @@ public ReportLinksPage() {
 				new CsvResourceHandler()).setReportParameters(parameters).setReportDataSource(
 						new WebappDataSource());
 		add(new ResourceLink<Void>("linkToCsv", csvResource));
+
+		JRResource xlsResource = new JRConcreteResource<XlsResourceHandler>(reportFile,
+				new XlsResourceHandler()).setReportParameters(parameters).setReportDataSource(
+						new WebappDataSource());
+		add(new ResourceLink<Void>("linkToXls", xlsResource));
 	}
 
 	/**
diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.html b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.html
index bf0ef335b5..457fdf2a18 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.html
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/SimplePdfPage.html
@@ -5,8 +5,8 @@
 		<title>WicketStuff JasperReports Integration - Embedded PDF</title>
 		<style>
 			object {
-				width: 80vw;
-				height: 60vh;
+				width: 85vw;
+				height: 85vh;
 				display: block;
 			}
 		</style>
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
index 467aa06efb..ae2d4f4cdb 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
@@ -21,8 +21,14 @@
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.WebComponent;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
 import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.AbstractResource;
+import org.apache.wicket.request.resource.ContentDisposition;
+import org.apache.wicket.request.resource.IResource;
 import org.apache.wicket.request.resource.ResourceReference;
 
 /**
@@ -32,11 +38,23 @@
  *
  * @author <a href="mailto:evanchooly@gmail.com">Justin Lee</a>
  */
-public final class EmbeddedJRReport extends WebComponent implements IRequestListener
-{
+public final class EmbeddedJRReport extends WebMarkupContainer {
 	private static final long serialVersionUID = 1L;
 
 	private final JRResource resource;
+	private final ResourceReference ref = new ResourceReference(EmbeddedJRReport.class, "report") {
+		@Override
+		public IResource getResource() {
+			return new AbstractResource() {
+				@Override
+				protected ResourceResponse newResourceResponse(Attributes attributes) {
+					ResourceResponse resp = resource.newResourceResponse(attributes);
+					resp.setContentDisposition(ContentDisposition.INLINE);
+					return resp;
+				}
+			};
+		}
+	};
 
 	/**
 	 * Construct.
@@ -52,20 +70,6 @@ public EmbeddedJRReport(String componentID, JRResource resource)
 		this.resource = resource;
 	}
 
-	@Override
-	public void onRequest()
-	{
-		PageParameters pageParams = null;
-		final Page page = findPage();
-		if (page != null) {
-			pageParams = page.getPageParameters();
-		}
-
-		ResourceRequestHandler reqh = new ResourceRequestHandler(resource, pageParams);
-
-		reqh.respond(getRequestCycle());
-	}
-
 	/**
 	 * Make sure we work only with object tags
 	 *
@@ -74,15 +78,9 @@ public void onRequest()
 	 * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag)
 	 */
 	@Override
-	protected void onComponentTag(ComponentTag tag)
-	{
-		if (!"object".equalsIgnoreCase(tag.getName()))
-		{
-			findMarkupStream().throwMarkupException(
-				"Component " + getId() + " must be applied to a tag of type 'object' not " +
-					tag.toUserDebugString());
-		}
-		tag.put("data", getResponse().encodeURL(urlForListener(null)));
+	protected void onComponentTag(ComponentTag tag) {
+		checkComponentTag(tag, "object");
+		tag.put("data", RequestCycle.get().urlFor(ref, null));
 		tag.put("type", resource.getContentType());
 		super.onComponentTag(tag);
 	}
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRConcreteResource.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRConcreteResource.java
index ed35c4613a..42439be913 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRConcreteResource.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRConcreteResource.java
@@ -1,14 +1,14 @@
 /*
  * $Id: JRGenericResource.java 5335 2010-06-14 13:28:39Z cdeal $ $Revision:
  * 1.3 $ $Date: 2010-06-14 09:28:39 -0400 (Mon, 14 Jun 2010) $
- * 
+ *
  * ==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,15 +19,17 @@
 
 import java.io.File;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URL;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
+import net.sf.jasperreports.export.ExporterOutput;
 
 import org.wicketstuff.jasperreports.handlers.IJRResourceHandler;
 
 /**
  * A concrete implementation of a JRResource that delegates the common methods to a handler
- * 
+ *
  * @author cdeal
  */
 public class JRConcreteResource<H extends IJRResourceHandler> extends JRResource
@@ -37,7 +39,7 @@ public class JRConcreteResource<H extends IJRResourceHandler> extends JRResource
 
 	/**
 	 * Constructor for JRConcreteResource
-	 * 
+	 *
 	 * @param handler
 	 */
 	public JRConcreteResource(H handler)
@@ -48,7 +50,7 @@ public JRConcreteResource(H handler)
 
 	/**
 	 * Constructor for JRConcreteResource
-	 * 
+	 *
 	 * @param report
 	 * @param handler
 	 */
@@ -60,7 +62,7 @@ public JRConcreteResource(InputStream report, H handler)
 
 	/**
 	 * Constructor for JRConcreteResource
-	 * 
+	 *
 	 * @param report
 	 * @param handler
 	 */
@@ -72,7 +74,7 @@ public JRConcreteResource(URL report, H handler)
 
 	/**
 	 * Constructor for JRConcreteResource
-	 * 
+	 *
 	 * @param report
 	 * @param handler
 	 */
@@ -84,7 +86,7 @@ public JRConcreteResource(File report, H handler)
 
 	/**
 	 * Constructor for JRConcreteResource
-	 * 
+	 *
 	 * @param factory
 	 * @param handler
 	 */
@@ -121,6 +123,11 @@ public final JRAbstractExporter newExporter()
 		return handler.newExporter();
 	}
 
+	@Override
+	public ExporterOutput newExporterOutput(OutputStream os) {
+		return handler.newExporterOutput(os);
+	}
+
 	/**
 	 * @return Returns the handler.
 	 */
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRImageResource.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRImageResource.java
index 8b66914be0..02cecf860e 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRImageResource.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRImageResource.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URL;
 
 import javax.imageio.ImageIO;
@@ -31,6 +32,7 @@
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
+import net.sf.jasperreports.export.ExporterOutput;
 import net.sf.jasperreports.export.SimpleExporterInput;
 import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
 import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
@@ -118,6 +120,10 @@ public final JRAbstractExporter newExporter()
 		}
 	}
 
+	@Override
+	public ExporterOutput newExporterOutput(OutputStream os) {
+		return null; // not used
+	}
 
 	@Override
 	protected byte[] getExporterData(JasperPrint print, JRAbstractExporter exporter)
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
index 345e4d6d27..8ac56ba051 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
@@ -18,7 +18,6 @@
 package org.wicketstuff.jasperreports;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
@@ -32,8 +31,8 @@
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.engine.util.JRLoader;
+import net.sf.jasperreports.export.ExporterOutput;
 import net.sf.jasperreports.export.SimpleExporterInput;
-import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
 
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.request.resource.AbstractResource;
@@ -294,6 +293,13 @@ public final JRResource setFileName(String name) {
 	 */
 	public abstract JRAbstractExporter newExporter();
 
+	/**
+	 * Called by getExporterData to obtain an exporter output instance.
+	 *
+	 * @return an exporter instance
+	 */
+	public abstract ExporterOutput newExporterOutput(OutputStream os);
+
 	/**
 	 * @return The content type of the reports
 	 */
@@ -360,7 +366,6 @@ protected ResourceResponse newResourceResponse(Attributes attributes) {
 		resp.setContentDisposition(getContentDisposition());
 		if (resp.dataNeedsToBeWritten(attributes)) {
 			resp.setWriteCallback(new WriteCallback() {
-
 				@Override
 				public void writeData(Attributes attributes) {
 					try {
@@ -395,7 +400,7 @@ protected byte[] getExporterData(JasperPrint print, JRAbstractExporter exporter)
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
 		exporter.setExporterInput(new SimpleExporterInput(print));
-		exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(baos));
+		exporter.setExporterOutput(newExporterOutput(baos));
 		// execute the export and return the trapped result
 		exporter.exportReport();
 
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/CsvResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/CsvResourceHandler.java
index 90d79abf8f..7fce7c56a5 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/CsvResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/CsvResourceHandler.java
@@ -1,14 +1,14 @@
 /*
  * $Id: CsvResourceHandler.java 5335 2010-06-14 13:28:39Z cdeal $ $Revision:
  * 1.4 $ $Date: 2010-06-14 09:28:39 -0400 (Mon, 14 Jun 2010) $
- * 
+ *
  * ==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,10 +17,13 @@
  */
 package org.wicketstuff.jasperreports.handlers;
 
+import java.io.OutputStream;
 import java.io.Serializable;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
 import net.sf.jasperreports.engine.export.JRCsvExporter;
+import net.sf.jasperreports.export.ExporterOutput;
+import net.sf.jasperreports.export.SimpleWriterExporterOutput;
 
 /**
  * @author cdeal
@@ -37,6 +40,11 @@ public JRAbstractExporter newExporter()
 		return new JRCsvExporter();
 	}
 
+	@Override
+	public ExporterOutput newExporterOutput(OutputStream os) {
+		return new SimpleWriterExporterOutput(os);
+	}
+
 	/**
 	 * @see org.wicketstuff.jasperreports.handlers.IJRResourceHandler#getContentType()
 	 */
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/HtmlResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/HtmlResourceHandler.java
index d6cb876e3b..e3523a786d 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/HtmlResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/HtmlResourceHandler.java
@@ -1,14 +1,14 @@
 /*
  * $Id: HtmlResourceHandler.java 5335 2010-06-14 13:28:39Z cdeal $ $Revision:
  * 1.4 $ $Date: 2010-06-14 09:28:39 -0400 (Mon, 14 Jun 2010) $
- * 
+ *
  * ==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,10 +17,13 @@
  */
 package org.wicketstuff.jasperreports.handlers;
 
+import java.io.OutputStream;
 import java.io.Serializable;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
 import net.sf.jasperreports.engine.export.HtmlExporter;
+import net.sf.jasperreports.export.ExporterOutput;
+import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
 
 /**
  * @author cdeal
@@ -37,6 +40,11 @@ public JRAbstractExporter newExporter()
 		return new HtmlExporter();
 	}
 
+	@Override
+	public ExporterOutput newExporterOutput(OutputStream os) {
+		return new SimpleHtmlExporterOutput(os);
+	}
+
 	/**
 	 * @see org.wicketstuff.jasperreports.handlers.IJRResourceHandler#getContentType()
 	 */
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/IJRResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/IJRResourceHandler.java
index de485a6a10..407b7f2bfb 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/IJRResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/IJRResourceHandler.java
@@ -1,14 +1,14 @@
 /*
  * $Id: IJRResourceHandler.java 5335 2010-06-14 13:28:39Z cdeal $ $Revision:
  * 1.3 $ $Date: 2010-06-14 09:28:39 -0400 (Mon, 14 Jun 2010) $
- * 
+ *
  * ==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,7 +17,10 @@
  */
 package org.wicketstuff.jasperreports.handlers;
 
+import java.io.OutputStream;
+
 import net.sf.jasperreports.engine.JRAbstractExporter;
+import net.sf.jasperreports.export.ExporterOutput;
 
 /**
  * @author cdeal
@@ -38,4 +41,9 @@ public interface IJRResourceHandler
 	 * @see org.wicketstuff.jasperreports.JRResource#newExporter()
 	 */
 	public JRAbstractExporter newExporter();
+
+	/**
+	 * @see org.wicketstuff.jasperreports.JRResource#newExporterOutput()
+	 */
+	public ExporterOutput newExporterOutput(OutputStream os);
 }
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/PdfResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/PdfResourceHandler.java
index 89ea54e8fd..975f035dff 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/PdfResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/PdfResourceHandler.java
@@ -17,9 +17,12 @@
  */
 package org.wicketstuff.jasperreports.handlers;
 
+import java.io.OutputStream;
 import java.io.Serializable;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
+import net.sf.jasperreports.export.ExporterOutput;
+import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
 import net.sf.jasperreports.pdf.JRPdfExporter;
 
 /**
@@ -37,6 +40,11 @@ public JRAbstractExporter newExporter()
 		return new JRPdfExporter();
 	}
 
+	@Override
+	public ExporterOutput newExporterOutput(OutputStream os) {
+		return new SimpleOutputStreamExporterOutput(os);
+	}
+
 	/**
 	 * @see org.wicketstuff.jasperreports.handlers.IJRResourceHandler#getContentType()
 	 */
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/RtfResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/RtfResourceHandler.java
index 1378946f32..87c120b266 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/RtfResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/RtfResourceHandler.java
@@ -1,14 +1,14 @@
 /*
  * $Id: RtfResourceHandler.java 5335 2010-06-14 13:28:39Z cdeal $ $Revision:
  * 1.4 $ $Date: 2010-06-14 09:28:39 -0400 (Mon, 14 Jun 2010) $
- * 
+ *
  * ==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,10 +17,13 @@
  */
 package org.wicketstuff.jasperreports.handlers;
 
+import java.io.OutputStream;
 import java.io.Serializable;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
 import net.sf.jasperreports.engine.export.JRRtfExporter;
+import net.sf.jasperreports.export.ExporterOutput;
+import net.sf.jasperreports.export.SimpleWriterExporterOutput;
 
 /**
  * @author cdeal
@@ -37,6 +40,11 @@ public JRAbstractExporter newExporter()
 		return new JRRtfExporter();
 	}
 
+	@Override
+	public ExporterOutput newExporterOutput(OutputStream os) {
+		return new SimpleWriterExporterOutput(os);
+	}
+
 	/**
 	 * @see org.wicketstuff.jasperreports.handlers.IJRResourceHandler#getContentType()
 	 */
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/TextResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/TextResourceHandler.java
index 8c85e40e59..befffb47a8 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/TextResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/TextResourceHandler.java
@@ -17,11 +17,14 @@
  */
 package org.wicketstuff.jasperreports.handlers;
 
+import java.io.OutputStream;
 import java.io.Serializable;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
 import net.sf.jasperreports.engine.export.JRTextExporter;
+import net.sf.jasperreports.export.ExporterOutput;
 import net.sf.jasperreports.export.SimpleTextReportConfiguration;
+import net.sf.jasperreports.export.SimpleWriterExporterOutput;
 
 /**
  * @author cdeal
@@ -95,6 +98,11 @@ public JRAbstractExporter newExporter()
 		return exporter;
 	}
 
+	@Override
+	public ExporterOutput newExporterOutput(OutputStream os) {
+		return new SimpleWriterExporterOutput(os);
+	}
+
 	/**
 	 * @see org.wicketstuff.jasperreports.handlers.IJRResourceHandler#getContentType()
 	 */
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/XlsResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/XlsResourceHandler.java
index d8a3791c44..d51dc82686 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/XlsResourceHandler.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/XlsResourceHandler.java
@@ -17,9 +17,12 @@
  */
 package org.wicketstuff.jasperreports.handlers;
 
+import java.io.OutputStream;
 import java.io.Serializable;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
+import net.sf.jasperreports.export.ExporterOutput;
+import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
 import net.sf.jasperreports.poi.export.JRXlsExporter;
 
 /**
@@ -37,6 +40,11 @@ public JRAbstractExporter newExporter()
 		return new JRXlsExporter();
 	}
 
+	@Override
+	public ExporterOutput newExporterOutput(OutputStream os) {
+		return new SimpleOutputStreamExporterOutput(os);
+	}
+
 	/**
 	 * @see org.wicketstuff.jasperreports.handlers.IJRResourceHandler#getContentType()
 	 */

From f6c4a27f491deb2d6af6e2878f84cc948540facb Mon Sep 17 00:00:00 2001
From: Maxim Solodovnik <solomax@apache.org>
Date: Wed, 25 Mar 2026 08:04:14 +0700
Subject: [PATCH 3/5] [dashboard] redundant dependency is dropped; code is
 simplyfied

Signed-off-by: Maxim Solodovnik <solomax@apache.org>
---
 dashboard-parent/dashboard-core/pom.xml       |  6 ---
 .../src/main/java/module-info.java            |  2 +-
 .../dashboard/web/SortableAjaxBehavior.java   | 54 ++++---------------
 .../dashboard/AbstractWidgetTest.java         |  6 +--
 4 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/dashboard-parent/dashboard-core/pom.xml b/dashboard-parent/dashboard-core/pom.xml
index 34e0189e4a..e7f5f63350 100644
--- a/dashboard-parent/dashboard-core/pom.xml
+++ b/dashboard-parent/dashboard-core/pom.xml
@@ -16,12 +16,6 @@
 	<name>Wicketstuff Dashboard Core</name>
 
 	<dependencies>
-		<!-- Gson (json for java) -->
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-
 		<!-- Xstream -->
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
diff --git a/dashboard-parent/dashboard-core/src/main/java/module-info.java b/dashboard-parent/dashboard-core/src/main/java/module-info.java
index 97e06d7318..a0ef7d1db0 100644
--- a/dashboard-parent/dashboard-core/src/main/java/module-info.java
+++ b/dashboard-parent/dashboard-core/src/main/java/module-info.java
@@ -7,6 +7,6 @@
 	requires org.apache.wicket.request;
 	requires org.apache.wicket.util;
 	requires xstream;
-	requires com.google.gson;
+	requires com.github.openjson;
 	requires de.agilecoders.wicket.webjars;
 }
diff --git a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/SortableAjaxBehavior.java b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/SortableAjaxBehavior.java
index 6b9639d626..53e5e2392c 100644
--- a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/SortableAjaxBehavior.java
+++ b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/SortableAjaxBehavior.java
@@ -20,7 +20,8 @@
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.wicketstuff.dashboard.WidgetLocation;
 
-import com.google.gson.Gson;
+import com.github.openjson.JSONArray;
+import com.github.openjson.JSONObject;
 
 /**
  * @author Decebal Suiu
@@ -37,54 +38,21 @@ public abstract class SortableAjaxBehavior extends AbstractDefaultAjaxBehavior {
 	protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
 		super.updateAjaxAttributes(attributes);
 
-		StringBuilder buffer = new StringBuilder();
-		buffer.append("var data = serializeWidgetLocations();");
-		buffer.append("return {'" + JSON_DATA + "': data};");
-
-		attributes.getDynamicExtraParameters().add(buffer);
+		attributes.getDynamicExtraParameters()
+			.add("var data = serializeWidgetLocations();" +
+				"return {'" + JSON_DATA + "': data};");
 	}
 
 	@Override
 	protected void respond(AjaxRequestTarget target) {
-		String jsonData = getComponent().getRequest().getRequestParameters().getParameterValue(JSON_DATA).toString();
-		Item[] items = getItems(jsonData);
 		Map<String, WidgetLocation> locations = new HashMap<String, WidgetLocation>();
-		for (Item item : items) {
-			WidgetLocation location = new WidgetLocation(item.column, item.sortIndex);
-			locations.put(item.widget, location);
+		String jsonData = getComponent().getRequest().getRequestParameters().getParameterValue(JSON_DATA).toString();
+		JSONArray arr = new JSONArray(jsonData);
+		for (int i = 0; i < arr.length(); ++i) {
+			JSONObject obj = arr.getJSONObject(i);
+			locations.put(obj.getString("widget"),
+					new WidgetLocation(obj.getInt("column"), obj.getInt("sortIndex")));
 		}
-
 		onSort(target, locations);
 	}
-
-	private Item[] getItems(String jsonData) {
-		Gson gson = new Gson();
-		Item[] items = gson.fromJson(jsonData, Item[].class);
-		/*
-		System.out.println(items.length);
-		for (Item item : items) {
-			System.out.println(item);
-		}
-		*/
-
-		return items;
-	}
-
-	static class Item {
-		public int column;
-		public String widget;
-		public int sortIndex;
-
-		@Override
-		public String toString() {
-			StringBuffer buffer = new StringBuffer();
-			buffer.append("Item[");
-			buffer.append("column = ").append(column);
-			buffer.append(" widget = ").append(widget);
-			buffer.append(" sortIndex = ").append(sortIndex);
-			buffer.append("]");
-
-			return buffer.toString();
-		}
-	}
 }
diff --git a/dashboard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java b/dashboard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java
index 058e35f9e1..2ed5cd38c2 100644
--- a/dashboard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java
+++ b/dashboard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java
@@ -20,7 +20,7 @@
 import org.wicketstuff.dashboard.web.DashboardPanel;
 import org.wicketstuff.dashboard.web.WidgetView;
 
-public class AbstractWidgetTest {
+class AbstractWidgetTest {
 	private static final String MARKUP = "<html><body><div wicket:id=\"dashboard\"></div></body></html>";
 	private WicketTester browser;
 
@@ -96,12 +96,12 @@ public WidgetView createView(String viewId) {
 	}
 
 	@BeforeEach
-	public void setup() {
+	void setup() {
 		browser = new WicketTester(new WebApp());
 	}
 
 	@Test
-	public void canExposeConfigurationAsString() {
+	void canExposeConfigurationAsString() {
 		Dashboard dashboard = Application.get().getMetaData(DASHBOARD_KEY);
 		browser.startComponentInPage(new DashboardPanel("dashboard", Model.<Dashboard> of(dashboard)), Markup.of(MARKUP));
 		browser.assertNoErrorMessage();

From b9736a00f0678d4b0e6c89447316cb2166ee262a Mon Sep 17 00:00:00 2001
From: Maxim Solodovnik <solomax@apache.org>
Date: Wed, 25 Mar 2026 08:04:52 +0700
Subject: [PATCH 4/5] Revert "[dashboard] redundant dependency is dropped; code
 is simplyfied"

This reverts commit f6c4a27f491deb2d6af6e2878f84cc948540facb.
---
 dashboard-parent/dashboard-core/pom.xml       |  6 +++
 .../src/main/java/module-info.java            |  2 +-
 .../dashboard/web/SortableAjaxBehavior.java   | 54 +++++++++++++++----
 .../dashboard/AbstractWidgetTest.java         |  6 +--
 4 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/dashboard-parent/dashboard-core/pom.xml b/dashboard-parent/dashboard-core/pom.xml
index e7f5f63350..34e0189e4a 100644
--- a/dashboard-parent/dashboard-core/pom.xml
+++ b/dashboard-parent/dashboard-core/pom.xml
@@ -16,6 +16,12 @@
 	<name>Wicketstuff Dashboard Core</name>
 
 	<dependencies>
+		<!-- Gson (json for java) -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
+
 		<!-- Xstream -->
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
diff --git a/dashboard-parent/dashboard-core/src/main/java/module-info.java b/dashboard-parent/dashboard-core/src/main/java/module-info.java
index a0ef7d1db0..97e06d7318 100644
--- a/dashboard-parent/dashboard-core/src/main/java/module-info.java
+++ b/dashboard-parent/dashboard-core/src/main/java/module-info.java
@@ -7,6 +7,6 @@
 	requires org.apache.wicket.request;
 	requires org.apache.wicket.util;
 	requires xstream;
-	requires com.github.openjson;
+	requires com.google.gson;
 	requires de.agilecoders.wicket.webjars;
 }
diff --git a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/SortableAjaxBehavior.java b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/SortableAjaxBehavior.java
index 53e5e2392c..6b9639d626 100644
--- a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/SortableAjaxBehavior.java
+++ b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/SortableAjaxBehavior.java
@@ -20,8 +20,7 @@
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.wicketstuff.dashboard.WidgetLocation;
 
-import com.github.openjson.JSONArray;
-import com.github.openjson.JSONObject;
+import com.google.gson.Gson;
 
 /**
  * @author Decebal Suiu
@@ -38,21 +37,54 @@ public abstract class SortableAjaxBehavior extends AbstractDefaultAjaxBehavior {
 	protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
 		super.updateAjaxAttributes(attributes);
 
-		attributes.getDynamicExtraParameters()
-			.add("var data = serializeWidgetLocations();" +
-				"return {'" + JSON_DATA + "': data};");
+		StringBuilder buffer = new StringBuilder();
+		buffer.append("var data = serializeWidgetLocations();");
+		buffer.append("return {'" + JSON_DATA + "': data};");
+
+		attributes.getDynamicExtraParameters().add(buffer);
 	}
 
 	@Override
 	protected void respond(AjaxRequestTarget target) {
-		Map<String, WidgetLocation> locations = new HashMap<String, WidgetLocation>();
 		String jsonData = getComponent().getRequest().getRequestParameters().getParameterValue(JSON_DATA).toString();
-		JSONArray arr = new JSONArray(jsonData);
-		for (int i = 0; i < arr.length(); ++i) {
-			JSONObject obj = arr.getJSONObject(i);
-			locations.put(obj.getString("widget"),
-					new WidgetLocation(obj.getInt("column"), obj.getInt("sortIndex")));
+		Item[] items = getItems(jsonData);
+		Map<String, WidgetLocation> locations = new HashMap<String, WidgetLocation>();
+		for (Item item : items) {
+			WidgetLocation location = new WidgetLocation(item.column, item.sortIndex);
+			locations.put(item.widget, location);
 		}
+
 		onSort(target, locations);
 	}
+
+	private Item[] getItems(String jsonData) {
+		Gson gson = new Gson();
+		Item[] items = gson.fromJson(jsonData, Item[].class);
+		/*
+		System.out.println(items.length);
+		for (Item item : items) {
+			System.out.println(item);
+		}
+		*/
+
+		return items;
+	}
+
+	static class Item {
+		public int column;
+		public String widget;
+		public int sortIndex;
+
+		@Override
+		public String toString() {
+			StringBuffer buffer = new StringBuffer();
+			buffer.append("Item[");
+			buffer.append("column = ").append(column);
+			buffer.append(" widget = ").append(widget);
+			buffer.append(" sortIndex = ").append(sortIndex);
+			buffer.append("]");
+
+			return buffer.toString();
+		}
+	}
 }
diff --git a/dashboard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java b/dashboard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java
index 2ed5cd38c2..058e35f9e1 100644
--- a/dashboard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java
+++ b/dashboard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java
@@ -20,7 +20,7 @@
 import org.wicketstuff.dashboard.web.DashboardPanel;
 import org.wicketstuff.dashboard.web.WidgetView;
 
-class AbstractWidgetTest {
+public class AbstractWidgetTest {
 	private static final String MARKUP = "<html><body><div wicket:id=\"dashboard\"></div></body></html>";
 	private WicketTester browser;
 
@@ -96,12 +96,12 @@ public WidgetView createView(String viewId) {
 	}
 
 	@BeforeEach
-	void setup() {
+	public void setup() {
 		browser = new WicketTester(new WebApp());
 	}
 
 	@Test
-	void canExposeConfigurationAsString() {
+	public void canExposeConfigurationAsString() {
 		Dashboard dashboard = Application.get().getMetaData(DASHBOARD_KEY);
 		browser.startComponentInPage(new DashboardPanel("dashboard", Model.<Dashboard> of(dashboard)), Markup.of(MARKUP));
 		browser.assertNoErrorMessage();

From ae3528442dc359053cde574fa10a58df5d5e54f4 Mon Sep 17 00:00:00 2001
From: Maxim Solodovnik <solomax@apache.org>
Date: Wed, 25 Mar 2026 08:41:20 +0700
Subject: [PATCH 5/5] Code clean-up

Signed-off-by: Maxim Solodovnik <solomax@apache.org>
---
 .../jasperreports/examples/JasperReportsApplication.java  | 7 -------
 .../org/wicketstuff/jasperreports/EmbeddedJRReport.java   | 6 ------
 .../java/org/wicketstuff/jasperreports/JRResource.java    | 8 ++++----
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/JasperReportsApplication.java b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/JasperReportsApplication.java
index 21acf4f754..1236323cf2 100644
--- a/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/JasperReportsApplication.java
+++ b/jasperreports-parent/jasperreports-examples/src/main/java/org/wicketstuff/jasperreports/examples/JasperReportsApplication.java
@@ -26,13 +26,6 @@
 import org.apache.wicket.Page;
 import org.apache.wicket.protocol.http.WebApplication;
 
-import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.design.JasperDesign;
-import net.sf.jasperreports.engine.export.JRXmlExporter;
-import net.sf.jasperreports.engine.util.JRLoader;
-import net.sf.jasperreports.engine.xml.JRXmlLoader;
-
 /**
  * Wicket application class for jasper reports example.
  *
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
index ae2d4f4cdb..b37608697d 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/EmbeddedJRReport.java
@@ -17,15 +17,9 @@
  */
 package org.wicketstuff.jasperreports;
 
-import org.apache.wicket.IRequestListener;
-import org.apache.wicket.Page;
 import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.resource.AbstractResource;
 import org.apache.wicket.request.resource.ContentDisposition;
 import org.apache.wicket.request.resource.IResource;
diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
index 8ac56ba051..90f1c74286 100644
--- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
+++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/JRResource.java
@@ -48,8 +48,9 @@
  * @author Matej Knopp
  * @author Luciano Montebove
  */
-@SuppressWarnings("serial")
 public abstract class JRResource extends AbstractResource {
+	private static final long serialVersionUID = 1L;
+
 	/**
 	 * logger.
 	 */
@@ -344,8 +345,7 @@ protected JasperPrint newJasperPrint() throws JRException {
 				provider = getConnectionProvider();
 				if (provider == null) {
 					throw new IllegalStateException(
-							"JasperReportsResources must either have a JRDataSource, "
-									+ "or a JDBC Connection provided");
+							"JasperReportsResources must either have a JRDataSource, or a JDBC Connection provided");
 				}
 				jasperPrint = JasperFillManager.fillReport(report, params, provider.get());
 			} finally {
@@ -406,4 +406,4 @@ protected byte[] getExporterData(JasperPrint print, JRAbstractExporter exporter)
 
 		return baos.toByteArray();
 	}
-}
\ No newline at end of file
+}