diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml index 84273a0..ea56105 100644 --- a/booking-faces/pom.xml +++ b/booking-faces/pom.xml @@ -11,7 +11,7 @@ 3.2.1.RELEASE 3.1.3.RELEASE - 2.4.0.BUILD-SNAPSHOT + 2.4.0.M1 1.5.10 2.1.7 3.1.1 @@ -20,8 +20,8 @@ spring-repository - Spring project snapshots, milestones, and releases - http://repo.springsource.org/snapshot + SpringSource Repository + http://repo.springsource.org/milestone primefaces-repository diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml index f41fb3f..3c17ea0 100644 --- a/booking-mvc/pom.xml +++ b/booking-mvc/pom.xml @@ -1,41 +1,72 @@ - 4.0.0 - org.springframework.webflow.samples - booking-mvc - war - Hotel Booking : Spring MVC + Web Flow + JSP - 1.0.0.BUILD-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + org.springframework.webflow.samples + booking-mvc + war + Hotel Booking : Spring MVC + Web Flow + JSP + 1.0.0.BUILD-SNAPSHOT 3.2.1.RELEASE 3.1.3.RELEASE - 2.4.0.BUILD-SNAPSHOT - 1.5.10 + 2.4.0.M1 + 1.6.1 + 2.0.15 + 2.0.0 + 2.0.0 + 2.0.0 + 2.2.2 spring-repository - Spring project snapshots, milestones, and releases - http://repo.springsource.org/snapshot + SpringSource Repository + http://repo.springsource.org/milestone + + + + org.thymeleaf + thymeleaf + ${thymeleaf-version} + + + org.thymeleaf + thymeleaf-spring3 + ${thymeleaf-version} + + + org.thymeleaf.extras + thymeleaf-extras-tiles2 + ${thymeleaf-extras-tiles2-version} + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity3 + ${thymeleaf-extras-springsecurity3-version} + + + org.thymeleaf.extras + thymeleaf-extras-conditionalcomments + ${thymeleaf-extras-conditionalcomments-version} + + + + org.springframework + spring-web + ${springframework-version} + org.springframework spring-webmvc ${springframework-version} - - - - commons-logging - commons-logging - - org.springframework @@ -62,14 +93,9 @@ spring-security-web ${springsecurity-version} - - - commons-logging - commons-logging - org.springframework - * + spring-aop @@ -80,7 +106,7 @@ org.springframework - * + spring-aop @@ -89,17 +115,13 @@ spring-security-config ${springsecurity-version} - - - commons-logging - commons-logging - org.springframework - * + spring-aop + org.slf4j @@ -141,6 +163,7 @@ runtime + org.hsqldb @@ -153,6 +176,7 @@ hibernate-entitymanager 3.5.0-Final + javax.servlet @@ -171,19 +195,34 @@ jstl 1.2 + org.apache.tiles - tiles-jsp - 2.1.3 - - - - commons-logging - commons-logging-api - - + tiles-core + ${tiles-version} + + org.apache.tiles + tiles-api + ${tiles-version} + + + org.apache.tiles + tiles-template + ${tiles-version} + + + org.apache.tiles + tiles-servlet + ${tiles-version} + + + org.apache.tiles + tiles-jsp + ${tiles-version} + + org.hibernate @@ -200,6 +239,7 @@ jaxb-api 2.1 + joda-time @@ -212,6 +252,7 @@ 1.0.2 runtime + org.easymock @@ -248,7 +289,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12 + 2.12 junit:junit @@ -264,13 +305,14 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.8 + 2.9 true false 2.0 - + + diff --git a/booking-mvc/src/main/resources/log4j.xml b/booking-mvc/src/main/resources/log4j.xml index b4e9ad1..d8ab4b0 100644 --- a/booking-mvc/src/main/resources/log4j.xml +++ b/booking-mvc/src/main/resources/log4j.xml @@ -38,7 +38,11 @@ - + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml index 1a6d00f..924ede3 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd"> diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml index cd84b62..12c2945 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd"> - + @@ -34,4 +34,4 @@ - + \ No newline at end of file diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml index 5791b17..10ebcf5 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml index f6589f7..06cb11a 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:webflow="http://www.springframework.org/schema/webflow-config" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd"> diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml index 1628c08..394aece 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation=" - http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> @@ -23,20 +23,6 @@ - - - - - - - - - - /WEB-INF/**/views.xml - - - - @@ -46,4 +32,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /WEB-INF/**/views.xml + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html new file mode 100644 index 0000000..50bb3bd --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html @@ -0,0 +1,274 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

