diff --git a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java index 2fe49a3..4582cb2 100644 --- a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java +++ b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java @@ -45,7 +45,7 @@ public class WebFlowConfig extends AbstractFlowConfiguration { @Bean public MvcViewFactoryCreator mvcViewFactoryCreator() { MvcViewFactoryCreator factoryCreator = new MvcViewFactoryCreator(); - factoryCreator.setViewResolvers(Collections.singletonList(this.webMvcConfig.tilesViewResolver())); + factoryCreator.setViewResolvers(Collections.singletonList(this.webMvcConfig.viewResolver())); factoryCreator.setUseSpringBeanBinding(true); return factoryCreator; } diff --git a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java index 9c4980b..e5a3138 100644 --- a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java +++ b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java @@ -1,8 +1,5 @@ package org.springframework.webflow.samples.booking.config; -import java.util.LinkedHashSet; -import java.util.Set; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,23 +7,18 @@ import org.springframework.web.servlet.config.annotation.DefaultServletHandlerCo import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.ViewResolverRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.view.tiles3.TilesConfigurer; import org.springframework.webflow.mvc.servlet.FlowHandlerAdapter; import org.springframework.webflow.mvc.servlet.FlowHandlerMapping; +import org.springframework.webflow.mvc.view.AjaxUrlBasedViewResolver; +import org.springframework.webflow.mvc.view.FlowAjaxTiles3View; import org.springframework.webflow.samples.booking.BookingFlowHandler; -import org.thymeleaf.dialect.IDialect; -import org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect; -import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect; -import org.thymeleaf.extras.tiles2.dialect.TilesDialect; -import org.thymeleaf.extras.tiles2.spring4.web.configurer.ThymeleafTilesConfigurer; -import org.thymeleaf.extras.tiles2.spring4.web.view.FlowAjaxThymeleafTilesView; -import org.thymeleaf.spring4.SpringTemplateEngine; -import org.thymeleaf.spring4.view.AjaxThymeleafViewResolver; -import org.thymeleaf.templateresolver.ServletContextTemplateResolver; @EnableWebMvc @Configuration -public class WebMvcConfig extends WebMvcConfigurerAdapter { +public class WebMvcConfig implements WebMvcConfigurer { @Autowired private WebFlowConfig webFlowConfig; @@ -70,38 +62,15 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter { } @Bean - public AjaxThymeleafViewResolver tilesViewResolver() { - AjaxThymeleafViewResolver viewResolver = new AjaxThymeleafViewResolver(); - viewResolver.setViewClass(FlowAjaxThymeleafTilesView.class); - viewResolver.setTemplateEngine(templateEngine()); - return viewResolver; + public AjaxUrlBasedViewResolver viewResolver() { + AjaxUrlBasedViewResolver resolver = new AjaxUrlBasedViewResolver(); + resolver.setViewClass(FlowAjaxTiles3View.class); + return resolver; } @Bean - public SpringTemplateEngine templateEngine(){ - - Set dialects = new LinkedHashSet(); - dialects.add(new TilesDialect()); - dialects.add(new SpringSecurityDialect()); - dialects.add(new ConditionalCommentsDialect()); - - SpringTemplateEngine templateEngine = new SpringTemplateEngine(); - templateEngine.setTemplateResolver(templateResolver()); - templateEngine.setAdditionalDialects(dialects); - return templateEngine; - } - - @Bean - public ServletContextTemplateResolver templateResolver() { - ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver(); - templateResolver.setPrefix("/WEB-INF"); - templateResolver.setTemplateMode("HTML5"); - return templateResolver; - } - - @Bean - public ThymeleafTilesConfigurer tilesConfigurer() { - ThymeleafTilesConfigurer configurer = new ThymeleafTilesConfigurer(); + public TilesConfigurer tilesConfigurer() { + TilesConfigurer configurer = new TilesConfigurer(); configurer.setDefinitions("/WEB-INF/**/views.xml"); return configurer; } 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 deleted file mode 100644 index 83c00ef..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - - - - - - 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 new file mode 100644 index 0000000..1f95919 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp @@ -0,0 +1,196 @@ +<%@ 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 deleted file mode 100644 index 7d9638c..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - 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 new file mode 100644 index 0000000..42054c9 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp @@ -0,0 +1,5 @@ +<%@ 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 deleted file mode 100644 index a54a00a..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - 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 new file mode 100644 index 0000000..9efe4fa --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp @@ -0,0 +1,65 @@ +<%@ 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 e683dd6..974615e 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 @@ -1,16 +1,16 @@ - + "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" + "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"> + - - + + - - - + + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html deleted file mode 100644 index d6bbc21..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - 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 new file mode 100644 index 0000000..301b0ca --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp @@ -0,0 +1,53 @@ +<%@ 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 deleted file mode 100644 index 45e8150..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - 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 new file mode 100644 index 0000000..4955d40 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp @@ -0,0 +1,74 @@ +<%@ 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
+
+
+ + << Prev + + +
+
+ + Next >> + + +
+
+ +
+ diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html deleted file mode 100644 index 35f5f0a..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - 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/search.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp new file mode 100644 index 0000000..ecc910b --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp @@ -0,0 +1,10 @@ +<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + +
${confirmed}
+ + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html deleted file mode 100644 index f337b8c..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - 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 new file mode 100644 index 0000000..0940b44 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp @@ -0,0 +1,36 @@ +<%@ 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 deleted file mode 100644 index e4f6489..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - 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 new file mode 100644 index 0000000..82e2e70 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp @@ -0,0 +1,22 @@ +<%@ 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 5c18a0e..35d8a1d 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml @@ -1,21 +1,21 @@ + "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" + "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"> - - - + + + - - + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html deleted file mode 100644 index f697b58..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/intro.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - 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 Thymeleaf 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 Thymeleaf and its Spring MVC's integration features.
    • -
  • 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 new file mode 100755 index 0000000..4525d2f --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/intro.jsp @@ -0,0 +1,29 @@ +
+

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 deleted file mode 100644 index fb1c2de..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - 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 new file mode 100644 index 0000000..68854e3 --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp @@ -0,0 +1,74 @@ +<%@ 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 aa4d2da..3e75ddc 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml @@ -1,11 +1,10 @@ + "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" + "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"> - - - + + diff --git a/booking-mvc/src/main/webapp/WEB-INF/login.html b/booking-mvc/src/main/webapp/WEB-INF/login.html deleted file mode 100644 index d67df11..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/login.html +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - 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.

-
- -
- -
- - Login Information - -

- -
- -

- - - -

- -
- -

- - - -

- - -

- - - -

- - -

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

Valid username/passwords are:

+
    +
  • keith/melbourne
    • +
  • erwin/leuven
    • +
  • jeremy/atlanta
    • +
  • scott/rochester
    • +
+
+ +
+ +
+ Your login attempt was not successful, try again. +
+ +
" method="post"> +
+ Login Information +

+ +
+ +

+ +

+ +
+ +

+ +

+ + +

+ +
+ +
+

+ + +

+
+
+
diff --git a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html deleted file mode 100644 index b8552d5..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - 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 new file mode 100755 index 0000000..8f7418c --- /dev/null +++ b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp @@ -0,0 +1,8 @@ +<%@ 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 0fcba6a..6cb3a52 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 3.0//EN" + "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"> - + - + - +