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

Upgrade to Web Flow 2.4.0

Browse Source
This commit is contained in:
Rossen Stoyanchev
2014-05-29 11:39:06 -04:00
parent bdd5bde4c8
commit bb265fbe5a
10 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
booking-faces/pom.xml
View File

@@ -9,19 +9,21 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<webflow-version>2.4.0.RC1</webflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<webflow-version>2.4.0.RELEASE</webflow-version>
<spring-framework-version>4.0.5.RELEASE</spring-framework-version>
<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<slf4j-version>1.6.1</slf4j-version>
<mojarra-version>2.2.5</mojarra-version>
<primefaces-version>4.0</primefaces-version>
<primefaces-version>5.0</primefaces-version>
</properties>
<repositories>
<repository>
<id>spring-repository</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<repository>
<id>primefaces-repository</id>
@@ -29,11 +31,6 @@
<url>http://repository.primefaces.org</url>
<layout>default</layout>
</repository>
<repository>
<id>spring-snapshots</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/snapshot</url>
</repository>
</repositories>
<dependencyManagement>

2
booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java
View File

@@ -33,7 +33,7 @@ public class HotelLazyDataModel extends LazyDataModel<Hotel> {
}
@Override
public List<Hotel> load(int first, int pageSize, String sortField, SortOrder order, Map<String, String> filters) {
public List<Hotel> load(int first, int pageSize, String sortField, SortOrder order, Map<String, Object> filters) {
this.searchCriteria.setCurrentPage(first / pageSize + 1);
this.hotels = bookingService.findHotels(searchCriteria, first, sortField, order.equals(SortOrder.ASCENDING));
return hotels;

23
booking-mvc/pom.xml
View File

@@ -9,27 +9,24 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<webflow-version>2.4.0.RC1</webflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<webflow-version>2.4.0.RELEASE</webflow-version>
<spring-framework-version>4.0.5.RELEASE</spring-framework-version>
<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<slf4j-version>1.7.5</slf4j-version>
<thymeleaf-version>2.1.2.RELEASE</thymeleaf-version>
<thymeleaf-version>2.1.3.RELEASE</thymeleaf-version>
<thymeleaf-extras-tiles2-version>2.1.1.RELEASE</thymeleaf-extras-tiles2-version>
<thymeleaf-extras-springsecurity3-version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3-version>
<thymeleaf-extras-conditionalcomments-version>2.1.0.RELEASE</thymeleaf-extras-conditionalcomments-version>
<thymeleaf-extras-conditionalcomments-version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments-version>
<tiles-version>2.2.2</tiles-version>
</properties>
<repositories>
<repository>
<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>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>

14
booking-portlet-faces/pom.xml
View File

@@ -9,17 +9,19 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springwebflow-version>2.4.0.RC1</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<slf4j-version>1.5.10</slf4j-version>
<springwebflow-version>2.4.0.RELEASE</springwebflow-version>
<spring-framework-version>4.0.5.RELEASE</spring-framework-version>
<slf4j-version>1.7.5</slf4j-version>
<myfaces-version>2.1.6</myfaces-version>
</properties>
<repositories>
<repository>
<id>spring-repository</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>

6
booking-portlet-faces/src/main/resources/log4j.xml
View File

@@ -32,15 +32,15 @@
</logger>
<logger name="org.springframework.web">
<level value="debug" />
<level value="info" />
</logger>
<logger name="org.springframework.faces">
<level value="debug" />
<level value="info" />
</logger>
<logger name="org.springframework.webflow">
<level value="debug" />
<level value="info" />
</logger>
<!-- Root Logger -->

16
booking-portlet-mvc/pom.xml
View File

@@ -9,16 +9,18 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<springwebflow-version>2.4.0.RC1</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<slf4j-version>1.5.10</slf4j-version>
<springwebflow-version>2.4.0.RELEASE</springwebflow-version>
<spring-framework-version>4.0.5.RELEASE</spring-framework-version>
<slf4j-version>1.7.5</slf4j-version>
</properties>
<repositories>
<repository>
<id>spring-repository</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
@@ -146,7 +148,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

4
booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
version="2.5">
<!--
- Location of the XML file that defines the root application context

18
primefaces-showcase/pom.xml
View File

@@ -10,10 +10,10 @@
<properties>
<java-version>1.6</java-version>
<springwebflow-version>2.4.0.RC1</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<org.slf4j-version>1.6.1</org.slf4j-version>
<springwebflow-version>2.4.0.RELEASE</springwebflow-version>
<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<primefaces-version>4.0</primefaces-version>
<org.slf4j-version>1.7.5</org.slf4j-version>
</properties>
<dependencyManagement>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring-framework-version}</version>
<version>4.0.5.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -149,7 +149,7 @@
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>3.4.2</version>
<version>${primefaces-version}</version>
</dependency>
<!-- File uploads -->
<dependency>
@@ -184,9 +184,9 @@
<repositories>
<repository>
<id>springsource</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>

2
primefaces-showcase/src/main/webapp/WEB-INF/views/home.xhtml
View File

@@ -115,7 +115,7 @@
<!--
popup with form validation
popup with multiple state transitions
breadcrumb(http://forum.springsource.org/showthread.php?t=94207)
breadcrumb
custom jsf component
jpa persistence
file upload

22
webflow-showcase/pom.xml
View File

@@ -10,10 +10,9 @@
<properties>
<java-version>1.6</java-version>
<springwebflow-version>2.4.0.RC1</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
<org.slf4j-version>1.5.10</org.slf4j-version>
<springwebflow-version>2.4.0.RELEASE</springwebflow-version>
<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<org.slf4j-version>1.7.5</org.slf4j-version>
</properties>
<dependencyManagement>
@@ -21,7 +20,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring-framework-version}</version>
<version>4.0.5.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -54,6 +53,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-binding</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-webflow</artifactId>
@@ -222,16 +226,16 @@
<repositories>
<!-- For testing against latest Spring snapshots -->
<repository>
<id>springsource</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
<id>spring-milestone</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<!-- For Hibernate Validator -->
<repository>
<id>org.jboss.repository.releases</id>
<id>jboss</id>
<name>JBoss Maven Release Repository</name>
<url>https://repository.jboss.org/nexus/content/repositories/releases</url>
<snapshots><enabled>false</enabled></snapshots>