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

SWF-1373 Upgrade to Spring 3.0.4, update booking-mvc sample (Spring MVC resource serving, default servlet mapping)

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-08-25 19:19:50 +00:00
parent df3ad6f174
commit 4158063836
37 changed files with 176 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,16 +33,16 @@
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->runtime"/>
<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="compile->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.log4j" rev="1.5.6" />
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security.core" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security.config" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security.web" rev="3.0.2.RELEASE" conf="compile->runtime"/>
@@ -53,7 +53,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="3.0.3.RELEASE" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.4.RELEASE" conf="test->runtime"/>
</dependencies>

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

@@ -215,6 +215,6 @@
</plugins>
</build>
<properties>
<spring.version>3.0.3.RELEASE</spring.version>
<spring.version>3.0.4.RELEASE</spring.version>
</properties>
</project>

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

@@ -6,11 +6,7 @@
<!-- Maps JSF 2 resource requests to an instance of org.springframework.faces.webflow.FacesJsfResourceRequestHandler -->
<bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
<property name="order" value="0"/>
<property name="mappings">
<value>
/javax.faces.resource/**=jsfResourceHandler
</value>
</property>
<property name="mappings" value="/javax.faces.resource/**=jsfResourceHandler"/>
</bean>
<!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking" -->

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

@@ -37,17 +37,17 @@
<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.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security.core" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security.config" rev="3.0.2.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework.security" name="org.springframework.security.taglibs" rev="3.0.2.RELEASE" conf="compile->runtime"/>
@@ -57,7 +57,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="3.0.3.RELEASE" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.4.RELEASE" conf="test->runtime"/>
</dependencies>

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

@@ -221,6 +221,6 @@
</plugins>
</build>
<properties>
<spring.version>3.0.3.RELEASE</spring.version>
<spring.version>3.0.4.RELEASE</spring.version>
</properties>
</project>

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

@@ -10,9 +10,9 @@
<!-- Configure Spring Security -->
<security:http auto-config="true">
<security:form-login login-page="/spring/login" login-processing-url="/spring/loginProcess"
default-target-url="/spring/hotels/search" authentication-failure-url="/spring/login?login_error=1" />
<security:logout logout-url="/spring/logout" logout-success-url="/spring/logoutSuccess" />
<security:form-login login-page="/login" login-processing-url="/loginProcess"
default-target-url="/hotels/search" authentication-failure-url="/login?login_error=1" />
<security:logout logout-url="/logout" logout-success-url="/logoutSuccess" />
</security:http>
<!--

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

@@ -8,6 +8,13 @@
<!-- Enables controllers mapped with @RequestMapping annotations, formatting annotations @NumberFormat @DateTimeFormat, and JSR 303 style validation -->
<mvc:annotation-driven/>
<mvc:resources location="classpath:/META-INF/dojo/" mapping="/resources/dojo/**" />
<mvc:resources location="classpath:/META-INF/dijit/" mapping="/resources/dijit/**" />
<mvc:resources location="classpath:/META-INF/spring/" mapping="/resources/spring/**" />
<mvc:resources location="/" mapping="/resources/**" />
<mvc:default-servlet-handler />
<!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking". -->
<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
<property name="order" value="-1"/>
@@ -15,7 +22,7 @@
</bean>
<!-- Map paths directly to view names without controller processing. Use the view-name attribute if necessary: by convention the view name equals the path without the leading slash -->
<mvc:view-controller path="/intro" />
<mvc:view-controller path="/" view-name="intro" />
<mvc:view-controller path="/login" />
<mvc:view-controller path="/logoutSuccess" />

2
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp
View File

@@ -36,7 +36,7 @@
<td>${booking.checkoutDate}</td>
<td>${booking.id}</td>
<td>
<spring:url var="bookingUrl" value="/spring/bookings/{id}">
<spring:url var="bookingUrl" value="/bookings/{id}">
<spring:param name="id" value="${booking.id}"/>
</spring:url>
<form:form action="${bookingUrl}" method="delete">

2
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp
View File

@@ -3,7 +3,7 @@
<h1>Search Hotels</h1>
<c:url var="hotelsUrl" value="/spring/hotels"/>
<c:url var="hotelsUrl" value="/hotels"/>
<form:form modelAttribute="searchCriteria" action="${hotelsUrl}" method="get" cssClass="inline">
<span class="errors span-18">
<form:errors path="*"/>

4
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
View File

@@ -26,10 +26,10 @@
<c:if test="${pageContext.request.userPrincipal != null}">
Welcome, ${pageContext.request.userPrincipal.name} |
</c:if>
<a href="<c:url value="/spring/logout" />">Logout</a>
<a href="<c:url value="/logout" />">Logout</a>
</security:authorize>
<security:authorize ifAllGranted="ROLE_ANONYMOUS">
<a href="<c:url value="/spring/login" />">Login</a>
<a href="<c:url value="/login" />">Login</a>
</security:authorize>
</p>
</div>

2
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
View File

@@ -21,7 +21,7 @@
Reason: <%= ((AuthenticationException) session.getAttribute(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
</div>
</c:if>
<form name="f" action="<c:url value="/spring/loginProcess" />" method="post">
<form name="f" action="<c:url value="/loginProcess" />" method="post">
<fieldset>
<legend>Login Information</legend>
<p>

33
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/web.xml
View File

@@ -12,6 +12,11 @@
</param-value>
</context-param>
<!-- Loads the Spring web application context -->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<!-- Enables use of HTTP methods PUT and DELETE -->
<filter>
<filter-name>httpMethodFilter</filter-name>
@@ -20,7 +25,7 @@
<filter-mapping>
<filter-name>httpMethodFilter</filter-name>
<url-pattern>/*</url-pattern>
<servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
</filter-mapping>
<!-- Enables Spring Security -->
@@ -31,27 +36,9 @@
<filter-mapping>
<filter-name>springSecurityFilterChain</filter-name>
<url-pattern>/*</url-pattern>
<servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
</filter-mapping>
<!-- Loads the Spring web application context -->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<!-- Serves static resource content from .jar files such as spring-faces.jar -->
<servlet>
<servlet-name>Resources Servlet</servlet-name>
<servlet-class>org.springframework.js.resource.ResourceServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<!-- Map all /resources requests to the Resource Servlet for handling -->
<servlet-mapping>
<servlet-name>Resources Servlet</servlet-name>
<url-pattern>/resources/*</url-pattern>
</servlet-mapping>
<!-- The front controller of this Spring Web application, responsible for handling all application requests -->
<servlet>
<servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
@@ -66,11 +53,7 @@
<!-- Map all *.spring requests to the DispatcherServlet for handling -->
<servlet-mapping>
<servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
<url-pattern>/spring/*</url-pattern>
<url-pattern>/</url-pattern>
</servlet-mapping>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
</web-app>

5
spring-webflow-samples/booking-mvc/src/main/webapp/index.html
View File

@@ -1,5 +0,0 @@
<html>
<head>
<meta http-equiv="Refresh" content="0; URL=spring/intro">
</head>
</html>

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

@@ -34,17 +34,17 @@
<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.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="compile->myfaces12,myfacesPortlet20"/>
@@ -52,7 +52,7 @@
<!-- 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="3.0.3.RELEASE" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.4.RELEASE" conf="test->compile"/>
</dependencies>

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

@@ -206,7 +206,7 @@
</plugins>
</build>
<properties>
<spring.version>3.0.3.RELEASE</spring.version>
<spring.version>3.0.4.RELEASE</spring.version>
<jsf.version>1.2.0.09</jsf.version>
</properties>
</project>

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

@@ -34,23 +34,23 @@
<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.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.3.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="3.0.4.RELEASE" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.4.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="3.0.3.RELEASE" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.4.RELEASE" conf="test->compile"/>
</dependencies>

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

@@ -173,6 +173,6 @@
</plugins>
</build>
<properties>
<spring.version>3.0.3.RELEASE</spring.version>
<spring.version>3.0.4.RELEASE</spring.version>
</properties>
</project>

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

@@ -34,19 +34,19 @@
<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.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.3.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="3.0.4.RELEASE" conf="compile->runtime"/>
<!-- test-time only dependencies -->
<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.3.RELEASE" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="3.0.4.RELEASE" conf="test->runtime"/>
</dependencies>

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

@@ -165,6 +165,6 @@
</plugins>
</build>
<properties>
<spring.version>3.0.3.RELEASE</spring.version>
<spring.version>3.0.4.RELEASE</spring.version>
</properties>
</project>