From: Kai Moritz Date: Sun, 31 Aug 2014 17:07:10 +0000 (+0200) Subject: Umstellung auf Thymeleaf: Schritt 2 - Tilesunterstützung aktiviert X-Git-Tag: thymeroot-2.0.0~98 X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=8e8ddfc9757a41e6b5df5997a9d9859de50da8e1;p=website Umstellung auf Thymeleaf: Schritt 2 - Tilesunterstützung aktiviert --- diff --git a/pom.xml b/pom.xml index fd91c8d9..cf5f6688 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,8 @@ 1.6.1 4.0.6.RELEASE 2.1.3.RELEASE + 2.1.1.RELEASE + 2.2.2 1.7.3-SNAPSHOT @@ -78,6 +80,52 @@ ${thymeleaf.version} runtime + + org.thymeleaf.extras + thymeleaf-extras-tiles2 + ${thymeleaf-extras.version} + + + org.thymeleaf + thymeleaf + + + org.thymeleaf + thymeleaf-spring4 + + + runtime + + + org.thymeleaf.extras + thymeleaf-extras-tiles2-spring4 + ${thymeleaf-extras.version} + + + org.thymeleaf + thymeleaf + + + org.thymeleaf + thymeleaf-spring4 + + + runtime + + + + + org.apache.tiles + tiles-core + ${tiles.version} + + + org.slf4j + jcl-over-slf4j + + + runtime + @@ -111,6 +159,12 @@ ${slf4j.version} runtime + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + runtime + diff --git a/src/main/resources/spring/mvc.xml b/src/main/resources/spring/mvc.xml index e2cdc384..87c2a010 100644 --- a/src/main/resources/spring/mvc.xml +++ b/src/main/resources/spring/mvc.xml @@ -3,6 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:context="http://www.springframework.org/schema/context" + xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd @@ -10,6 +11,8 @@ http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util-4.0.xsd "> @@ -41,6 +44,26 @@ + + + + + + + + + + + + + + + + + classpath:/spring/tiles.xml + + + @@ -55,6 +78,11 @@ + + + + + diff --git a/src/main/resources/spring/tiles.xml b/src/main/resources/spring/tiles.xml index 120e6049..d9dd9a66 100644 --- a/src/main/resources/spring/tiles.xml +++ b/src/main/resources/spring/tiles.xml @@ -1,9 +1,26 @@ + "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" + "http://tiles.apache.org/dtds/tiles-config_2_1.dtd"> + + + + + + + + + + diff --git a/src/main/webapp/thymeleaf/404.html b/src/main/webapp/thymeleaf/404.html deleted file mode 100644 index ab9c2948..00000000 --- a/src/main/webapp/thymeleaf/404.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - TITLE - - - - -
HEADER
-

TITLE

-
CONTENT
-
FOOTER
- - diff --git a/src/main/webapp/thymeleaf/error.html b/src/main/webapp/thymeleaf/error.html deleted file mode 100644 index 9084f7f0..00000000 --- a/src/main/webapp/thymeleaf/error.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - TITLE - - - - -
HEADER
-

TITLE

-
CONTENT
-
FOOTER
- - diff --git a/src/main/webapp/thymeleaf/index.html b/src/main/webapp/thymeleaf/index.html deleted file mode 100644 index 7f29820f..00000000 --- a/src/main/webapp/thymeleaf/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - TITLE - - - - -
HEADER
-

TITLE

-
CONTENT
-
FOOTER
- - diff --git a/src/main/webapp/thymeleaf/templates/layout.html b/src/main/webapp/thymeleaf/templates/layout.html new file mode 100644 index 00000000..f019b462 --- /dev/null +++ b/src/main/webapp/thymeleaf/templates/layout.html @@ -0,0 +1,33 @@ + + + + + Title + + + +
HEADER
+
+ +

Title

+ +
+ + + + + +

Content

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Praesent scelerisque neque neque, ac elementum quam dignissim interdum. + Phasellus et placerat elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Praesent scelerisque neque neque, ac elementum quam dignissim interdum. + Phasellus et placerat elit. +

+
+
+ +
FOOTER
+ + \ No newline at end of file diff --git a/src/main/webapp/thymeleaf/views/404.html b/src/main/webapp/thymeleaf/views/404.html index 18483826..6c22532b 100644 --- a/src/main/webapp/thymeleaf/views/404.html +++ b/src/main/webapp/thymeleaf/views/404.html @@ -1,10 +1,10 @@ - + - 404: Page not found + 404: Page not found -
+

We do not know, where you are.

And we do not know, why you are here.

But we can tell you: WE ARE SORRY!

diff --git a/src/main/webapp/thymeleaf/views/error.html b/src/main/webapp/thymeleaf/views/error.html index ad0457a4..a07dc238 100644 --- a/src/main/webapp/thymeleaf/views/error.html +++ b/src/main/webapp/thymeleaf/views/error.html @@ -1,10 +1,10 @@ - + - An unexpected Error occured! + An unexpected Error occured! -
+

We do not know, what happend.

But we can tell you: WE ARE SORRY!

Really.

diff --git a/src/main/webapp/thymeleaf/views/index.html b/src/main/webapp/thymeleaf/views/index.html index b44963cd..101bdb88 100644 --- a/src/main/webapp/thymeleaf/views/index.html +++ b/src/main/webapp/thymeleaf/views/index.html @@ -1,10 +1,10 @@ - + - Index + Index -
+

Inhalt der Index-Seite...