Spring/spring-webflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade Spring Web Flow to version 2.3.3

Browse Source
This commit is contained in:
Rossen Stoyanchev
2014-01-26 10:10:47 -05:00
parent 2f28803ac5
commit 1ccc67b79e
9 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
booking-faces/pom.xml
View File

@@ -10,10 +10,10 @@
<properties>
<springframework-version>4.0.0.RELEASE</springframework-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<webflow-version>2.3.3.RELEASE</webflow-version>
<slf4j-version>1.6.1</slf4j-version>
<mojarra-version>2.2.4</mojarra-version>
<mojarra-version>2.2.5</mojarra-version>
<primefaces-version>4.0</primefaces-version>
</properties>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>3.5.0-Final</version>
<version>3.6.9.Final</version>
</dependency>
<!-- JSF: Mojarra, PrimeFaces -->
<dependency>
@@ -217,7 +217,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

2
booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
View File

@@ -4,7 +4,7 @@
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
<!-- Configure Spring Security -->
<security:http auto-config="true" use-expressions="true">

17
booking-mvc/pom.xml
View File

@@ -9,9 +9,9 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springframework-version>3.2.2.RELEASE</springframework-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<webflow-version>2.4.0.M1</webflow-version>
<springframework-version>4.0.0.RELEASE</springframework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<webflow-version>2.3.3.RELEASE</webflow-version>
<slf4j-version>1.7.5</slf4j-version>
<thymeleaf-version>2.0.15</thymeleaf-version>
<thymeleaf-extras-tiles2-version>2.0.0</thymeleaf-extras-tiles2-version>
@@ -22,10 +22,15 @@
<repositories>
<repository>
<id>spring-repository</id>
<id>spring-milestones</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
</repository>
<repository>
<id>spring-snapshots</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/snapshot</url>
</repository>
</repositories>
<dependencies>
@@ -161,7 +166,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>4.2.0.Final</version>
<version>3.6.9.Final</version>
</dependency>
<!-- Servlet -->
@@ -214,7 +219,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.1.0.Beta1</version>
<version>4.3.0.Final</version>
</dependency>
<!--
JAXB is needed when running on Java 5. In this environment these dependencies have to be added

2
booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
View File

@@ -4,7 +4,7 @@
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
<!-- Configure Spring Security -->
<security:http auto-config="true" use-expressions="true">

2
booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
View File

@@ -26,7 +26,7 @@
<!-- Dispatches requests mapped to flows to FlowHandler implementations -->
<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter">
<property name="flowExecutor" ref="flowExecutor"/>
<property name="saveOutputToFlashScopeOnRedirect" value="true"/>
<!-- <property name="saveOutputToFlashScopeOnRedirect" value="true"/> -->
</bean>
<!-- Custom FlowHandler for the hotel booking flow -->

23
primefaces-showcase/pom.xml
View File

@@ -9,10 +9,10 @@
<version>1.0.0-BUILD-SNAPSHOT</version>
<properties>
<java-version>1.5</java-version>
<springframework-version>3.2.1.RELEASE</springframework-version>
<springwebflow-version>2.4.0.M1</springwebflow-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<java-version>1.6</java-version>
<springframework-version>4.0.0.RELEASE</springframework-version>
<springwebflow-version>2.3.3.RELEASE</springwebflow-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<org.slf4j-version>1.6.1</org.slf4j-version>
</properties>
@@ -38,6 +38,21 @@
<artifactId>spring-webmvc</artifactId>
<version>${springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-binding</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-js</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-webflow</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-faces</artifactId>

2
primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
View File

@@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.1.xsd">
http://www.springframework.org/schema/security/spring-security-3.2.xsd">
<!--
Configure Spring Security

11
webflow-showcase/pom.xml
View File

@@ -9,10 +9,10 @@
<version>1.0.0-BUILD-SNAPSHOT</version>
<properties>
<java-version>1.5</java-version>
<springframework-version>3.2.1.RELEASE</springframework-version>
<springwebflow-version>2.4.0.M1</springwebflow-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<java-version>1.6</java-version>
<springframework-version>4.0.0.RELEASE</springframework-version>
<springwebflow-version>2.3.3.RELEASE</springwebflow-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<org.slf4j-version>1.5.10</org.slf4j-version>
</properties>
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>2.1.3</version>
<version>2.2.2</version>
<exclusions>
<!-- Exclude Commons Logging in favor of SLF4j -->
<exclusion>
@@ -222,6 +222,7 @@
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<!-- For Hibernate Validator -->
<repository>
<id>org.jboss.repository.releases</id>

2
webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
View File

@@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.1.xsd">
http://www.springframework.org/schema/security/spring-security-3.2.xsd">
<!--
Configure Spring Security