projects
/
website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Paket umbenannt und überarbeitet (Feinschliff)
[website]
/
src
/
main
/
resources
/
spring
/
mvc.xml
diff --git
a/src/main/resources/spring/mvc.xml
b/src/main/resources/spring/mvc.xml
index
4bf0a0a
..
04c5637
100644
(file)
--- a/
src/main/resources/spring/mvc.xml
+++ b/
src/main/resources/spring/mvc.xml
@@
-15,12
+15,15
@@
http://www.springframework.org/schema/util/spring-util-4.0.xsd
">
http://www.springframework.org/schema/util/spring-util-4.0.xsd
">
- <!-- Damit das DispatcherServlet auf /* gemappt werden kann -->
+ <!-- Resolve application-parameters through java-systemproperties -->
+ <context:property-placeholder location="classpath:website.properties" />
+
+ <!-- Necesarry, to map the DispatcherServlet on /* -->
<mvc:default-servlet-handler/>
<mvc:view-controller path="/" view-name="index"/>
<!-- Scann classpath for classes anntated as components -->
<mvc:default-servlet-handler/>
<mvc:view-controller path="/" view-name="index"/>
<!-- Scann classpath for classes anntated as components -->
- <context:component-scan base-package="de.juplo.
branding
"/>
+ <context:component-scan base-package="de.juplo.
website
"/>
<bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
<property name="mappings">
<bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
<property name="mappings">
@@
-44,6
+47,8
@@
<!-- Thymeleaf Spring-View-Resolver -->
<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
<property name="templateEngine" ref="templateEngine" />
<!-- Thymeleaf Spring-View-Resolver -->
<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
<property name="templateEngine" ref="templateEngine" />
+ <property name="characterEncoding" value="UTF-8" />
+ <property name="contentType" value="text/html; charset=UTF-8" />
</bean>
</bean>
@@
-52,7
+57,8
@@
<property name="prefix" value="/thymeleaf/" />
<property name="suffix" value=".html" />
<property name="templateMode" value="HTML5" />
<property name="prefix" value="/thymeleaf/" />
<property name="suffix" value=".html" />
<property name="templateMode" value="HTML5" />
- <property name="cacheable" value="false" /><!-- Only for development -->
+ <property name="characterEncoding" value="UTF-8" />
+ <property name="cacheable" value="${website.cacheable}" />
</bean>
<!-- Thymeleaf Spring4-Template-Engine -->
</bean>
<!-- Thymeleaf Spring4-Template-Engine -->
@@
-61,6
+67,7
@@
<property name="additionalDialects">
<util:set>
<bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
<property name="additionalDialects">
<util:set>
<bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
+ <bean class="org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect"/>
</util:set>
</property>
</bean>
</util:set>
</property>
</bean>