From cf53bc6585fa2f2f439de060cacf5643ed3a6064 Mon Sep 17 00:00:00 2001
From: slavisa-baeldung <slavisa.baeldung@gmail.com>
Date: Sat, 17 Sep 2016 13:07:39 +0200
Subject: [PATCH] BAEL-226 - Source code for wicket

---
 pom.xml                                       |  2 +-
 .../examples/ApplicationConfiguration.java    | 10 ----
 .../wicket/examples/WebAppInitializer.java    | 26 ---------
 {wicket-intro => wicket}/README.md            |  0
 {wicket-intro/WicketIntro => wicket}/pom.xml  | 54 ++++++-------------
 .../baeldung/wicket/examples/Examples.html    |  0
 .../baeldung/wicket/examples/Examples.java    |  0
 .../wicket/examples/ExamplesApplication.java  |  0
 .../examples/cafeaddress/CafeAddress.html     |  0
 .../examples/cafeaddress/CafeAddress.java     |  0
 .../examples/helloworld/HelloWorld.html       |  0
 .../examples/helloworld/HelloWorld.java       |  0
 .../wicket/examples/TestHomePage.java         | 23 ++++++++
 wicket/src/main/webapp/WEB-INF/web.xml        | 32 +++++++++++
 14 files changed, 73 insertions(+), 74 deletions(-)
 delete mode 100644 wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/ApplicationConfiguration.java
 delete mode 100644 wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/WebAppInitializer.java
 rename {wicket-intro => wicket}/README.md (100%)
 rename {wicket-intro/WicketIntro => wicket}/pom.xml (70%)
 rename {wicket-intro/WicketIntro => wicket}/src/main/java/com/baeldung/wicket/examples/Examples.html (100%)
 rename {wicket-intro/WicketIntro => wicket}/src/main/java/com/baeldung/wicket/examples/Examples.java (100%)
 rename {wicket-intro/WicketIntro => wicket}/src/main/java/com/baeldung/wicket/examples/ExamplesApplication.java (100%)
 rename {wicket-intro/WicketIntro => wicket}/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.html (100%)
 rename {wicket-intro/WicketIntro => wicket}/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java (100%)
 rename {wicket-intro/WicketIntro => wicket}/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.html (100%)
 rename {wicket-intro/WicketIntro => wicket}/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java (100%)
 create mode 100644 wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java
 create mode 100644 wicket/src/main/webapp/WEB-INF/web.xml

diff --git a/pom.xml b/pom.xml
index 8533a0d976..97a164b5b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
         <module>lombok</module>
         <module>redis</module>
         <module>webjars</module>
-        <module>wicket-intro</module>
+        <module>wicket</module>
 
 		<module>mutation-testing</module>
 		<module>spring-mvc-velocity</module>
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/ApplicationConfiguration.java b/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/ApplicationConfiguration.java
deleted file mode 100644
index 2b42af9065..0000000000
--- a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/ApplicationConfiguration.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.baeldung.wicket.examples;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan
-public class ApplicationConfiguration {
-
-}
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/WebAppInitializer.java b/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/WebAppInitializer.java
deleted file mode 100644
index 1b2d06d2dc..0000000000
--- a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/WebAppInitializer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baeldung.wicket.examples;
-
-import javax.servlet.FilterRegistration;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-import org.apache.wicket.protocol.http.WicketFilter;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-public class WebAppInitializer implements WebApplicationInitializer {
-
-    @Override
-    public void onStartup(ServletContext container) throws ServletException {
-        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        container.addListener(new ContextLoaderListener(context));
-        context.register(ApplicationConfiguration.class);
-
-        FilterRegistration filter = container.addFilter("ExamplesApplication", WicketFilter.class);
-        filter.setInitParameter("applicationClassName", ExamplesApplication.class.getName());
-        filter.setInitParameter(WicketFilter.FILTER_MAPPING_PARAM, "/*");
-        filter.addMappingForUrlPatterns(null, false, "/*");
-    }
-
-}
\ No newline at end of file
diff --git a/wicket-intro/README.md b/wicket/README.md
similarity index 100%
rename from wicket-intro/README.md
rename to wicket/README.md
diff --git a/wicket-intro/WicketIntro/pom.xml b/wicket/pom.xml
similarity index 70%
rename from wicket-intro/WicketIntro/pom.xml
rename to wicket/pom.xml
index f4b1d0e11c..929f723c2c 100644
--- a/wicket-intro/WicketIntro/pom.xml
+++ b/wicket/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.wicket.examples</groupId>
@@ -13,13 +13,9 @@
         <jetty9.version>9.2.13.v20150730</jetty9.version>
         <log4j.version>2.5</log4j.version>
         <junit.version>4.12</junit.version>
