From d53a4e6b1196f66f6f1768c013a4d9759be70dd2 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Thu, 19 Sep 2013 01:48:21 +0200 Subject: [PATCH] =?utf8?q?Spring=20eingef=C3=BChrt,=20um=20die=20Tiles-Kon?= =?utf8?q?figuration=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 @@ UTF-8 + 2.2.1 + 1.2 + 3.0.1 1.5.8 + 3.2.4.RELEASE 3.0.1 @@ -47,6 +51,13 @@ + + + org.springframework + spring-webmvc + ${springframework.version} + + org.apache.tiles @@ -61,7 +72,32 @@ runtime + + + javax.servlet + javax.servlet-api + ${servlet-api.version} + provided + + + javax.servlet.jsp + javax.servlet.jsp-api + ${jsp-api.version} + provided + + + javax.servlet + jstl + ${jstl.version} + runtime + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j slf4j-log4j12 @@ -89,6 +125,16 @@ branding + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + utf8 + true + + org.lesscss lesscss-maven-plugin 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + /*.html=urlFilenameViewController + /**/*.html=urlFilenameViewController + + + + + + + + + + + + + + + + + + + + /WEB-INF/spring/tiles.xml + + + + + + 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 @@ 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" %>

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do + Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation 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 @@

Navigation

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" %> + + + +

Navigation

+ + +
+ +

Recent Posts

+ +

Categories

+ +

Tags

+ +
+
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 @@

Navigation

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 @@

Navigation

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 @@

Navigation