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

Upgrade to SWF 2.4 M1 and fix git rebase issues

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-02-01 16:51:58 -05:00
parent 35fcc082a9
commit 2adb680e6a
5 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
booking-faces/pom.xml
View File

@@ -11,7 +11,7 @@
<properties>
<springframework-version>3.2.1.RELEASE</springframework-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<webflow-version>2.4.0.M1</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
<mojarra-version>2.1.7</mojarra-version>
<primefaces-version>3.1.1</primefaces-version>
@@ -20,8 +20,8 @@
<repositories>
<repository>
<id>spring-repository</id>
<name>Spring project snapshots, milestones, and releases</name>
<url>http://repo.springsource.org/snapshot</url>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
</repository>
<repository>
<id>primefaces-repository</id>

26
booking-mvc/pom.xml
View File

@@ -11,8 +11,8 @@
<properties>
<springframework-version>3.2.1.RELEASE</springframework-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
<webflow-version>2.4.0.M1</webflow-version>
<slf4j-version>1.6.1</slf4j-version>
<thymeleaf-version>2.0.15</thymeleaf-version>
<thymeleaf-extras-tiles2-version>2.0.0</thymeleaf-extras-tiles2-version>
<thymeleaf-extras-springsecurity3-version>2.0.0</thymeleaf-extras-springsecurity3-version>
@@ -23,8 +23,8 @@
<repositories>
<repository>
<id>spring-repository</id>
<name>Spring project snapshots, milestones, and releases</name>
<url>http://repo.springsource.org/snapshot</url>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
</repository>
</repositories>
@@ -51,8 +51,18 @@
<artifactId>thymeleaf-extras-springsecurity3</artifactId>
<version>${thymeleaf-extras-springsecurity3-version}</version>
</dependency>
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-conditionalcomments</artifactId>
<version>${thymeleaf-extras-conditionalcomments-version}</version>
</dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
@@ -85,7 +95,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
<artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -96,7 +106,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
<artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -107,7 +117,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
<artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -295,7 +305,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.8</version>
<version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>

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

@@ -23,20 +23,6 @@
<mvc:view-controller path="/login" />
<mvc:view-controller path="/logoutSuccess" />
<!-- Resolves logical view names returned by Controllers to Tiles; a view name to resolve is treated as the name of a tiles definition -->
<bean id="tilesViewResolver" class="org.springframework.js.ajax.AjaxUrlBasedViewResolver">
<property name="viewClass" value="org.springframework.webflow.mvc.view.FlowAjaxTilesView"/>
</bean>
<!-- Configures the Tiles layout system -->
<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
<property name="definitions">
<list>
<value>/WEB-INF/**/views.xml</value>
</list>
</property>
</bean>
<!-- Dispatches requests mapped to flows to FlowHandler implementations -->
<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter">
<property name="flowExecutor" ref="flowExecutor"/>

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

@@ -10,7 +10,7 @@
<properties>
<springframework-version>3.2.1.RELEASE</springframework-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<webflow-version>2.4.0.M1</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
<myfaces-version>2.1.6</myfaces-version>
</properties>
@@ -18,8 +18,8 @@
<repositories>
<repository>
<id>spring-repository</id>
<name>Spring project snapshots, milestones, and releases</name>
<url>http://repo.springsource.org/snapshot</url>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
</repository>
</repositories>

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

@@ -10,15 +10,15 @@
<properties>
<springframework-version>3.2.1.RELEASE</springframework-version>
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
<webflow-version>2.4.0.M1</webflow-version>
<slf4j-version>1.5.10</slf4j-version>
</properties>
<repositories>
<repository>
<id>spring-repository</id>
<name>Spring project snapshots, milestones, and releases</name>
<url>http://repo.springsource.org/snapshot</url>
<name>SpringSource Repository</name>
<url>http://repo.springsource.org/milestone</url>
</repository>
</repositories>