-        <spring-web.version>4.1.1.RELEASE</spring-web.version>
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        <wicket-spring.version>8.0.0-M1</wicket-spring.version>
         <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <wtp.version>none</wtp.version>
     </properties>
     <dependencies>
         <!-- WICKET DEPENDENCIES -->
@@ -29,24 +25,6 @@
             <version>${wicket.version}</version>
         </dependency>
 
-        <!-- SPRING DEPENDENCIES -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring-web.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-spring</artifactId>
-            <version>${wicket-spring.version}</version>
-        </dependency>
-
         <!-- JUNIT DEPENDENCY FOR TESTING -->
         <dependency>
             <groupId>junit</groupId>
@@ -64,7 +42,6 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>WicketIntro</finalName>
         <resources>
             <resource>
                 <filtering>false</filtering>
@@ -81,6 +58,22 @@
                 </excludes>
             </resource>
         </resources>
+        <testResources>
+            <testResource>
+                <filtering>false</filtering>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <filtering>false</filtering>
+                <directory>src/test/java</directory>
+                <includes>
+                    <include>**</include>
+                </includes>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
         <plugins>
             <plugin>
                 <inherited>true</inherited>
@@ -110,17 +103,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <repositories>
-        <repository>
-            <id>Apache Nexus</id>
-            <url>https://repository.apache.org/content/repositories/snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/Examples.html b/wicket/src/main/java/com/baeldung/wicket/examples/Examples.html
similarity index 100%
rename from wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/Examples.html
rename to wicket/src/main/java/com/baeldung/wicket/examples/Examples.html
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/Examples.java b/wicket/src/main/java/com/baeldung/wicket/examples/Examples.java
similarity index 100%
rename from wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/Examples.java
rename to wicket/src/main/java/com/baeldung/wicket/examples/Examples.java
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/ExamplesApplication.java b/wicket/src/main/java/com/baeldung/wicket/examples/ExamplesApplication.java
similarity index 100%
rename from wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/ExamplesApplication.java
rename to wicket/src/main/java/com/baeldung/wicket/examples/ExamplesApplication.java
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.html b/wicket/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.html
similarity index 100%
rename from wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.html
rename to wicket/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.html
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java b/wicket/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java
similarity index 100%
rename from wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java
rename to wicket/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.html b/wicket/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.html
similarity index 100%
rename from wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.html
rename to wicket/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.html
diff --git a/wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java b/wicket/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java
similarity index 100%
rename from wicket-intro/WicketIntro/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java
rename to wicket/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java
diff --git a/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java b/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java
new file mode 100644
index 0000000000..a393f1d178
--- /dev/null
+++ b/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java
@@ -0,0 +1,23 @@
+package com.baeldung.wicket.examples;
+
+import org.apache.wicket.util.tester.WicketTester;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestHomePage {
+    private WicketTester tester;
+
+    @Before
+    public void setUp() {
+        tester = new WicketTester(new ExamplesApplication());
+    }
+
+    @Test
+    public void whenPageInvoked_thanRenderedOK() {
+        //start and render the test page
+        tester.startPage(Examples.class);
+
+        //assert rendered page class
+        tester.assertRenderedPage(Examples.class);
+    }
+}
diff --git a/wicket/src/main/webapp/WEB-INF/web.xml b/wicket/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..8a4451c80e
--- /dev/null
+++ b/wicket/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+
+    <display-name>CafeAddress</display-name>
+
+    <!--
+        There are three means to configure Wickets configuration mode and they
+        are tested in the order given.
+
+        1) A system property: -Dwicket.configuration
+        2) servlet specific <init-param>
+        3) context specific <context-param>
+
+        The value might be either "development" (reloading when templates change) or
+        "deployment". If no configuration is found, "development" is the default. -->
+
+    <filter>
+        <filter-name>wicket.examples</filter-name>
+        <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+        <init-param>
+            <param-name>applicationClassName</param-name>
+            <param-value>com.baeldung.wicket.examples.ExamplesApplication</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>wicket.examples</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
\ No newline at end of file