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

SWF-1226 Upgrade dependencies to Spring 3.0.2.RELEASE, Portlet API 2.0, and Tiles 2.1.2. Change AjaxTilesView to be compatible with and take advantage of Tiles 2.1.2 features.

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-04-19 05:33:19 +00:00
parent 443b714b5d
commit c6900f31dc
36 changed files with 336 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-webflow-samples/booking-faces/ivy.xml
View File

@@ -33,15 +33,15 @@
<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->runtime"/>
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->runtime"/>
<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.4.A" conf="compile->runtime"/>
<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="compile->jsf12"/>
<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->runtime"/>
@@ -50,7 +50,7 @@
<!-- test-time only dependencies -->
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->runtime" />
<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC01" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.2.RELEASE" conf="test->runtime"/>
</dependencies>

2
spring-webflow-samples/booking-faces/pom.xml
View File

@@ -196,7 +196,7 @@
</plugins>
</build>
<properties>
<spring.version>2.5.6.SEC01</spring.version>
<spring.version>3.0.2.RELEASE</spring.version>
<jsf.version>1.2.0.09</jsf.version>
</properties>
</project>

29
spring-webflow-samples/booking-mvc/ivy.xml
View File

@@ -28,24 +28,25 @@
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="compile->runtime"/>
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="compile->runtime"/>
<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="compile->runtime"/>
<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles" rev="2.0.5" conf="compile->runtime"/>
<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.core" rev="2.0.5.osgi" conf="compile->runtime"/>
<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.0.5" conf="compile->runtime"/>
<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles" rev="2.1.2.osgi" conf="compile->runtime"/>
<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.core" rev="2.1.2.osgi" conf="compile->runtime"/>
<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.1.2" conf="compile->runtime"/>
<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.servlet" rev="2.1.2" conf="compile->runtime"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="compile->runtime"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.0.ga" conf="compile->runtime"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->runtime"/>
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->runtime"/>
<dependency org="org.ognl" name="com.springsource.org.ognl" rev="2.6.9" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.6.SEC01" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.4.A" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security.taglibs" rev="2.0.4.A" conf="compile->runtime"/>
<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->runtime"/>
@@ -54,7 +55,7 @@
<!-- test-time only dependencies -->
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->runtime" />
<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC01" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.2.RELEASE" conf="test->runtime"/>
</dependencies>

13
spring-webflow-samples/booking-mvc/pom.xml
View File

@@ -35,17 +35,22 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>com.springsource.org.apache.tiles</artifactId>
<version>2.0.5</version>
<version>2.1.2.osgi</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>com.springsource.org.apache.tiles.core</artifactId>
<version>2.0.5.osgi</version>
<version>2.1.2.osgi</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>com.springsource.org.apache.tiles.jsp</artifactId>
<version>2.0.5</version>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>com.springsource.org.apache.tiles.servlet</artifactId>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -206,6 +211,6 @@
</plugins>
</build>
<properties>
<spring.version>2.5.6.SEC01</spring.version>
<spring.version>3.0.2.RELEASE</spring.version>
</properties>
</project>

4
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
View File

@@ -30,9 +30,7 @@
<property name="definitions">
<list>
<value>/WEB-INF/layouts/layouts.xml</value>
<value>/WEB-INF/views.xml</value>
<value>/WEB-INF/hotels/views.xml</value>
<value>/WEB-INF/hotels/booking/views.xml</value>
<value>/WEB-INF/**/views.xml</value>
</list>
</property>
</bean>

16
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
"http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
"http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
<tiles-definitions>
<definition name="enterBookingDetails" extends="standardLayout">
<put-attribute name="body" value="details.body" />
</definition>
<definition name="details.body" template="/WEB-INF/hotels/booking/enterBookingDetails.jsp">
<put-attribute name="messages" value="/WEB-INF/hotels/booking/messages.jsp" />
<put-attribute name="bookingForm" value="/WEB-INF/hotels/booking/bookingForm.jsp" />
<put-attribute name="body">
<definition template="/WEB-INF/hotels/booking/enterBookingDetails.jsp">
<put-attribute name="messages" value="/WEB-INF/hotels/booking/messages.jsp" />
<put-attribute name="bookingForm" value="/WEB-INF/hotels/booking/bookingForm.jsp" />
</definition>
</put-attribute>
</definition>
<definition name="reviewBooking" extends="standardLayout">

28
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
View File

