Remove Velocity support
Issue: SPR-13795
This commit is contained in:
Juergen Hoeller
@@ -3,8 +3,8 @@
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:mvc="http://www.springframework.org/schema/mvc"
|
||||
xsi:schemaLocation="
|
||||
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
|
||||
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
|
||||
|
||||
<!--
|
||||
View resolution finds the ContentNegotiationManager created by or
|
||||
@@ -23,7 +23,6 @@
|
||||
<mvc:jsp/>
|
||||
<mvc:tiles/>
|
||||
<mvc:freemarker/>
|
||||
<mvc:velocity/>
|
||||
<mvc:groovy/>
|
||||
<mvc:script-template/>
|
||||
</mvc:view-resolvers>
|
||||
@@ -36,8 +35,6 @@
|
||||
<mvc:template-loader-path location="/org/springframework/web/servlet/view"/>
|
||||
</mvc:freemarker-configurer>
|
||||
|
||||
<mvc:velocity-configurer resource-loader-path="/org/springframework/web/servlet/view"/>
|
||||
|
||||
<mvc:groovy-configurer/>
|
||||
|
||||
<mvc:script-template-configurer engine-name="nashorn" render-function="render"/>
|
||||
|
||||
@@ -2,15 +2,14 @@
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:mvc="http://www.springframework.org/schema/mvc"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
|
||||
|
||||
<mvc:view-resolvers>
|
||||
<mvc:bean-name/>
|
||||
<mvc:jsp view-class="org.springframework.web.servlet.view.InternalResourceView"/>
|
||||
<mvc:tiles/>
|
||||
<mvc:freemarker prefix="freemarker-" suffix=".freemarker" view-names="my*,*Report"/>
|
||||
<mvc:velocity cache-views="false"/>
|
||||
<mvc:groovy/>
|
||||
<mvc:script-template/>
|
||||
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver"/>
|
||||
@@ -31,8 +30,6 @@
|
||||
<mvc:template-loader-path location="/test"/>
|
||||
</mvc:freemarker-configurer>
|
||||
|
||||
<mvc:velocity-configurer resource-loader-path="/test"/>
|
||||
|
||||
<mvc:groovy-configurer resource-loader-path="/test" cache-templates="false" auto-indent="true"/>
|
||||
|
||||
<mvc:script-template-configurer engine-name="nashorn" render-function="render" content-type="text/plain"
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
##
|
||||
## test template for Velocity view with missing method
|
||||
##
|
||||
$command.nonexistent()
|
||||
@@ -1,4 +0,0 @@
|
||||
##
|
||||
## test template for Velocity view with exception
|
||||
##
|
||||
$command.unreliableFileOperation()
|
||||
@@ -1,6 +0,0 @@
|
||||
##
|
||||
## test template for Velocity view
|
||||
##
|
||||
|
||||
NAME
|
||||
$command.name
|
||||
@@ -1,30 +0,0 @@
|
||||
##
|
||||
## test template for Velocity macro test class
|
||||
##
|
||||
|
||||
FORM1
|
||||
#springFormInput("command.spouses[0].name" "")
|
||||
|
||||
FORM2
|
||||
#springFormTextarea("command.spouses[0].name" "")
|
||||
|
||||
FORM3
|
||||
#springFormSingleSelect("command.spouses[0].name" $nameOptionMap "")
|
||||
|
||||
FORM4
|
||||
#springFormMultiSelect("command.spouses" $nameOptionMap "")
|
||||
|
||||
FORM5
|
||||
#springFormRadioButtons("command.spouses[0].name" $nameOptionMap " " "")
|
||||
|
||||
FORM6
|
||||
#springFormPasswordInput("command.spouses[0].name" "")
|
||||
|
||||
FORM7
|
||||
#springFormHiddenInput("command.spouses[0].name" "")
|
||||
|
||||
FORM8
|
||||
#springFormCheckbox("command.spouses[0].name" "")
|
||||
|
||||
FORM9
|
||||
#springFormCheckbox("command.spouses[0].jedi" "")
|
||||
@@ -1,64 +0,0 @@
|
||||
##
|
||||
## test template for Velocity macro test class
|
||||
##
|
||||
|
||||
NAME
|
||||
$command.name
|
||||
|
||||
AGE
|
||||
$command.age
|
||||
|
||||
MESSAGE
|
||||
#springMessage("hello") #springMessage("world")
|
||||
|
||||
DEFAULTMESSAGE
|
||||
#springMessageText("no.such.code" "hi") #springMessageText("no.such.code" "planet")
|
||||
|
||||
THEME
|
||||
#springTheme("hello") #springTheme("world")
|
||||
|
||||
DEFAULTTHEME
|
||||
#springThemeText("no.such.code" "hi!") #springThemeText("no.such.code" "planet!")
|
||||
|
||||
URL
|
||||
#springUrl("/aftercontext.html")
|
||||
|
||||
FORM1
|
||||
#springFormInput("command.name" "")
|
||||
|
||||
FORM2
|
||||
#springFormInput("command.name" 'class="myCssClass"')
|
||||
|
||||
FORM3
|
||||
#springFormTextarea("command.name" "")
|
||||
|
||||
FORM4
|
||||
#springFormTextarea("command.name" "rows=10 cols=30")
|
||||
|
||||
FORM5
|
||||
#springFormSingleSelect("command.name" $nameOptionMap "")
|
||||
|
||||
FORM6
|
||||
#springFormMultiSelect("command.spouses" $nameOptionMap "")
|
||||
|
||||
FORM7
|
||||
#springFormRadioButtons("command.name" $nameOptionMap " " "")
|
||||
|
||||
FORM8
|
||||
#springFormCheckboxes("command.stringArray" $nameOptionMap " " "")
|
||||
|
||||
FORM9
|
||||
#springFormPasswordInput("command.name" "")
|
||||
|
||||
FORM10
|
||||
#springFormHiddenInput("command.name" "")
|
||||
|
||||
FORM15
|
||||
#springFormCheckbox("command.name" "")
|
||||
|
||||
FORM16
|
||||
#springFormCheckbox("command.jedi" "")
|
||||
|
||||
|
||||
ERRORS
|
||||
#springShowErrors(" " "")
|
||||
@@ -1,23 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<toolbox>
|
||||
<xhtml>true</xhtml>
|
||||
<data type="string">
|
||||
<key>foo</key>
|
||||
<value>this is foo.</value>
|
||||
</data>
|
||||
<tool>
|
||||
<key>map</key>
|
||||
<class>java.util.HashMap</class>
|
||||
</tool>
|
||||
<tool>
|
||||
<key>date</key>
|
||||
<scope>application</scope>
|
||||
<class>org.apache.velocity.tools.generic.DateTool</class>
|
||||
</tool>
|
||||
<tool>
|
||||
<key>link</key>
|
||||
<scope>request</scope>
|
||||
<class>org.apache.velocity.tools.view.tools.LinkTool</class>
|
||||
</tool>
|
||||
</toolbox>
|
||||
Reference in New Issue
Block a user