From d53a4e6b1196f66f6f1768c013a4d9759be70dd2 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Thu, 19 Sep 2013 01:48:21 +0200
Subject: [PATCH 1/1] =?utf8?q?Spring=20eingef=C3=BChrt,=20um=20die=20Tiles?=
 =?utf8?q?-Konfiguration=20zu=20vereinfachen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 46 +++++++++++++++++
 src/main/resources/README.txt                 |  1 -
 src/main/resources/log4j.xml                  | 25 ++++++++++
 src/main/webapp/WEB-INF/spring/mvc.xml        | 46 +++++++++++++++++
 .../webapp/WEB-INF/{ => spring}/tiles.xml     |  0
 .../webapp/WEB-INF/templates/html5page.jsp    |  4 +-
 .../webapp/WEB-INF/templates/maincontent.jsp  |  2 +-
 .../webapp/WEB-INF/templates/navigation.jsp   |  4 +-
 src/main/webapp/WEB-INF/views/blog.jsp        | 42 ++++++++++++++++
 .../webapp/{ => WEB-INF/views}/contact.jsp    |  0
 .../webapp/{ => WEB-INF/views}/impressum.jsp  |  0
 src/main/webapp/{ => WEB-INF/views}/index.jsp |  0
 .../webapp/{ => WEB-INF/views}/projects.jsp   |  6 +--
 .../{ => WEB-INF/views}/projects/fix-swf.jsp  | 12 ++---
 .../projects/fix-swf/getting-started.jsp      | 12 ++---
 .../views}/projects/fix-swf/overview.jsp      | 12 ++---
 .../{ => WEB-INF/views}/projects/typo.jsp     |  8 +--
 src/main/webapp/WEB-INF/web.xml               | 50 ++++++++++++++++++-
 src/main/webapp/blog.jsp                      | 44 ----------------
 19 files changed, 238 insertions(+), 76 deletions(-)
 delete mode 100644 src/main/resources/README.txt
 create mode 100644 src/main/resources/log4j.xml
 create mode 100644 src/main/webapp/WEB-INF/spring/mvc.xml
 rename src/main/webapp/WEB-INF/{ => spring}/tiles.xml (100%)
 create mode 100644 src/main/webapp/WEB-INF/views/blog.jsp
 rename src/main/webapp/{ => WEB-INF/views}/contact.jsp (100%)
 rename src/main/webapp/{ => WEB-INF/views}/impressum.jsp (100%)
 rename src/main/webapp/{ => WEB-INF/views}/index.jsp (100%)
 rename src/main/webapp/{ => WEB-INF/views}/projects.jsp (80%)
 rename src/main/webapp/{ => WEB-INF/views}/projects/fix-swf.jsp (73%)
 rename src/main/webapp/{ => WEB-INF/views}/projects/fix-swf/getting-started.jsp (71%)
 rename src/main/webapp/{ => WEB-INF/views}/projects/fix-swf/overview.jsp (74%)
 rename src/main/webapp/{ => WEB-INF/views}/projects/typo.jsp (93%)
 delete mode 100644 src/main/webapp/blog.jsp

diff --git a/pom.xml b/pom.xml
index 3eaaa8f3..5cda65fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,11 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Verwendete Versionen -->
+    <jsp-api.version>2.2.1</jsp-api.version>
+    <jstl.version>1.2</jstl.version>
+    <servlet-api.version>3.0.1</servlet-api.version>
     <slf4j.version>1.5.8</slf4j.version>
+    <springframework.version>3.2.4.RELEASE</springframework.version>
     <tiles.version>3.0.1</tiles.version>
 
   </properties>
@@ -47,6 +51,13 @@
 
   <dependencies>
 
+    <!-- Spring -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${springframework.version}</version>
+    </dependency>
+
     <!-- Tiles -->
     <dependency>
       <groupId>org.apache.tiles</groupId>
@@ -61,7 +72,32 @@
       <scope>runtime</scope>
     </dependency>
 
