Code changed for WICKET-6498

bitstorm · Feb 7, 2018 · 922e170 · 922e170
1 parent c38f6b0
commit 922e170
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/ScriptInsideBody/pom.xml b/ScriptInsideBody/pom.xml
@@ -44,7 +44,7 @@
 	</licenses>
 	<properties>
 
-		<jetty.version>7.6.13.v20130916</jetty.version>
+		<jetty.version>9.4.7.v20170914</jetty.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
 		<wtp.version>none</wtp.version>
@@ -150,15 +150,15 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>UTF-8</encoding>
 					<showWarnings>true</showWarnings>
 					<showDeprecation>true</showDeprecation>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 				<version>${jetty.version}</version>
 				<configuration>

diff --git a/ScriptInsideBody/src/main/java/org/wicketTutorial/scriptposition/WicketApplication.java b/ScriptInsideBody/src/main/java/org/wicketTutorial/scriptposition/WicketApplication.java
@@ -17,6 +17,7 @@
 package org.wicketTutorial.scriptposition;
 
 import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.ResourceAggregator;
 import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
 import org.apache.wicket.markup.html.IHeaderResponseDecorator;
 import org.wicketTutorial.commons.bootstrap.BootstrapApp;
@@ -46,26 +47,8 @@ public Class<? extends BootstrapBasePage> getHomePage()
 	public void init()
 	{
 		super.init();
-		setHeaderResponseDecorator(new JavaScriptToBucketResponseDecorator("footer-container"));
+		setHeaderResponseDecorator(response -> {
+            return new ResourceAggregator(new JavaScriptFilteredIntoFooterHeaderResponse(response, "footer-container"));
+		});
 	}
-
-	/**
-     * Decorates an original {@link org.apache.wicket.markup.head.IHeaderResponse} and renders all javascript items
-     * (JavaScriptHeaderItem), to a specific container in the page.
-     */
-    static class JavaScriptToBucketResponseDecorator implements IHeaderResponseDecorator 
-    {
-
-        private String bucketName;
-
-        public JavaScriptToBucketResponseDecorator(String bucketName) {
-            this.bucketName = bucketName;
-        }
-
-        @Override
-        public IHeaderResponse decorate(IHeaderResponse response) {
-            return new JavaScriptFilteredIntoFooterHeaderResponse(response, bucketName);
-        }
-
-    }
 }
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 	<description>The project is intended to provide code examples for the freely available Wicket tutorial</description>
 	<properties>
 		<wicket.version>8.0.0-SNAPSHOT</wicket.version>
-		<jetty9.version>9.2.0.v20140526</jetty9.version>
+		<jetty9.version>9.4.7.v20170914</jetty9.version>
 		<log4j.version>1.2.17</log4j.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<junit.version>4.11</junit.version>