The Herb Plaza

+ +
+ Thyme Square, 13 +
+ Icetown, + North Pole, + 0W +
+ Earth +
+ +

+ Nightly rate: 400.00 +

+ +
+ +
+ +
+ +
+ + Input is incorrect
+ +
+ +
+ Book Hotel +
+
+ +
+
+

+ + +
+
+
+
+ +
+
+

+ +
+
+
+
+ +
+
+

+ +

+
+
+
+
+ Smoking Preference: +
+
+

+ + +

+ +
+
+
+
+ Amenities: +
+
+

+ +
+ +
+ +

+ +
+
+
+
+ +
+
+

+ +
+
+
+
+ +
+
+

+ +
+
+
+
+ +
+
+

+ + +

+
+
+
+

+ + +

+ +
+
+ +
+ +
+ +
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp deleted file mode 100644 index 1f95919..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp +++ /dev/null @@ -1,196 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
-
-

${booking.hotel.name}

- -
- ${booking.hotel.address} -
- ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} -
- ${booking.hotel.country} -
-

- Nightly rate: ${status.value} -

-
-
- -
- - -
- - -
- - -
- Book Hotel -
-
- -
-
-

- - -
-
-
-
- -
-
-

- -
-
-
-
- -
-
-

- - - - - -

-
-
-
-
- Smoking Preference: -
-
-

- - -

- -
-
-
-
- Amenities: -
-
-

- -
- -
- -

- -
-
-
-
- -
-
-

- -
-
-
-
- -
-
-

- -
-
-
-
- -
-
-

- - - - - - - - - - - - - - - - - - - - - -

-
-
-
-

- - -

- -
-
- -
-
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html new file mode 100644 index 0000000..7d9638c --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html @@ -0,0 +1,65 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    +
  • Input is incorrect
    • +
+
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp deleted file mode 100644 index 42054c9..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp +++ /dev/null @@ -1,5 +0,0 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
- -
\ No newline at end of file diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html new file mode 100644 index 0000000..a54a00a --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html @@ -0,0 +1,135 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

The Herb Plaza

+ +
+ Thyme Square, 13 +
+ Icetown, + North Pole, + 0W +
+ Earth +
+ +
+ +
+ +
+ +
+ + Confirm Booking Details + +
+
Check In:
+
+

2012-12-21

+
+
+
+
Checkout:
+
+

2012-12-21

+
+
+
+
Number of Nights:
+
+

0

+
+
+
+
Total Payment:
+
+

400.00

+
+
+
+
Credit Card #:
+
+

1234123412341234

+
+
+
+

+ + + +

+ +
+ +
+ +
+ +
+ +
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp deleted file mode 100644 index 9efe4fa..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp +++ /dev/null @@ -1,65 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
-
-

${booking.hotel.name}

- -
- ${booking.hotel.address} -
- ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} -
- ${booking.hotel.country} -
-
-
- -
- Confirm Booking Details -
-
Check In:
-
-

${status.value}

-
-
-
-
Checkout:
-
-

${status.value}

-
-
-
-
Number of Nights:
-
-

${status.value}

-
-
-
-
Total Payment:
-
-

${status.value}

-
-
-
-
Credit Card #:
-
-

${booking.creditCard}

-
-
-
-

- - - -

- -
-
- -
- -
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml index 3e1ee8b..e683dd6 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml @@ -5,12 +5,12 @@ - - + + - - - + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html new file mode 100644 index 0000000..d6bbc21 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html @@ -0,0 +1,96 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +

Current Hotel Bookings

+ +

+ No bookings found +

+ + + + + + + + + + + + + + + + + + + + + + + + +
NameAddressCity, StateCheck in DateCheck out DateConfirmation NumberAction
The Herb PlazaThyme Square, 13Icetown, North Pole2012-12-212012-12-211 +
+ +
+
+ +
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp deleted file mode 100644 index 6d66283..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
- -

Current Hotel Bookings

- - - - No bookings found - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameAddressCity, StateCheck in DateCheck out DateConfirmation NumberAction
${booking.hotel.name}${booking.hotel.address}${booking.hotel.city}, ${booking.hotel.state}${booking.checkinDate}${booking.checkoutDate}${booking.id} - - - - - - -
- - - -
\ No newline at end of file diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html new file mode 100644 index 0000000..45e8150 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html @@ -0,0 +1,139 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Hotel Results

