将平台升至 Spring 5.3.9+velocity2.3+velocity-tools3.1

在 Spring 5.3.9下升级 Velocity 1.7.x 至 velocity2.3 + velocity-tools3.1 出现的问题，记录中...

spring-webmvc-4.3.9.RELEASE.jar 中 org/springframework/web/servlet/view/velocity 下

VelocityConfig.java

VelocityConfigurer.java

VelocityLayoutView.java

VelocityLayoutViewResolver.java

VelocityToolboxView.java

VelocityView.java

VelocityViewResolver.java

spring.vm

和 spring-context-support-4.3.9.RELEASE.jar中 org/springframework/ui/velocity下

SpringResourceLoader.java

VelocityEngineFactory.java

附上-spring-webMVC源码地址 https://github.com/spring-projects/spring-framework/tree/4.3.x/spring-webmvc

修改部分源码其中VelocityToolboxView.java类中第40行，

protected Context createVelocityContext(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response)
    throws Exception
  {
    ChainedContext velocityContext = new ChainedContext(new VelocityContext(model), getVelocityEngine(), request, response, getServletContext());
    if (getToolboxConfigLocation() != null)
    {
      ToolboxManager toolboxManager = ServletToolboxManager.getInstance(
        getServletContext(), getToolboxConfigLocation());
      Map<String, Object> toolboxContext = toolboxManager.getToolbox(velocityContext);
      //将Map<?, ?>替换成了Map<String, Object>，避免类型转换错误
      velocityContext.setToolbox(toolboxContext);
    }
    return velocityContext;
  }