diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java index 363182ec..5fc793d7 100755 --- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java +++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java @@ -11,4 +11,6 @@ public interface BookingService { public Hotel readHotelById(Long id); public Booking bookHotel(Hotel hotel, User user); + + public void cancelBooking(Long id); } diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java index f8b8e5ae..6cb99058 100755 --- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java +++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java @@ -44,6 +44,14 @@ public class JpaBookingService implements BookingService { return booking; } + @Transactional + public void cancelBooking(Long id) { + Booking booking = em.find(Booking.class, id); + if (booking != null) { + em.remove(booking); + } + } + @PersistenceContext public void setEntityManager(EntityManager em) { this.em = em; diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/login-flow.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/login-flow.xml deleted file mode 100755 index a658e268..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/login-flow.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml index 42b66fad..6829c8e9 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml @@ -38,9 +38,8 @@ - /WEB-INF/flows/login-flow.xml - /WEB-INF/flows/main-flow.xml - /WEB-INF/flows/bookHotel-flow.xml + /flows/main/main-flow.xml + /flows/booking/bookHotel-flow.xml diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/conversations.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/conversations.xhtml deleted file mode 100755 index b4e23523..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/conversations.xhtml +++ /dev/null @@ -1,34 +0,0 @@ - -
- -
-

-
- -
- - - - -   - - - - - - - - - - - - - - -
- -
\ No newline at end of file diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/css/date.css b/spring-webflow-samples/booking-jsf/src/main/webapp/css/date.css deleted file mode 100755 index 39096d91..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/css/date.css +++ /dev/null @@ -1,185 +0,0 @@ -div.seam-date -{ - margin-top: 5px; - border: 1px solid #AAAAAA; - background: #fff url(../img/input.bg.gif) 0 0 repeat-x; - background-color: #FFFFFF; - color: #505050; - font-family: Tahoma, Arial, Helvetica, sans-serif; - font-size: 12px; -} - -table.seam-date td { - font-family: Tahoma, Arial, Helvetica, sans-serif; - font-weight: 11px; -} - -.seam-date-monthNames -{ - width: 70px; - border: 1px solid #dddddd; - border-right: 3px solid #444444; - border-bottom: 3px solid #444444; - background-color: #ffffff; - font-size: 12px; - cursor: pointer; - font-family: Tahoma, Arial, Helvetica, sans-serif; - font-weight: normal; -} - -a.seam-date-monthNameLink, a.seam-date-monthNameLink:visited -{ - text-align: center; - display: block; - color: #555555; -} - -a.seam-date-monthNameLink:hover -{ - background-color: #CCCCCC; - color: red; -} - -.seam-date-years -{ - height: 10em; - overflow: auto; - width: 60px; - border: 1px solid #dddddd; - border-right: 3px solid #444444; - border-bottom: 3px solid #444444; - background-color: #ffffff; - font-size: 12px; - cursor: pointer; - font-family: Tahoma, Arial, Helvetica, sans-serif; - font-weight: normal; -} - -a.seam-date-yearLink, a.seam-date-yearLink:visited -{ - text-align: center; - display: block; - color: #555555; -} - -a.seam-date-yearLink:hover -{ - background-color: #CCCCCC; - color: red; -} - -tr.seam-date-header -{ - padding: 2px 0px 2px 0px; -} - -td.seam-date-header -{ - padding: 0px 8px 0px 8px; - text-align: center; - color: gray; - font-family: Tahoma, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 12px; -} - -td.seam-date-header-prevMonth -{ - background-image: url("../img/cal-prev.png"); - background-repeat: no-repeat; - background-position: center; - padding: 0px 2px 0px 2px; - width: 17px; - height: 16px; - margin-left: 2px; -} - -td.seam-date-header-nextMonth -{ - background-image: url("../img/cal-next.png"); - background-repeat: no-repeat; - background-position: center; - padding: 0px 2px 0px 2px; - width: 17px; - height: 16px; - margin-right: 2px; -} - -tr.seam-date-headerDays -{ - color: white; - font-weight: normal; -} - -tr.seam-date-headerDays > td -{ - background-color: #CCCCCC; - border: 1px solid #AAAAAA; - color: white; - text-align: center; - width: 26px; -} - -tr.seam-date-footer -{ - background-color: white; - color: #505050; - font-weight: bold; -} - -tr.seam-date-footer > td -{ - text-align: center; -} - -td.seam-date-inMonth -{ - background-color: white; - color: black; - font-weight: normal; - cursor: pointer; - border: 1px solid #ece9d8; -} - -td.seam-date-outMonth -{ - background-color: white; - color: #999999; - font-weight: normal; - cursor: pointer; - border: 1px solid #ece9d8; -} - -td.seam-date-selected -{ - background-color: #CCCCCC; - border: 1px solid #AAAAAA; - color: black; - font-weight: normal; -} - -td.seam-date-dayOff-inMonth -{ - background-color: #efefef; - color: black; - font-weight: normal; - cursor: pointer; - border: 1px solid #ece9d8; -} - -td.seam-date-dayOff-outMonth -{ - background-color: #efefef; - color: #999999; - font-weight: normal; - cursor: pointer; - border: 1px solid #ece9d8; -} - -td.seam-date-hover -{ - background-color: #CCCCCC; - border: 1px solid #AAAAAA; - cursor: pointer; - color: red; -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/css/screen.css b/spring-webflow-samples/booking-jsf/src/main/webapp/css/screen.css index f00c7ae9..5c18b0b6 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/css/screen.css +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/css/screen.css @@ -32,13 +32,13 @@ input { border: 1px solid #C3BBB6; padding: 4px; margin: 5px 0; - background: #fff url(../img/input.bg.gif) 0 0 repeat-x; + background: #fff url(../images/input.bg.gif) 0 0 repeat-x; } select { border: 1px solid #C3BBB6; padding: 4px; margin: 5px 0; - background: #fff url(../img/input.bg.gif) 0 0 repeat-x; + background: #fff url(../images/input.bg.gif) 0 0 repeat-x; }ol, ul { margin: 10px 0px 10px 6px; } @@ -52,27 +52,20 @@ fieldset { ----------------------------------------------- */ #document { padding: 0 1px; - background: #fff url(../img/bg.gif) 0 0 repeat-y; + background: #fff url(../images/bg.gif) 0 0 repeat-y; float: left; border-bottom: 1px solid #C3BBB6; } #header { float: left; width: 758px; - height: 46px; - background: url(../img/hdr.bg.gif) 0 0 repeat-x; + height:76px; + background: url(../images/hdr.bg.gif) 0 0 repeat-x; } #container { float: left; width: 758px; - background: url(../img/hdr.bar.jpg) 0 0 repeat-x; -} -#sidebar { - float: left; - width: 190px; - margin-top: 96px; - padding: 20px 10px 0 10px; - background: url(../img/sdb.bg.gif) 0 0 no-repeat; + background: url(../images/spring-logo.jpg) 0 0 repeat-x; } #content { float: left; @@ -98,7 +91,7 @@ input[type="submit"], input[type="button"] { color: #fff; border: 1px solid #5D1414; height: 26px; - background: #fff url(../img/btn.bg.gif) 0 0 repeat-x; + background: #fff url(../images/btn.bg.gif) 0 0 repeat-x; border-style: none; } .center { @@ -202,7 +195,7 @@ input[type="submit"], input[type="button"] { } #content table thead th { border-left: 1px solid #D2C9C4; - background: #fff url(../img/th.bg.gif) 0 100% repeat-x; + background: #fff url(../images/th.bg.gif) 0 100% repeat-x; border-bottom: 1px solid #D2C9C4; padding: 6px; text-align: left; @@ -252,17 +245,3 @@ input[type="submit"], input[type="button"] { color: #C7B299; text-decoration: none; } -/* Homepage Modifications ------------------------------------------------ */ -#pgHome #container { - background: url(../img/hdr.ad.jpg) 0 0 repeat-x; -} -#pgHome #sidebar { - margin-top: 207px; -} -#pgHome #content { - margin-top: 183px; -} -#pgHome input[type="submit"] { - height: 30px; -} diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/css/template.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/css/template.xhtml deleted file mode 100755 index 501a9494..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/css/template.xhtml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Spring Web Stack: SWF + JSF Booking Sample - - - - -
- -
-
- -
-
- -
- - diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/css/trailblazer_main.css b/spring-webflow-samples/booking-jsf/src/main/webapp/css/trailblazer_main.css deleted file mode 100755 index 8700dcb5..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/css/trailblazer_main.css +++ /dev/null @@ -1,148 +0,0 @@ -* { - margin: 0px; - padding: 0px; - border: none; -} - -body { - font: 1em verdana, arial, sans-serif; - background: #CCCCCC; -} - -div#main { - margin-left: 0px; - width: 751px; - background: #ecefdf; -} - -div#top,div#pictures{ -} - -div#pictures img { - float:left; -} - -img#head1 { - margin-right: 3px; -} - -img#head2 { - margin-right: 4px; -} - -div.trail { - clear:both; - margin-left: 50px; - margin-top: 0px; - margin-right: 50px -} - -div.foot { - margin-left: 50px; - margin-right: 50px; - margin-top: 50px; - text-align: center; - font-size: .5em; - height: 36px; -} - -div.trail h1 { - margin-top: -30px; - margin-left: -50px; - font-size: 1.2em; - font-weight: bold; - padding-left: .4em; -} - -div.trail h2 { - float: left; - font-size: 1em; - font-weight: bold; - padding-left: .4em; -} - -div.trail h3 { - float: left; - font-size: .8em; - font-weight: bold; - margin-left: -1.4em; - margin-bottom: 1em; -} - - -div.trail p { - clear: both; - margin-top: 20px; - font-size: .8em; - text-decoration: none; -} - -div#next_trail { - margin-left: 36px; -} - -div.numbox { - border: thin solid black; - margin-left: -.8em; - float: left; - background: #ffffff; - padding: .2em .35em .3em; - font-style: normal; - font-weight: bold; - font-size: 1.4em; -} - -div.figure { - text-align: center; - font-size: .6em; - margin-top: 30px; -} - -div.figure img { - display: block; - margin-right: auto; - margin-left: auto; -} - -code { - font: 1.1em "Courier New", Courier, mono; -} - -code.block { - white-space: pre; - font: 10pt "Courier New", Courier, mono; - display: block; - border-style: dashed; - border-width: thin; - padding: .5em; - background: #ffffff; - margin: 20px; -} - -div.foot_image { - float: left; - height: 86px; -} - -a:active { - color : #666666; - text-decoration: none; -} - -a:hover { - color : #000000; - background-color : #D6E0FE; - text-decoration: none; -} - -a:link { - color : #005EB6; - text-decoration: none; -} - -a:visited { - color : #888888; - text-decoration: none; -} - - diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/book.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/book.xhtml similarity index 79% rename from spring-webflow-samples/booking-jsf/src/main/webapp/book.xhtml rename to spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/book.xhtml index b3aab3be..15e4c7ee 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/book.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/book.xhtml @@ -3,9 +3,8 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" xmlns:a="https://ajax4jsf.dev.java.net/ajax" - template="template.xhtml"> + template="/template.xhtml"> @@ -45,99 +44,88 @@ - - - - - - - - - - -
Check In Date:
- + - + - - + +
Check Out Date:
- + - + - - + +
Room Preference:
- + - +
Smoking Preference:
- + - +
Credit Card #:
- + - +
Credit Card Name:
- + - +
Credit Card Expiry:
- + @@ -159,11 +147,9 @@ - +
- -
@@ -181,21 +167,4 @@
- - - -

Workspace management

-

- As you can see, Seam makes it easy to work in multiple windows or multiple browser - tabs. But you can even switch between multiple tasks inside a single browser tab! - The "Workspaces" section showcases this advanced feature. -

-

- - How does the workspace list work? - -

- -
- diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/bookHotel-flow.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/bookHotel-flow.xml similarity index 86% rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/bookHotel-flow.xml rename to spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/bookHotel-flow.xml index 13d7bb94..43ef378f 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/bookHotel-flow.xml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/bookHotel-flow.xml @@ -12,9 +12,7 @@ - - - + @@ -38,7 +36,7 @@ - + @@ -49,7 +47,7 @@ - + diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/confirm.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/confirm.xhtml similarity index 73% rename from spring-webflow-samples/booking-jsf/src/main/webapp/confirm.xhtml rename to spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/confirm.xhtml index ece888fd..c5077513 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/confirm.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/confirm.xhtml @@ -3,8 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - template="template.xhtml"> + template="/template.xhtml"> @@ -68,22 +67,4 @@ - - -

Back button navigation

-

- When you click "Confirm", the new booking is written to the database, the - conversation ends, and state associated with the conversation is automatically - destroyed by Seam. After you confirm your booking, try hitting the back button - on your web browser and clicking "Confirm" again. Seam makes it easy implement - applications that behave elegantly in response to the back, forward and refresh - buttons. -

-

- - What happens when the conversation ends? - -

-
- diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/hotel.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/hotel.xhtml similarity index 60% rename from spring-webflow-samples/booking-jsf/src/main/webapp/hotel.xhtml rename to spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/hotel.xhtml index efe8471b..c57e1dc1 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/hotel.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/booking/hotel.xhtml @@ -3,7 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - template="template.xhtml"> + template="/template.xhtml"> @@ -55,28 +55,4 @@ - - - -

Don't kill your database

-

- Keeping conversational state in memory in the middle tier is a great way to - improve your application's scalability. It saves hitting the database every - time we refresh a page, to re-read the data we were just looking at five - seconds ago. By using Seam's conversation context, we get a natural cache - of data associated with the what the user is currently doing. By nature, - this cache has a more efficient eviction policy than the MRU-type algorithms - used by a typical second-level data cache in an O/R mapping engine like - Hibernate (at least for some kinds of data). Of course, you should use - a clever combination of second-level caching and conversational data - caching to achieve the best performance for your application. -

-

- - How does the hotel booking wizard work? - -

- -
- diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main-flow.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main-flow.xml similarity index 64% rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main-flow.xml rename to spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main-flow.xml index 7bfd4d2f..f950199c 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main-flow.xml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main-flow.xml @@ -11,12 +11,13 @@ - + - + + @@ -27,12 +28,21 @@ - + - + + + + + + + + + + \ No newline at end of file diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/main.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main.xhtml similarity index 66% rename from spring-webflow-samples/booking-jsf/src/main/webapp/main.xhtml rename to spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main.xhtml index 47cc453e..cb430a79 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/main.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main.xhtml @@ -2,10 +2,9 @@ + template="/template.xhtml"> @@ -42,27 +41,27 @@
- + Name - #{hot.name} + #{hotel.name} Address - #{hot.address} + #{hotel.address} City, State - #{hot.city}, #{hot.state}, #{hot.country} + #{hotel.city}, #{hotel.state}, #{hotel.country} Zip - #{hot.zip} + #{hotel.zip} Action - + @@ -78,34 +77,36 @@
- + Name - #{book.hotel.name} + #{booking.hotel.name} Address - #{book.hotel.address} + #{booking.hotel.address} City, State - #{book.hotel.city}, #{book.hotel.state} + #{booking.hotel.city}, #{booking.hotel.state} Check in date - + Check out date - + Confirmation number - #{book.id} + #{booking.id} Action - + + +
@@ -114,27 +115,4 @@ - - - -

State management in Seam

-

- State in Seam is contextual. When you click "Find Hotels", the application - retrieves a list of hotels from the database and caches it in the session context. When you - navigate to one of the hotel records by clicking the "View Hotel" link, a conversation - begins. The conversation is attached to a particular tab, in a particular browser window. You can - navigate to multiple hotels using "open in new tab" or "open in new window" in your web browser. - Each window will execute in the context of a different conversation. The application keeps state - associated with your hotel booking in the conversation context, which ensures that the concurrent - conversations do not interfere with each other. -

- -

- - How does the search page work? - -

- -
- diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/home.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/home.xhtml deleted file mode 100755 index c17a858e..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/home.xhtml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Spring Web Stack: Spring Web Flow + JSF - - - - -
- -
- -
-
- -

About this example application

- -

- This sample application demonstrates how easy it is to develop stateful web - applications using Spring Web Flow. Just register, login, and book a room to see - SWF in action. -

- -

- Note: Please do NOT enter personal information or your credit card number in - this sample application. -

-
-
-
- -
-
- - diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/bg.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/images/bg.gif similarity index 100% rename from spring-webflow-samples/booking-jsf/src/main/webapp/img/bg.gif rename to spring-webflow-samples/booking-jsf/src/main/webapp/images/bg.gif diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/btn.bg.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/images/btn.bg.gif similarity index 100% rename from spring-webflow-samples/booking-jsf/src/main/webapp/img/btn.bg.gif rename to spring-webflow-samples/booking-jsf/src/main/webapp/images/btn.bg.gif diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.bg.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/images/hdr.bg.gif similarity index 100% rename from spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.bg.gif rename to spring-webflow-samples/booking-jsf/src/main/webapp/images/hdr.bg.gif diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/input.bg.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/images/input.bg.gif similarity index 100% rename from spring-webflow-samples/booking-jsf/src/main/webapp/img/input.bg.gif rename to spring-webflow-samples/booking-jsf/src/main/webapp/images/input.bg.gif diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/th.bg.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/images/th.bg.gif similarity index 100% rename from spring-webflow-samples/booking-jsf/src/main/webapp/img/th.bg.gif rename to spring-webflow-samples/booking-jsf/src/main/webapp/images/th.bg.gif diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/cal-next.png b/spring-webflow-samples/booking-jsf/src/main/webapp/img/cal-next.png deleted file mode 100755 index ef993543..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/cal-next.png and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/cal-prev.png b/spring-webflow-samples/booking-jsf/src/main/webapp/img/cal-prev.png deleted file mode 100755 index d943c17a..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/cal-prev.png and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/cnt.bg.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/img/cnt.bg.gif deleted file mode 100755 index 6a9465d3..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/cnt.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/dtpick.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/img/dtpick.gif deleted file mode 100755 index 8526cf5d..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/dtpick.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.ad.jpg b/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.ad.jpg deleted file mode 100755 index 9d991cb1..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.ad.jpg and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.bar.jpg b/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.bar.jpg deleted file mode 100755 index 74212b8d..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.bar.jpg and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.title.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.title.gif deleted file mode 100755 index 60a47957..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/hdr.title.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/header_line.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/img/header_line.gif deleted file mode 100755 index 5638533e..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/header_line.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/sdb.bg.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/img/sdb.bg.gif deleted file mode 100755 index 9d5d2c05..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/sdb.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/img/spinner.gif b/spring-webflow-samples/booking-jsf/src/main/webapp/img/spinner.gif deleted file mode 100755 index 085ccaec..00000000 Binary files a/spring-webflow-samples/booking-jsf/src/main/webapp/img/spinner.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml index ee4bd5d1..77deed35 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml @@ -15,24 +15,8 @@

- Book Hotels (launch with a regular anchor tag) + Book Hotels (launch with a regular anchor tag)

-

- This Spring Web Flow sample application is the JSF-based version of the familiar "Sell item" sample. - It illustrates the following concepts: -

-
    -
  • Using Spring Web Flow with JSF
  • -
  • Implementing a wizard using web flows.
  • -
  • Use of conversation scope.
  • -
  • Using expressions to apply dynamic flow navigation rules
  • -
  • Using continuations to make the flow completely stable, no matter how browser navigation buttons are used.
  • -
  • "Always redirect on pause" to benefit from the POST+REDIRECT+GET pattern with no special coding.
  • -
  • - Using "conversation invalidation after completion" to prevent duplicate submits of the same sale - while taking advantage of continuations to allow back button usage while the application transaction is in process. -
  • -

diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/password.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/password.xhtml deleted file mode 100755 index 793686c0..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/password.xhtml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - -
-

Change Your Password

-
-
- - - - - - - - - - - -
- -
-
Password:
-
- - - - - -
-
- -
-
Verify:
-
- - - -
-
- -
- -
- -
-
 
-
-   - -
-
- -
- -
-
-
- - - -

Simple things should be easy

-

- (And so should some complex things.) You shouldn't have to write four different classes - just to change a password. Traditional J2EE architectures require that developers spend - more time writing code to make the frameworks happy, than they ever get to spend writing - code to make the user happy. Seam lets you reduce the size of your code dramatically. - And that reduces bugs. And it makes refactoring easier. And it makes delivering new - functionality quicker. Productivity matters. But with Seam, JSF, EJB 3.0 and jBPM, you - don't need to sacrifice the ability to handle complex problems just to achieve great - productivity. -

-
- -
\ No newline at end of file diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/register.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/register.xhtml deleted file mode 100755 index f40823be..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/register.xhtml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - JBoss Suites: Seam Framework - - - -
- -
- -
-
-

Register

-
-
- - -
- - - - - - - - - - - - -
-
Username:
-
- - - - - -
-
- -
-
Real Name:
-
- - - - - -
-
- -
-
Password:
-
- - - -
-
- -
-
Verify Password:
-
- - - -
-
- -
- -
- -
- -
-
 
-
-   - -
-
- -
-
- -
-
-
- -
- - diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/style.css b/spring-webflow-samples/booking-jsf/src/main/webapp/style.css deleted file mode 100755 index f4b0a64e..00000000 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/style.css +++ /dev/null @@ -1,58 +0,0 @@ -body { - width: 720px; - margin: 0px; - padding: 0px; -} - -div#logo { - width: 720px; - height: 73px; - background: #86AEA5; -} - -div#navigation { - width: 720px; - height: 15px; - background: #E2F3B8; - text-align: right; -} - -div#content { - width: 720px; - padding: 5px; -} - -div#insert { - width: 120; - float: right; - text-align: right; -} - -.buttonBar { - height: 1.5em; - text-align: right; -} - -div#copyright { - width: 720px; -} - -div#copyright p { - text-align: center; - font-family: Tahoma, sans-serif; - font-size: 75%; - color: div#336633; - margin-left: 5px; - font-weight: bold; - clear: both; -} - -.readOnly { - color: rgb(192, 192, 192); -} - -.error { - color: red; - font-weight: bold; - font-family: Arial, sans-serif; -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml index 501a9494..bb428a88 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml @@ -5,13 +5,13 @@ Spring Web Stack: SWF + JSF Booking Sample - +