+ +

+ Change Search + +

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
NameAddressCity, StateZipAction
The Herb PlazaThyme Square, 13Icetown, North Pole, Earth0WView Hotel
No hotels found
+ +
+
+
+ Previous Results + +
+
+
+
+ More Results + +
+
+
+
+ +
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp deleted file mode 100644 index fdd0880..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp +++ /dev/null @@ -1,74 +0,0 @@ -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> - -

Hotel Results

-

- Change Search - -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameAddressCity, StateZipAction
${hotel.name}${hotel.address}${hotel.city}, ${hotel.state}, ${hotel.country}${hotel.zip}View Hotel
No hotels found
-
-
- - Previous Results - - -
-
- - More Results - - -
-
- -
- diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html new file mode 100644 index 0000000..35f5f0a --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html @@ -0,0 +1,68 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ A search form will go here. See it at searchForm.html. +
+ +
+ A table with the current hotel bookings will go here. + See it at bookingsTable.html. +
+ + + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html new file mode 100644 index 0000000..f337b8c --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html @@ -0,0 +1,95 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Search Hotels

+ +
+ +
    +
  • Input is incorrect
    • +
+ +
+
+ + + +
+
+
+ + +
+
+
+ +
+
+ +
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp deleted file mode 100644 index 0940b44..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - -

Search Hotels

- - - - - - -
-
- - - -
-
-
- - - - - - -
-
-
- -
-
- \ No newline at end of file diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html new file mode 100644 index 0000000..e4f6489 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html @@ -0,0 +1,81 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

The Herb Plaza

+ +
+ Thyme Square, 13 +
+ Icetown, + North Pole, + 0W +
+ Earth +
+ +
+

+ Nightly Rate: 4,300 +

+ +
+ +
+
+ + + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp deleted file mode 100644 index 82e2e70..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -

${hotel.name}

-
- ${hotel.address} -
- ${hotel.city}, ${hotel.state}, ${hotel.zip} -
- ${hotel.country} -
-
-

- Nightly Rate: - ${status.value} -

- -
- -
-
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml index 42e7bc0..a6a7e9a 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml @@ -7,15 +7,15 @@ - - - + + + - - + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html new file mode 100644 index 0000000..b434438 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html @@ -0,0 +1,86 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Welcome to Spring Travel

+

+ This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles. +

+
+

+ The key features illustrated in this sample include: +

+
    +
  • A declarative navigation model enabling full browser button support and dynamic navigation rules
    • +
  • A fine-grained state management model, including support for ConversationScope and ViewScope
    • +
  • Modularization of web application functionality by domain use case, illustrating project structure best-practices
    • +
  • Spring Expression Language (SpEL) integration
    • +
  • Spring 3 formatting annotations @DateTimeFormat, @NumberFormat
    • +
  • Spring MVC custom namespace
    • +
  • Spring Security integration
    • +
  • Annotated POJO @Controllers for implementing RESTful user interactions.
    • +
  • Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library
    • +
  • Page layout and composition with Apache Tiles
    • +
  • A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.
    • +
  • A grid layout with Blueprint CSS
    • +
  • Exception handling support across all layers of the application
    • +
  • SpringSource Tool Suite integration, with support for graphical flow modeling and visualization
    • +
+

+ Start your Spring Travel experience +

+
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.jsp b/booking-mvc/src/main/webapp/WEB-INF/intro.jsp deleted file mode 100755 index 4525d2f..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/intro.jsp +++ /dev/null @@ -1,29 +0,0 @@ -
-

Welcome to Spring Travel

-

- This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles. -

-
-

- The key features illustrated in this sample include: -

-
    -
  • A declarative navigation model enabling full browser button support and dynamic navigation rules
    • -
  • A fine-grained state management model, including support for ConversationScope and ViewScope
    • -
  • Modularization of web application functionality by domain use case, illustrating project structure best-practices
    • -
  • Spring Expression Language (SpEL) integration
    • -
  • Spring 3 formatting annotations @DateTimeFormat, @NumberFormat
    • -
  • Spring MVC custom namespace
    • -
  • Spring Security integration
    • -
  • Annotated POJO @Controllers for implementing RESTful user interactions.
    • -
  • Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library
    • -
  • Page layout and composition with Apache Tiles
    • -
  • A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.
    • -
  • A grid layout with Blueprint CSS
    • -
  • Exception handling support across all layers of the application
    • -
  • SpringSource Tool Suite integration, with support for graphical flow modeling and visualization
    • -
