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;