From: Kai Moritz Date: Wed, 18 Sep 2013 23:48:21 +0000 (+0200) Subject: Spring eingeführt, um die Tiles-Konfiguration zu vereinfachen X-Git-Tag: thymeroot-2.0.0~184 X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=d53a4e6b1196f66f6f1768c013a4d9759be70dd2;p=website Spring eingeführt, um die Tiles-Konfiguration zu vereinfachen --- 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/spring/tiles.xml b/src/main/webapp/WEB-INF/spring/tiles.xml new file mode 100644 index 00000000..ffeaa646 --- /dev/null +++ b/src/main/webapp/WEB-INF/spring/tiles.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file 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

Section-Menu

diff --git a/src/main/webapp/WEB-INF/tiles.xml b/src/main/webapp/WEB-INF/tiles.xml deleted file mode 100644 index ffeaa646..00000000 --- a/src/main/webapp/WEB-INF/tiles.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file 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

+

Section-Menu

+ + + +

Recent Posts

+ +

Categories

+ +

Tags

+ + + diff --git a/src/main/webapp/WEB-INF/views/contact.jsp b/src/main/webapp/WEB-INF/views/contact.jsp new file mode 100644 index 00000000..0626885d --- /dev/null +++ b/src/main/webapp/WEB-INF/views/contact.jsp @@ -0,0 +1,8 @@ +<%@page contentType="text/html;charset=UTF-8"%> +<%@page pageEncoding="UTF-8"%> +<%@page session="false" %> +<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %> + + + + diff --git a/src/main/webapp/WEB-INF/views/impressum.jsp b/src/main/webapp/WEB-INF/views/impressum.jsp new file mode 100644 index 00000000..5519596c --- /dev/null +++ b/src/main/webapp/WEB-INF/views/impressum.jsp @@ -0,0 +1,8 @@ +<%@page contentType="text/html;charset=UTF-8"%> +<%@page pageEncoding="UTF-8"%> +<%@page session="false" %> +<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %> + + + + diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp new file mode 100644 index 00000000..27594729 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -0,0 +1,7 @@ +<%@page contentType="text/html;charset=UTF-8"%> +<%@page pageEncoding="UTF-8"%> +<%@page session="false" %> +<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %> + + + diff --git a/src/main/webapp/WEB-INF/views/projects.jsp b/src/main/webapp/WEB-INF/views/projects.jsp new file mode 100644 index 00000000..c39e5c53 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/projects.jsp @@ -0,0 +1,24 @@ +<%@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

+

Section-Menu

+ +

Submenu for section Projects

+ + + diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp new file mode 100644 index 00000000..fff0e392 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp @@ -0,0 +1,35 @@ +<%@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

+

Section-Menu

+ +

+ Submenu for section + Projects +

+ + + diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp new file mode 100644 index 00000000..e29a1c68 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp @@ -0,0 +1,35 @@ +<%@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

+

Section-Menu

+ +

+ Submenu for section + Projects +

+ + + diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp new file mode 100644 index 00000000..251cb31d --- /dev/null +++ b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp @@ -0,0 +1,35 @@ +<%@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

+

Section-Menu

+ +

+ Submenu for section + Projects +

+ + + diff --git a/src/main/webapp/WEB-INF/views/projects/typo.jsp b/src/main/webapp/WEB-INF/views/projects/typo.jsp new file mode 100644 index 00000000..a55864c1 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/projects/typo.jsp @@ -0,0 +1,98 @@ +<%@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

+

Section-Menu

+ +

+ Submenu for section + Projects +

+ + + +

+ 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 reprehenderit + in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident, + sunt in culpa qui officia deserunt mollit anim id est laborum. +

+

Ein Link im Titel

+

Ein Link im Text.

+

Normal / Italic / Bold / Bold+Italic

+
    +
  • normal
    • +
  • italic
    • +
  • bold
    • +
  • bold italic
    • +
+

+ ÄäÖöÜüß@€¢ + ÄäÖöÜüß@€¢ + ÄäÖöÜüß@€¢ + ÄäÖöÜüß@€¢ +

+

H1: Heading

+

H2: Heading

+

H3: Heading

+

H4: Heading

+

H1: Heading

+

+ 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 + reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in + culpa qui officia deserunt mollit anim id est laborum. +

+

H2: Heading

+

+ 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 + reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in + culpa qui officia deserunt mollit anim id est laborum. +

+

H3: Heading

+

+ 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 + reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in + culpa qui officia deserunt mollit anim id est laborum. +

+

H4: Heading

+

+ 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 + reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in + culpa qui officia deserunt mollit anim id est laborum. +