+    <!-- Servlet -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>${servlet-api.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
+      <version>${jsp-api.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>${jstl.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+
     <!-- Logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -89,6 +125,16 @@
   <build>
     <finalName>branding</finalName>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+          <encoding>utf8</encoding>
+          <showWarnings>true</showWarnings>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.lesscss</groupId>
         <artifactId>lesscss-maven-plugin</artifactId>
diff --git a/src/main/resources/README.txt b/src/main/resources/README.txt
deleted file mode 100644
index 34425caf..00000000
--- a/src/main/resources/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Not empty!
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
new file mode 100644
index 00000000..b6030f96
--- /dev/null
+++ b/src/main/resources/log4j.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%p - %C{1}.%M(%L) | %m%n"/>
+    </layout>
+  </appender>
+
+  <logger name="de.juplo">
+   <level value="trace"/>
+  </logger>
+
+  <logger name="org.springframework">
+    <level value="debug" />
+  </logger>
+
+  <root>
+    <level value="info"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+</log4j:configuration>
diff --git a/src/main/webapp/WEB-INF/spring/mvc.xml b/src/main/webapp/WEB-INF/spring/mvc.xml
new file mode 100644
index 00000000..cc5a0376
--- /dev/null
+++ b/src/main/webapp/WEB-INF/spring/mvc.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+           http://www.springframework.org/schema/mvc
+           http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
+           ">
+
+  <!-- Damit das DispatcherServlet auf /* gemappt werden kann -->
+  <mvc:default-servlet-handler/>
+  <mvc:view-controller path="/" view-name="index"/>
+
+  <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+    <property name="mappings">
+      <value>
+        /*.html=urlFilenameViewController
+        /**/*.html=urlFilenameViewController
+      </value>
+    </property>
+    <property name="order" value="10"/>
+  </bean>
+  <bean id="urlFilenameViewController" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
+
+  <!-- Tiles View-Resolver -->
+  <bean class="org.springframework.web.servlet.view.tiles3.TilesViewResolver"/>
+
+  <!-- Resolves view names to protected .jsp resources within the /WEB-INF/views directory -->
+  <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+    <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+    <property name="prefix" value="/WEB-INF/views/"/>
+    <property name="suffix" value=".jsp"/>
+  </bean>
+
+  <bean class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
+    <property name="definitions">
+      <list>
+        <value>/WEB-INF/spring/tiles.xml</value>
+      </list>
+    </property>
+    <property name="useMutableTilesContainer" value="true"/>
+  </bean>
+
+</beans>
diff --git a/src/main/webapp/WEB-INF/tiles.xml b/src/main/webapp/WEB-INF/spring/tiles.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles.xml
rename to src/main/webapp/WEB-INF/spring/tiles.xml
diff --git a/src/main/webapp/WEB-INF/templates/html5page.jsp b/src/main/webapp/WEB-INF/templates/html5page.jsp
index d4873da6..b98eda1b 100644
--- a/src/main/webapp/WEB-INF/templates/html5page.jsp
+++ b/src/main/webapp/WEB-INF/templates/html5page.jsp
@@ -32,8 +32,8 @@
     <footer id="footer">
       <ul id="footerlinks">
         <li class="f" id="copyright">© <strong>mo</strong> 2013</li>
-        <li class="f"><a class="f" href="contact.jsp">Contact</a></li>
-        <li class="f"><a class="f" href="impressum.jsp">Impressum</a></li>
+        <li class="f"><a class="f" href="contact.html">Contact</a></li>
+        <li class="f"><a class="f" href="impressum.html">Impressum</a></li>
       </ul>
     </footer>
   </body>
diff --git a/src/main/webapp/WEB-INF/templates/maincontent.jsp b/src/main/webapp/WEB-INF/templates/maincontent.jsp
index 3277bff5..f368dd85 100644
--- a/src/main/webapp/WEB-INF/templates/maincontent.jsp
+++ b/src/main/webapp/WEB-INF/templates/maincontent.jsp
@@ -2,7 +2,7 @@
 <%@page pageEncoding="UTF-8"%>
 <%@page session="false" %>
 <p>
-  <strong>Lorem ipsum</strong> dolor <a href="/projects/typo.jsp">sit amet</a>, consectetur adipisicing elit, sed do
+  <strong>Lorem ipsum</strong> dolor <a href="projects/typo.html">sit amet</a>, consectetur adipisicing elit, sed do
   eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
   ad minim veniam, quis nostrud <a href="dort">exercitation</a> ullamco laboris nisi ut
   aliquip ex ea commodo consequat. Duis aute irure dolor in
diff --git a/src/main/webapp/WEB-INF/templates/navigation.jsp b/src/main/webapp/WEB-INF/templates/navigation.jsp
index ce8cadab..af77e176 100644
--- a/src/main/webapp/WEB-INF/templates/navigation.jsp
+++ b/src/main/webapp/WEB-INF/templates/navigation.jsp
@@ -4,6 +4,6 @@
 <h1 class="nav">Navigation</h1>
 <h2 class="nav menu">Section-Menu</h2>
 <ul id="menu">
-  <li class="m blog"><a href="blog.jsp" class="m">Blog</a></li>
-  <li class="m projects"><a href="projects.jsp" class="m">Projects</a></li>
+  <li class="m blog"><a href="blog.html" class="m">Blog</a></li>
+  <li class="m projects"><a href="projects.html" class="m">Projects</a></li>
 </ul>
diff --git a/src/main/webapp/WEB-INF/views/blog.jsp b/src/main/webapp/WEB-INF/views/blog.jsp
new file mode 100644
index 00000000..803c597e
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/blog.jsp
@@ -0,0 +1,42 @@
+<%@page contentType="text/html;charset=UTF-8"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page session="false" %>
+<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
+<t:insertDefinition name="BASEPAGE">
+  <t:putAttribute name="title" value="Blog" type="string"/>
+  <t:putAttribute name="navigation" type="string">
+    <h1 class="nav">Navigation</h1>
+    <h2 class="nav menu">Section-Menu</h2>
+    <ul id="menu">
+      <li class="m blog"><strong class="m">Blog</strong></li>
+      <li class="m projects"><a href="projects.html" class="m">Projects</a></li>
+    </ul>
+  </t:putAttribute>
+  <t:putAttribute name="marginalcontent" type="string">
+    <h1>Recent Posts</h1>
+    <ul>
+      <li><a href="#">Post 1</a></li>
+      <li><a href="#">Post 2</a></li>
+      <li><a href="#">Post 3</a></li>
+      <li><a href="#">Post 4</a></li>
+      <li><a href="#">Post 5</a></li>
+    </ul>
+    <h1>Categories</h1>
+    <ul>
+      <li><a href="#">Category 1</a></li>
+      <li><a href="#">Category 2</a></li>
+      <li><a href="#">Category 3</a></li>
+      <li><a href="#">Category 4</a></li>
+      <li><a href="#">Category 6</a></li>
+      <li><a href="#">Category 7</a></li>
+      <li><a href="#">Category 8</a></li>
+    </ul>
+    <h1>Tags</h1>
+    <ul>
+      <li><a href="#">Tag 1</a></li>
+      <li><a href="#">Tag 2</a></li>
+      <li><a href="#">Tag 3</a></li>
+      <li><a href="#">Tag 4</a></li>
+    </ul>
+  </t:putAttribute>
+</t:insertDefinition>
diff --git a/src/main/webapp/contact.jsp b/src/main/webapp/WEB-INF/views/contact.jsp
similarity index 100%
rename from src/main/webapp/contact.jsp
rename to src/main/webapp/WEB-INF/views/contact.jsp
diff --git a/src/main/webapp/impressum.jsp b/src/main/webapp/WEB-INF/views/impressum.jsp
similarity index 100%
rename from src/main/webapp/impressum.jsp
rename to src/main/webapp/WEB-INF/views/impressum.jsp
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
similarity index 100%
rename from src/main/webapp/index.jsp
rename to src/main/webapp/WEB-INF/views/index.jsp
diff --git a/src/main/webapp/projects.jsp b/src/main/webapp/WEB-INF/views/projects.jsp
similarity index 80%
rename from src/main/webapp/projects.jsp
rename to src/main/webapp/WEB-INF/views/projects.jsp
index 9a6bac63..c39e5c53 100644
--- a/src/main/webapp/projects.jsp
+++ b/src/main/webapp/WEB-INF/views/projects.jsp
@@ -8,17 +8,17 @@
     <h1 class="nav">Navigation</h1>
     <h2 class="nav menu">Section-Menu</h2>
     <ul id="menu" class="s active">
-      <li class="m blog"><a href="blog.jsp" class="m">Blog</a></li>
+      <li class="m blog"><a href="blog.html" class="m">Blog</a></li>
       <li class="m projects"><strong class="m">Projects</strong></li>
     </ul>
     <h2 class="nav submenu"><span class="s">Submenu for section </span><strong class="s">Projects</strong></h2>
     <ul id="submenu">
       <li class="s sub"><a href="" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub"><a href="projects/fix-swf.jsp" class="s">fix-swf</a></li>
+      <li class="s sub"><a href="projects/fix-swf.html" class="s">fix-swf</a></li>
       <li class="s"><a href="" class="s">jquery.openx</a></li>
       <li class="s"><a href="" class="s">halbekunst</a></li>
       <li class="s sub"><a href="" class="s">accelerator</a></li>
-      <li class="s"><a href="projects/typo.jsp" class="s">Typography</a></li>
+      <li class="s"><a href="projects/typo.html" class="s">Typography</a></li>
     </ul>
   </t:putAttribute>
 </t:insertDefinition>
diff --git a/src/main/webapp/projects/fix-swf.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp
similarity index 73%
rename from src/main/webapp/projects/fix-swf.jsp
rename to src/main/webapp/WEB-INF/views/projects/fix-swf.jsp
index 703f4451..fff0e392 100644
--- a/src/main/webapp/projects/fix-swf.jsp
+++ b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp
@@ -8,20 +8,20 @@
     <h1 class="nav">Navigation</h1>
     <h2 class="nav menu">Section-Menu</h2>
     <ul id="menu">
-      <li class="m blog"><a href="blog.jsp" class="m">Blog</a></li>
-      <li class="m projects"><a href="projects.jsp" class="m selected">Projects</a></li>
+      <li class="m blog"><a href="blog.html" class="m">Blog</a></li>
+      <li class="m projects"><a href="projects.html" class="m selected">Projects</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
-      <a class="s selected" href="projects.jsp">Projects</a>
+      <a class="s selected" href="projects.html">Projects</a>
     </h2>
     <ul id="submenu" class="s">
       <li class="s sub off"><a href="" class="s">hibernate4-maven-plugin</a></li>
       <li class="s sub">
         <strong class="s">fix-swf</strong>
         <ul class="s active">
-          <li class="s"><a href="projects/fix-swf/overview.jsp" class="s">Overview</a></li>
-          <li class="s"><a href="projects/fix-swf/getting-started.jsp" class="s">Getting Started</a></li>
+          <li class="s"><a href="projects/fix-swf/overview.html" class="s">Overview</a></li>
+          <li class="s"><a href="projects/fix-swf/getting-started.html" class="s">Getting Started</a></li>
           <li class="s"><a href="" class="s">FAQ</a></li>
           <li class="s"><a href="" class="s">Documentation</a></li>
         </ul>
@@ -29,7 +29,7 @@
       <li class="s off"><a href="" class="s">jquery.openx</a></li>
       <li class="s off"><a href="" class="s">halbekunst</a></li>
       <li class="s sub off"><a href="" class="s">accelerator</a></li>
-      <li class="s off"><a href="projects/typo.jsp" class="s">Typography</a></li>
+      <li class="s off"><a href="projects/typo.html" class="s">Typography</a></li>
     </ul>
   </t:putAttribute>
 </t:insertDefinition>
diff --git a/src/main/webapp/projects/fix-swf/getting-started.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp
similarity index 71%
rename from src/main/webapp/projects/fix-swf/getting-started.jsp
rename to src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp
index 89d847d8..e29a1c68 100644
--- a/src/main/webapp/projects/fix-swf/getting-started.jsp
+++ b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp
@@ -8,19 +8,19 @@
     <h1 class="nav">Navigation</h1>
     <h2 class="nav menu">Section-Menu</h2>
     <ul id="menu">
-      <li class="m blog"><a href="blog.jsp" class="m">Blog</a></li>
-      <li class="m projects"><a href="projects.jsp" class="m selected">Projects</a></li>
+      <li class="m blog"><a href="blog.html" class="m">Blog</a></li>
+      <li class="m projects"><a href="projects.html" class="m selected">Projects</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
-      <a class="s selected" href="projects.jsp">Projects</a>
+      <a class="s selected" href="projects.html">Projects</a>
     </h2>
     <ul id="submenu" class="s">
       <li class="s sub off"><a href="" class="s">hibernate4-maven-plugin</a></li>
       <li class="s sub">
-        <a href="projects/fix-swf.jsp" class="s selected">fix-swf</a>
+        <a href="projects/fix-swf.html" class="s selected">fix-swf</a>
         <ul class="s active">
-          <li class="s"><a href="projects/fix-swf/overview.jsp" class="s">Overview</a></li>
+          <li class="s"><a href="projects/fix-swf/overview.html" class="s">Overview</a></li>
           <li class="s"><strong class="s">Getting Started</strong></li>
           <li class="s"><a href="" class="s">FAQ</a></li>
           <li class="s"><a href="" class="s">Documentation</a></li>
@@ -29,7 +29,7 @@
       <li class="s off"><a href="" class="s">jquery.openx</a></li>
       <li class="s off"><a href="" class="s">halbekunst</a></li>
       <li class="s sub off"><a href="" class="s">accelerator</a></li>
-      <li class="s off"><a href="projects/typo.jsp" class="s">Typography</a></li>
+      <li class="s off"><a href="projects/typo.html" class="s">Typography</a></li>
     </ul>
   </t:putAttribute>
 </t:insertDefinition>
diff --git a/src/main/webapp/projects/fix-swf/overview.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp
similarity index 74%
rename from src/main/webapp/projects/fix-swf/overview.jsp
rename to src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp
index c43e6eb1..251cb31d 100644
--- a/src/main/webapp/projects/fix-swf/overview.jsp
+++ b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp
@@ -8,20 +8,20 @@
     <h1 class="nav">Navigation</h1>
     <h2 class="nav menu">Section-Menu</h2>
     <ul id="menu">
-      <li class="m blog"><a href="blog.jsp" class="m">Blog</a></li>
-      <li class="m projects"><a href="projects.jsp" class="m selected">Projects</a></li>
+      <li class="m blog"><a href="blog.html" class="m">Blog</a></li>
+      <li class="m projects"><a href="projects.html" class="m selected">Projects</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
-      <a class="s selected" href="projects.jsp">Projects</a>
+      <a class="s selected" href="projects.html">Projects</a>
     </h2>
     <ul id="submenu" class="s">
       <li class="s sub off"><a href="" class="s">hibernate4-maven-plugin</a></li>
       <li class="s sub">
-        <a href="projects/fix-swf.jsp" class="s selected">fix-swf</a>
+        <a href="projects/fix-swf.html" class="s selected">fix-swf</a>
         <ul class="s active">
           <li class="s"><strong class="s">Overview</strong></li>
-          <li class="s"><a href="projects/fix-swf/getting-started.jsp" class="s">Getting Started</a></li>
+          <li class="s"><a href="projects/fix-swf/getting-started.html" class="s">Getting Started</a></li>
           <li class="s"><a href="" class="s">FAQ</a></li>
           <li class="s"><a href="" class="s">Documentation</a></li>
         </ul>
@@ -29,7 +29,7 @@
       <li class="s off"><a href="" class="s">jquery.openx</a></li>
       <li class="s off"><a href="" class="s">halbekunst</a></li>
       <li class="s sub off"><a href="" class="s">accelerator</a></li>
-      <li class="s off"><a href="projects/typo.jsp" class="s">Typography</a></li>
+      <li class="s off"><a href="projects/typo.html" class="s">Typography</a></li>
     </ul>
   </t:putAttribute>
 </t:insertDefinition>
diff --git a/src/main/webapp/projects/typo.jsp b/src/main/webapp/WEB-INF/views/projects/typo.jsp
similarity index 93%
rename from src/main/webapp/projects/typo.jsp
rename to src/main/webapp/WEB-INF/views/projects/typo.jsp
index db0c38a7..a55864c1 100644
--- a/src/main/webapp/projects/typo.jsp
+++ b/src/main/webapp/WEB-INF/views/projects/typo.jsp
@@ -8,16 +8,16 @@
     <h1 class="nav">Navigation</h1>
     <h2 class="nav menu">Section-Menu</h2>
     <ul id="menu">
-      <li class="m blog"><a href="blog.jsp" class="m">Blog</a></li>
-      <li class="m projects"><a href="projects.jsp" class="m selected">Projects</a></li>
+      <li class="m blog"><a href="blog.html" class="m">Blog</a></li>
+      <li class="m projects"><a href="projects.html" class="m selected">Projects</a></li>
     </ul>
     <h2 class="nav submenu">
       <span class="s">Submenu for section</span>
-      <a class="s selected" href="projects.jsp">Projects</a>
+      <a class="s selected" href="projects.html">Projects</a>
     </h2>
     <ul id="submenu" class="s active">
       <li class="s sub"><a href="" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub"><a href="projects/fix-swf.jsp" class="s">fix-swf</a></li>
+      <li class="s sub"><a href="projects/fix-swf.html" class="s">fix-swf</a></li>
       <li class="s"><a href="" class="s">jquery.openx</a></li>
       <li class="s"><a href="" class="s">halbekunst</a></li>
       <li class="s sub"><a href="" class="s">accelerator</a></li>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b6cb19fc..3be0c17c 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -6,8 +6,56 @@
 
   <display-name>branding</display-name>
 
+  <!-- Context Configuration locations for Spring XML files -->
+
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>
+      /WEB-INF/spring/mvc.xml
+    </param-value>
+  </context-param>
+
   <listener>
-    <listener-class>org.apache.tiles.web.startup.simple.SimpleTilesListener</listener-class>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
 
+
+  <!-- UTF-8 -->
+  <filter>
+    <filter-name>characterEncodingFilter</filter-name>
+    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+    <init-param>
+      <param-name>encoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+    <init-param>
+      <param-name>forceEncoding</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>characterEncodingFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+
+  <!-- Handles all requests into the application -->
+
+  <servlet>
+    <servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <init-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>
+      </param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
+    <url-pattern>*.html</url-pattern>
+  </servlet-mapping>
+
 </web-app>
diff --git a/src/main/webapp/blog.jsp b/src/main/webapp/blog.jsp
deleted file mode 100644
index d70321a6..00000000
--- a/src/main/webapp/blog.jsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Blog" type="string"/>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu">
-      <li class="m blog"><strong class="m">Blog</strong></li>
-      <li class="m projects"><a href="projects.jsp" class="m">Projects</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="string">
-    <div>
-      <h1>Recent Posts</h1>
-      <ul>
-        <li><a href="#">Post 1</a></li>
-        <li><a href="#">Post 2</a></li>
-        <li><a href="#">Post 3</a></li>
-        <li><a href="#">Post 4</a></li>
-        <li><a href="#">Post 5</a></li>
-      </ul>
-      <h1>Categories</h1>
-      <ul>
-        <li><a href="#">Category 1</a></li>
-        <li><a href="#">Category 2</a></li>
-        <li><a href="#">Category 3</a></li>
-        <li><a href="#">Category 4</a></li>
-        <li><a href="#">Category 6</a></li>
-        <li><a href="#">Category 7</a></li>
-        <li><a href="#">Category 8</a></li>
-      </ul>
-      <h1>Tags</h1>
-      <ul>
-        <li><a href="#">Tag 1</a></li>
-        <li><a href="#">Tag 2</a></li>
-        <li><a href="#">Tag 3</a></li>
-        <li><a href="#">Tag 4</a></li>
-      </ul>
-    </div>
-  </t:putAttribute>
-</t:insertDefinition>
-- 
2.20.1