diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java index 7536cfb3..8e7875c5 100755 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java +++ b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java @@ -50,7 +50,7 @@ public class Booking implements Serializable { private int beds; - private Amenity amenities; + private Amenity[] amenities; public Booking() { } @@ -182,11 +182,11 @@ public class Booking implements Serializable { } @Transient - public Amenity getAmenities() { + public Amenity[] getAmenities() { return amenities; } - public void setAmenities(Amenity amenities) { + public void setAmenities(Amenity[] amenities) { this.amenities = amenities; } diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml index db11a27d..c557e619 100644 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml +++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml @@ -8,141 +8,147 @@ -
-

Book Hotel

- -
- -
- - -
-
-
Name:
-
#{booking.hotel.name}
-
-
-
Address:
-
#{booking.hotel.address}
-
-
-
City, State:
-
#{booking.hotel.city}, #{booking.hotel.state}
-
-
-
Zip:
-
#{booking.hotel.zip}
-
-
-
Country:
-
#{booking.hotel.country}
-
-
-
Nightly rate:
-
- - - -
-
-
-
- Check In Date: +
+

${booking.hotel.name}

+
+ ${booking.hotel.address} +
+ ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} +
+ ${booking.hotel.country} +
+
+
+ +
+
-
- - - - - -
-
-
-
- Check Out Date: -
-
- - - - - -
-
-
-
- Room Preference: -
-
- - - -
-
-
-
- Smoking Preference: -
-
- - - -
-
-
-
- Amenities: -
-
- - - - - -
-
-
-
- Credit Card #: -
-
- - - -
-
-
-
- Credit Card Name: -
-
- - - -
-
-
-
- Expiration Date: -
-
- - - - - - -
-
-
- -   - - -
-
- -
- + + +
+ Book Hotel +
+
+ Nightly rate: +
+
+

+ + + +

+
+
+
+
+ Check In: +
+
+

+ + + + + +

+
+
+
+
+ Check Out: +
+
+

+ + + + + +

+
+
+
+
+ Room Preference: +
+
+

+ + + +

+
+
+
+
+ Smoking Preference: +
+
+ + + +
+
+
+
+ Amenities: +
+
+ + + + + +
+
+
+
+ Credit Card #: +
+
+

+ + + +

+
+
+
+
+ Credit Card Name: +
+
+

+ + + +

+
+
+
+
+ Expiration Date: +
+
+

+ + + + + + +

+
+
+
+ +   + + +
+
+ + + \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml index c224fcd6..1e25bbf6 100755 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml +++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml @@ -7,70 +7,73 @@ template="/WEB-INF/layouts/standard.xhtml"> - -
-

Confirm Hotel Booking

-
- -
- -
-
-
Name:
-
#{booking.hotel.name}
-
-
-
Address:
-
#{booking.hotel.address}
-
-
-
City, State:
-
#{booking.hotel.city}, #{booking.hotel.state}
-
-
-
Zip:
-
#{booking.hotel.zip}
-
-
-
Country:
-
#{booking.hotel.country}
-
-
-
Total payment:
-
- - - -
-
-
-
Check In Date:
-
- - - -
-
-
-
Check Out Date:
-
- - - -
-
-
-
Credit Card #:
-
#{booking.creditCard}
-
-
-   -   - -
-
- -
- +
+

${booking.hotel.name}

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

+ + + +

+
+
+
+
Check Out:
+
+

+ + + +

+
+
+
+
Nights:
+
+

+ +

+
+
+
+
Total payment:
+
+

+ + + +

+
+
+
+
Credit Card:
+
+

+ #{booking.creditCard} +

+
+
+
+   +   + +
+
+ +
\ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml index daf31531..49780352 100644 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml +++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml @@ -9,34 +9,26 @@ -
+
+

Search Hotels

-

Search Hotels

- +
-
-
- Search String: -
-
- - - -
+
+ Search String: + + +
-
-
- Maximum results: -
-
- - - -
+
+ Maximum Results: + + +
-
+
@@ -44,12 +36,12 @@
- -
- -

Current Hotel Bookings

- - + +
+

Current Hotel Bookings

+ + + Name #{booking.hotel.name} diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml index 1511f6c0..018d2ce3 100644 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml +++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml @@ -8,49 +8,28 @@ -
-

View Hotel

+

${hotel.name}

+
+ ${hotel.address} +
+ ${hotel.city} +
+ ${hotel.state} ${hotel.zip} +
+ ${hotel.country} +
-
-
-
Name:
-
#{hotel.name}
-
-
-
Address:
-
#{hotel.address}
-
-
-
City:
-
#{hotel.city}
-
-
-
State:
-
#{hotel.state}
-
-
-
Zip:
-
#{hotel.zip}
-
-
-
Country:
-
#{hotel.country}
-
-
-
Nightly rate:
-
- - - -
-
-
-   - -
-
+

+ Nightly Rate:  + + + +

+
+    + +
-
 \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml index 4561424f..47eb4ee1 100644 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml +++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml @@ -9,7 +9,7 @@ -
+

Hotel Results

@@ -48,8 +48,12 @@

- - +
+ +
+
+ +
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml index 0180ed75..f6e3a982 100755 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml +++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml @@ -8,12 +8,12 @@ -
+

Welcome to Spring Travel

- This reference application illustrates how to use Spring MVC, Spring Web Flow, and Spring Faces - together to power rich web applications based on Spring and JavaServerFaces technology. + This demonstrates how to use Spring MVC and Spring Web Flow with JSF component views.

+

The key features illustrated in this sample include:

@@ -21,15 +21,17 @@
  • 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
  • Managed persistence contexts with the Java Persistence API (JPA)
  • Unified Expression Language (EL) integration
  • Spring Security integration
  • Declarative page authoring with Facelets, including applying reusable page layouts
  • A lightweight component library for Ajax and client-side validation that employs progressive enhancement techniques
    • +
  • A grid layout with Blueprint CSS
  • Exception handling support across all layers of the application
  • Spring IDE tooling integration, with support for graphical flow modeling and visualization
    • -

    +

    Start your Spring Travel experience

    diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml index bab3acc7..c5021baa 100644 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml +++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml @@ -9,56 +9,58 @@ Spring Faces: Hotel Booking Sample Application - - - - - - - - - + + + + - -
    -