-

- Start your Spring Travel experience -

-
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html new file mode 100644 index 0000000..fb1c2de --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html @@ -0,0 +1,103 @@ + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+

+ + generic hotel + +

+

+ + SpringOne 2GX + +

+
+
+ + + + + + + + BODY PAGE GOES HERE! + +
+
+ +
+ + + +
+ + \ No newline at end of file diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp deleted file mode 100644 index 5e7bfbb..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp +++ /dev/null @@ -1,69 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> -<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> - - - - - Spring Travel: Spring MVC and Web Flow Reference Application - " /> - " type="text/css" media="screen, projection" /> - " type="text/css" media="print" /> - - " type="text/css" media="screen" /> - - - - - -
- -
- -
- -
-
-
- -
- - \ No newline at end of file diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml index 0f94b92..aa4d2da 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml @@ -1,10 +1,11 @@ + "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" + "http://tiles.apache.org/dtds/tiles-config_2_1.dtd"> - - + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/login.html b/booking-mvc/src/main/webapp/WEB-INF/login.html new file mode 100644 index 0000000..e27a7ad --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/login.html @@ -0,0 +1,141 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Valid username/passwords are:

+
    +
  • keith/melbourne
    • +
  • erwin/leuven
    • +
  • jeremy/atlanta
    • +
  • scott/rochester
    • +
+
+ +
+ +
+ Your login attempt was not successful, try again.

+ Reason: Invalid password +
+ +
+ +
+ + Login Information + +

+ +
+ +

+ + + +

+ +
+ +

+ + + +

+ + +

+ + + +

+ + +

+ +
+ +
+ +
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/login.jsp b/booking-mvc/src/main/webapp/WEB-INF/login.jsp deleted file mode 100755 index 04d9c59..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/login.jsp +++ /dev/null @@ -1,66 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -<%@ page import="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter" %> -<%@ page import="org.springframework.security.core.AuthenticationException" %> - -
-

Valid username/passwords are:

-
    -
  • keith/melbourne
    • -
  • erwin/leuven
    • -
  • jeremy/atlanta
    • -
  • scott/rochester
    • -
-
- -
- -
- Your login attempt was not successful, try again.

- Reason: <%= ((AuthenticationException) session.getAttribute(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %> -
- -
" method="post"> -
- Login Information -

- -
- value="<%= session.getAttribute(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_LAST_USERNAME_KEY) %>" /> -

- -

- -
- -

- -

- - -

- -

- - -

-
-
-
diff --git a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html new file mode 100644 index 0000000..b8552d5 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html @@ -0,0 +1,64 @@ + + + + + + + + + + + + Spring Travel: Spring MVC and Web Flow Reference Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Logout

+

You have successfully logged out.

+
+

Continue

+
+ + + + + + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp deleted file mode 100755 index 8f7418c..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp +++ /dev/null @@ -1,8 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -
-

Logout

-

You have successfully logged out.

-
-

">Continue

-
diff --git a/booking-mvc/src/main/webapp/WEB-INF/views.xml b/booking-mvc/src/main/webapp/WEB-INF/views.xml index 96200a1..0fcba6a 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/views.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/views.xml @@ -1,20 +1,20 @@ + "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" + "http://tiles.apache.org/dtds/tiles-config_2_1.dtd"> - + - + - + diff --git a/booking-portlet-faces/pom.xml b/booking-portlet-faces/pom.xml index c0e4f4f..99b5b87 100644 --- a/booking-portlet-faces/pom.xml +++ b/booking-portlet-faces/pom.xml @@ -10,7 +10,7 @@ 3.2.1.RELEASE - 2.4.0.BUILD-SNAPSHOT + 2.4.0.M1 1.5.10 2.1.6 @@ -18,8 +18,8 @@ spring-repository - Spring project snapshots, milestones, and releases - http://repo.springsource.org/snapshot + SpringSource Repository + http://repo.springsource.org/milestone diff --git a/booking-portlet-mvc/pom.xml b/booking-portlet-mvc/pom.xml index 310a22c..ba1d1b1 100644 --- a/booking-portlet-mvc/pom.xml +++ b/booking-portlet-mvc/pom.xml @@ -10,15 +10,15 @@ 3.2.1.RELEASE - 2.4.0.BUILD-SNAPSHOT + 2.4.0.M1 1.5.10 spring-repository - Spring project snapshots, milestones, and releases - http://repo.springsource.org/snapshot + SpringSource Repository + http://repo.springsource.org/milestone