+ + 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 @@ branding + + + + contextConfigLocation + + /WEB-INF/spring/mvc.xml + + + - org.apache.tiles.web.startup.simple.SimpleTilesListener + org.springframework.web.context.ContextLoaderListener + + + + characterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + + characterEncodingFilter + /* + + + + + + + Spring MVC Dispatcher Servlet + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + + + + 1 + + + + Spring MVC Dispatcher Servlet + *.html + + 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" %> - - - -

Navigation

-

Section-Menu

- - - -
-

Recent Posts

- -

Categories

- -

Tags

- -
- - diff --git a/src/main/webapp/contact.jsp b/src/main/webapp/contact.jsp deleted file mode 100644 index 0626885d..00000000 --- a/src/main/webapp/contact.jsp +++ /dev/null @@ -1,8 +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" %> - - - - diff --git a/src/main/webapp/impressum.jsp b/src/main/webapp/impressum.jsp deleted file mode 100644 index 5519596c..00000000 --- a/src/main/webapp/impressum.jsp +++ /dev/null @@ -1,8 +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" %> - - - - diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp deleted file mode 100644 index 27594729..00000000 --- a/src/main/webapp/index.jsp +++ /dev/null @@ -1,7 +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" %> - - - diff --git a/src/main/webapp/projects.jsp b/src/main/webapp/projects.jsp deleted file mode 100644 index 9a6bac63..00000000 --- a/src/main/webapp/projects.jsp +++ /dev/null @@ -1,24 +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" %> - - - -

Navigation

-

Section-Menu

- -

Submenu for section Projects

- - - diff --git a/src/main/webapp/projects/fix-swf.jsp b/src/main/webapp/projects/fix-swf.jsp deleted file mode 100644 index 703f4451..00000000 --- a/src/main/webapp/projects/fix-swf.jsp +++ /dev/null @@ -1,35 +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" %> - - - -

Navigation

-

Section-Menu

- -

- Submenu for section - Projects -

- - - diff --git a/src/main/webapp/projects/fix-swf/getting-started.jsp b/src/main/webapp/projects/fix-swf/getting-started.jsp deleted file mode 100644 index 89d847d8..00000000 --- a/src/main/webapp/projects/fix-swf/getting-started.jsp +++ /dev/null @@ -1,35 +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" %> - - - -

Navigation

-

Section-Menu

- -

- Submenu for section - Projects -

- - - diff --git a/src/main/webapp/projects/fix-swf/overview.jsp b/src/main/webapp/projects/fix-swf/overview.jsp deleted file mode 100644 index c43e6eb1..00000000 --- a/src/main/webapp/projects/fix-swf/overview.jsp +++ /dev/null @@ -1,35 +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" %> - - - -

Navigation

-

Section-Menu

- -

- Submenu for section - Projects -

- - - diff --git a/src/main/webapp/projects/typo.jsp b/src/main/webapp/projects/typo.jsp deleted file mode 100644 index db0c38a7..00000000 --- a/src/main/webapp/projects/typo.jsp +++ /dev/null @@ -1,98 +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" %> - - - -

Navigation

-

Section-Menu

- -

- Submenu for section - Projects -

- - - -

- 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 reprehenderit - in voluptate velit esse cillum dolore eu fugiat nulla pariatur. - Excepteur sint occaecat cupidatat non proident, - sunt in culpa qui officia deserunt mollit anim id est laborum. -

-

Ein Link im Titel

-

Ein Link im Text.

-

Normal / Italic / Bold / Bold+Italic

-
    -
  • normal
    • -
  • italic
    • -
  • bold
    • -
  • bold italic
    • -
-

- ÄäÖöÜüß@€¢ - ÄäÖöÜüß@€¢ - ÄäÖöÜüß@€¢ - ÄäÖöÜüß@€¢ -

-

H1: Heading

-

H2: Heading

-

H3: Heading

-

H4: Heading

-

H1: Heading

-

- 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 - reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla - pariatur. Excepteur sint occaecat cupidatat non proident, sunt in - culpa qui officia deserunt mollit anim id est laborum. -

-

H2: Heading

-

- 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 - reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla - pariatur. Excepteur sint occaecat cupidatat non proident, sunt in - culpa qui officia deserunt mollit anim id est laborum. -

-

H3: Heading

-

- 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 - reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla - pariatur. Excepteur sint occaecat cupidatat non proident, sunt in - culpa qui officia deserunt mollit anim id est laborum. -

-

H4: Heading

-

- 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 - reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla - pariatur. Excepteur sint occaecat cupidatat non proident, sunt in - culpa qui officia deserunt mollit anim id est laborum. -

- -