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> <version>1.0.0.BUILD-SNAPSHOT</version>
<properties> <properties>
<webflow-version>2.4.0.RC1</webflow-version> <webflow-version>2.4.0.RELEASE</webflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version> <spring-framework-version>4.0.5.RELEASE</spring-framework-version>
<springsecurity-version>3.2.0.RELEASE</springsecurity-version> <springsecurity-version>3.2.4.RELEASE</springsecurity-version>
<slf4j-version>1.6.1</slf4j-version> <slf4j-version>1.6.1</slf4j-version>
<mojarra-version>2.2.5</mojarra-version> <mojarra-version>2.2.5</mojarra-version>
<primefaces-version>4.0</primefaces-version> <primefaces-version>5.0</primefaces-version>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
<id>spring-repository</id> <id>spring</id>
<name>SpringSource Repository</name> <name>Spring Repository</name>
<url>http://repo.springsource.org/milestone</url> <url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository> </repository>
<repository> <repository>
<id>primefaces-repository</id> <id>primefaces-repository</id>
@@ -29,11 +31,6 @@
<url>http://repository.primefaces.org</url> <url>http://repository.primefaces.org</url>
<layout>default</layout> <layout>default</layout>
</repository> </repository>
<repository>
<id>spring-snapshots</id>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/snapshot</url>
</repository>
</repositories> </repositories>
<dependencyManagement> <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 @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.searchCriteria.setCurrentPage(first / pageSize + 1);
this.hotels = bookingService.findHotels(searchCriteria, first, sortField, order.equals(SortOrder.ASCENDING)); this.hotels = bookingService.findHotels(searchCriteria, first, sortField, order.equals(SortOrder.ASCENDING));
return hotels; return hotels;

23
booking-mvc/pom.xml
View File

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

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

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

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

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

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

@@ -9,16 +9,18 @@
<version>1.0.0.BUILD-SNAPSHOT</version> <version>1.0.0.BUILD-SNAPSHOT</version>
<properties> <properties>
<springwebflow-version>2.4.0.RC1</springwebflow-version> <springwebflow-version>2.4.0.RELEASE</springwebflow-version>
<spring-framework-version>4.0.3.RELEASE</spring-framework-version> <spring-framework-version>4.0.5.RELEASE</spring-framework-version>
<slf4j-version>1.5.10</slf4j-version> <slf4j-version>1.7.5</slf4j-version>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
<id>spring-repository</id> <id>spring</id>
<name>SpringSource Repository</name> <name>Spring Repository</name>
<url>http://repo.springsource.org/milestone</url> <url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository> </repository>
</repositories> </repositories>
@@ -146,7 +148,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<version>4.1.0.Beta1</version> <version>4.3.0.Final</version>
</dependency> </dependency>
<!-- <!--
JAXB is needed when running on Java 5. In this environment these dependencies have to be added 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"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
version="2.4"> version="2.5">
<!-- <!--
- Location of the XML file that defines the root application context - Location of the XML file that defines the root application context

18
primefaces-showcase/pom.xml
View File

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

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

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

22
webflow-showcase/pom.xml
View File

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