@@ -1,25 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
"http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
"http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
<tiles-definitions>
<definition name="hotels/index" extends="standardLayout">
<put-attribute name="body" value="index.body" />
<put-attribute name="body">
<definition template="/WEB-INF/hotels/index.jsp">
<put-attribute name="hotelSearchForm" value="/WEB-INF/hotels/hotelSearchForm.jsp" />
<put-attribute name="bookingsTable" value="/WEB-INF/hotels/bookingsTable.jsp" />
</definition>
</put-attribute>
</definition>
<definition name="index.body" template="/WEB-INF/hotels/index.jsp">
<put-attribute name="hotelSearchForm" value="/WEB-INF/hotels/hotelSearchForm.jsp" />
<put-attribute name="bookingsTable" value="/WEB-INF/hotels/bookingsTable.jsp" />
</definition>
<definition name="hotels/search" extends="standardLayout">
<put-attribute name="body" value="/WEB-INF/hotels/search.jsp" />
<definition name="hotels/*" extends="standardLayout">
<put-attribute name="body" value="/WEB-INF/hotels/{1}.jsp" />
</definition>
<definition name="hotels/show" extends="standardLayout">
<put-attribute name="body" value="/WEB-INF/hotels/show.jsp" />
</definition>
</tiles-definitions>

24
spring-webflow-samples/booking-portlet-faces/ivy.xml
View File

@@ -24,7 +24,7 @@
<dependency org="com.sun.facelets" name="com.springsource.com.sun.facelets" rev="1.1.14" conf="compile->compile"/>
<dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="1.0.0" conf="provided->compile"/>
<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="2.0.0" conf="provided->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->compile"/>
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="compile->compile"/>
@@ -35,22 +35,22 @@
<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="compile->jsf12"/>
<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->compile"/>
<!-- test-time only dependencies -->
<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC01" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.2.RELEASE" conf="test->compile"/>
</dependencies>

4
spring-webflow-samples/booking-portlet-faces/pom.xml
View File

@@ -142,7 +142,7 @@
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>com.springsource.javax.portlet</artifactId>
<version>1.0.0</version>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -191,7 +191,7 @@
</plugins>
</build>
<properties>
<spring.version>2.5.6.SEC01</spring.version>
<spring.version>3.0.2.RELEASE</spring.version>
<jsf.version>1.2.0.09</jsf.version>
</properties>
</project>

2
spring-webflow-samples/booking-portlet-mvc/.classpath
View File

@@ -7,7 +7,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/1.0.0/com.springsource.javax.portlet-1.0.0.jar" sourcepath="/IVY_CACHE/javax.portlet/com.springsource.javax.portlet/1.0.0/com.springsource.javax.portlet-sources-1.0.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/2.0.0/com.springsource.javax.portlet-2.0.0.jar" sourcepath="/IVY_CACHE/javax.portlet/com.springsource.javax.portlet/2.0.0/com.springsource.javax.portlet-sources-2.0.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

24
spring-webflow-samples/booking-portlet-mvc/ivy.xml
View File

@@ -23,7 +23,7 @@
<!-- core dependencies -->
<dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="compile->compile"/>
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="1.0.0" conf="provided->compile"/>
<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="2.0.0" conf="provided->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->compile"/>
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="compile->compile"/>
@@ -35,22 +35,22 @@
<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->compile"/>
<!-- test-time only dependencies -->
<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC01" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.2.RELEASE" conf="test->compile"/>
</dependencies>

4
spring-webflow-samples/booking-portlet-mvc/pom.xml
View File

@@ -116,7 +116,7 @@
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>com.springsource.javax.portlet</artifactId>
<version>1.0.0</version>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -174,6 +174,6 @@
</plugins>
</build>
<properties>
<spring.version>2.5.6.SEC01</spring.version>
<spring.version>3.0.2.RELEASE</spring.version>
</properties>
</project>

18
spring-webflow-samples/jsf-booking/ivy.xml
View File

@@ -35,18 +35,18 @@
<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="2.5.6.SEC01" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.2.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.2.RELEASE" conf="compile->compile"/>
<!-- test-time only dependencies -->
<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.SEC01" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.2.RELEASE" conf="test->compile"/>
</dependencies>

2
spring-webflow-samples/jsf-booking/pom.xml
View File

@@ -160,7 +160,7 @@
</plugins>
</build>
<properties>
<spring.version>2.5.6.SEC01</spring.version>
<spring.version>3.0.2.RELEASE</spring.version>
<jsf.version>1.2.0.09</jsf.version>
</properties>
</project>