iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4664 from eugenp/upgrade-webflow

Browse Source 
upgrade webflow
This commit is contained in:
Loredana Crusoveanu 2018-07-10 00:21:51 +03:00 committed by GitHub
commit acf731377e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-mvc-webflow/pom.xml
View File

@ -83,10 +83,10 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.3.4.RELEASE</org.springframework.version> <org.springframework.version>5.0.1.RELEASE</org.springframework.version>
<!-- Spring Web Flow --> <!-- Spring Web Flow -->
<spring.webflow>2.4.4.RELEASE</spring.webflow> <spring.webflow>2.5.0.RELEASE</spring.webflow>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
@ -94,8 +94,6 @@
<httpcore.version>4.4.5</httpcore.version> <httpcore.version>4.4.5</httpcore.version>
<httpclient.version>4.5.2</httpclient.version> <httpclient.version>4.5.2</httpclient.version>
<rest-assured.version>2.9.0</rest-assured.version>
<!-- Maven plugins --> <!-- Maven plugins -->
<maven-war-plugin.version>2.6</maven-war-plugin.version> <maven-war-plugin.version>2.6</maven-war-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version> <maven-resources-plugin.version>2.7</maven-resources-plugin.version>

6
spring-mvc-webflow/src/main/java/org/baeldung/spring/WebMvcConfig.java
View File

@ -2,12 +2,10 @@ package org.baeldung.spring;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.JstlView; import org.springframework.web.servlet.view.JstlView;
import org.springframework.webflow.mvc.servlet.FlowHandlerAdapter; import org.springframework.webflow.mvc.servlet.FlowHandlerAdapter;
@ -15,7 +13,7 @@ import org.springframework.webflow.mvc.servlet.FlowHandlerMapping;
@EnableWebMvc @EnableWebMvc
@Configuration @Configuration
public class WebMvcConfig extends WebMvcConfigurerAdapter { public class WebMvcConfig implements WebMvcConfigurer {
@Autowired @Autowired
private WebFlowConfig webFlowConfig; private WebFlowConfig webFlowConfig;

2
spring-mvc-webflow/src/main/webapp/WEB-INF/flows/activation-flow.xml
View File

@ -2,7 +2,7 @@
<flow xmlns="http://www.springframework.org/schema/webflow" <flow xmlns="http://www.springframework.org/schema/webflow"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/webflow xsi:schemaLocation="http://www.springframework.org/schema/webflow
http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"> http://www.springframework.org/schema/webflow/spring-webflow.xsd">
<view-state id="activation"> <view-state id="activation">