projects
/
website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JS-Dateien für Rückwärtskompatibilität unter alten Namen zugänglich gemacht
[website]
/
src
/
main
/
resources
/
spring
/
mvc.xml
diff --git
a/src/main/resources/spring/mvc.xml
b/src/main/resources/spring/mvc.xml
index
e2cdc38
..
50f4fc7
100644
(file)
--- 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: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
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/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
">
<!-- Damit das DispatcherServlet auf /* gemappt werden kann -->
">
<!-- Damit das DispatcherServlet auf /* gemappt werden kann -->
@@
-55,6
+58,12
@@
<!-- Thymeleaf Spring4-Template-Engine -->
<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
<property name="templateResolver" ref="templateResolver" />
<!-- Thymeleaf Spring4-Template-Engine -->
<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
<property name="templateResolver" ref="templateResolver" />
+ <property name="additionalDialects">
+ <util:set>
+ <bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
+ <bean class="org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect"/>
+ </util:set>
+ </property>
</bean>
</beans>
</bean>
</beans>