+ 
+ 
+
+
+ BODY PAGE GOES HERE!
+
+
+
@@ -51,7 +51,7 @@
diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 9c92a65..57cb130 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -41,88 +41,56 @@
+ * Interface defining getter and setter methods for an + * {@code ajaxHandler} property in Views, so that they can + * be used in Spring AJAX environments. + *
+ * + * @author Daniel Fernández + * + * @since 3.0.3 + * + */ +public interface AjaxEnabledView extends View { + + + + /** + *+ * Return the AJAX handler (from Spring Javascript) used + * to determine whether a request is an AJAX request or not. + *
+ *+ * Views implementing this interface should be used with an instance of + * {@link AjaxThymeleafViewResolver} or any of its subclasses, + * so that {@link #setAjaxHandler(AjaxHandler)} can be called by + * the resolver when resolving the view, setting the default + * AJAX handler being used. + *
+ * + * @return the AJAX handler. + */ + public AjaxHandler getAjaxHandler(); + + + /** + *+ * Sets the AJAX handler (from Spring Javascript) used + * to determine whether a request is an AJAX request or not. + *
+ *+ * Views implementing this interface should be used with an instance of + * {@link AjaxThymeleafViewResolver} or any of its subclasses, + * so that this method can be called by + * the resolver when resolving the view, setting the default + * AJAX handler being used. + *
+ * + * @param ajaxHandler the AJAX handler. + */ + public void setAjaxHandler(final AjaxHandler ajaxHandler); + + +} \ No newline at end of file diff --git a/booking-mvc/src/main/java/org/thymeleaf/spring6/view/AjaxThymeleafView.java b/booking-mvc/src/main/java/org/thymeleaf/spring6/view/AjaxThymeleafView.java new file mode 100644 index 0000000..2016db2 --- /dev/null +++ b/booking-mvc/src/main/java/org/thymeleaf/spring6/view/AjaxThymeleafView.java @@ -0,0 +1,144 @@ +/* + * ============================================================================= + * + * Copyright (c) 2011-2018, The THYMELEAF team (http://www.thymeleaf.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============================================================================= + */ +package org.thymeleaf.spring6.view; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; +import org.springframework.webflow.context.servlet.AjaxHandler; +import org.thymeleaf.exceptions.ConfigurationException; + + +// Copied from thymeleaf-spring5. +// Temporarily here until available in thymeleaf-spring6. + + +/** + *+ * Subclass of {@link ThymeleafView} adding compatibility with AJAX events in + * Spring JavaScript (part of Spring WebFlow). This allows this View implementation + * to be able to return only fragments of the page. + *
+ *+ * These rendering of fragments is used, for example, in Spring WebFlow's <render> + * instructions (though not only). + *
+ *+ * This view searches for a comma-separated list of markup selectors in a request + * parameter called {@code fragments}. + *
+ * + * @author Daniel Fernández + * + * @since 3.0.3 + * + */ +public class AjaxThymeleafView extends ThymeleafView implements AjaxEnabledView { + + private static final Logger vlogger = LoggerFactory.getLogger(AjaxThymeleafView.class); + + private static final String FRAGMENTS_PARAM = "fragments"; + + + private AjaxHandler ajaxHandler = null; + + + + public AjaxThymeleafView() { + super(); + } + + + + public AjaxHandler getAjaxHandler() { + return this.ajaxHandler; + } + + + public void setAjaxHandler(final AjaxHandler ajaxHandler) { + this.ajaxHandler = ajaxHandler; + } + + + + + @Override + public void render(final Map+ * Subclass of {@link ThymeleafViewResolver} adding compatibility with AJAX-based events + * (redirects) in Spring WebFlow. + *
+ *+ * Important: Spring WebFlow dependencies are OPTIONAL. If you are not using WebFlow + * in your application, then you should be using {@link ThymeleafViewResolver} directly. + *
+ * + * @author Daniel Fernández + * + * @since 3.0.3 + * + */ +public class AjaxThymeleafViewResolver + extends ThymeleafViewResolver { + + + private static final Logger vrlogger = LoggerFactory.getLogger(AjaxThymeleafViewResolver.class); + + + private AjaxHandler ajaxHandler = new DefaultAjaxHandler(); + + + + public AjaxThymeleafViewResolver() { + super(); + } + + + /** + *+ * Return the AJAX handler (from Spring Javascript) used + * to determine whether a request is an AJAX request or not + * in views resolved by this resolver. + *
+ *+ * An instance of {@link DefaultAjaxHandler} is set by default. + *
+ * + * @return the AJAX handler. + */ + public AjaxHandler getAjaxHandler() { + return this.ajaxHandler; + } + + + /** + *+ * Sets the AJAX handler (from Spring Javascript) used + * to determine whether a request is an AJAX request or not + * in views resolved by this resolver. + *
+ *+ * An instance of {@link DefaultAjaxHandler} is set by default. + *
+ * + * @param ajaxHandler the AJAX handler. + */ + public void setAjaxHandler(final AjaxHandler ajaxHandler) { + this.ajaxHandler = ajaxHandler; + } + + + + + @Override + protected View createView(final String viewName, final Locale locale) throws Exception { + + if (!canHandle(viewName, locale)) { + return null; + } + + if (this.ajaxHandler == null) { + throw new ConfigurationException("[THYMELEAF] AJAX Handler set into " + + AjaxThymeleafViewResolver.class.getSimpleName() + " instance is null."); + } + + // Check for special "redirect:" prefix. + if (viewName.startsWith(REDIRECT_URL_PREFIX)) { + vrlogger.trace( + "[THYMELEAF] View {} is a redirect. An AJAX-enabled RedirectView implementation will " + + "be handling the request.", viewName); + final String redirectUrl = viewName.substring(REDIRECT_URL_PREFIX.length()); + return new AjaxRedirectView( + this.ajaxHandler, redirectUrl, isRedirectContextRelative(), isRedirectHttp10Compatible()); + } + + final View view = super.createView(viewName, locale); + + if (view instanceof AjaxEnabledView) { + // Set the AJAX handler into view, if it is an AjaxThymeleafView. + + final AjaxEnabledView ajaxEnabledView = (AjaxEnabledView) view; + + if (ajaxEnabledView.getAjaxHandler() == null && getAjaxHandler() != null) { + ajaxEnabledView.setAjaxHandler(getAjaxHandler()); + } + + } + + return view; + + } + + + + + + private static class AjaxRedirectView extends RedirectView { + + private static final Logger vlogger = LoggerFactory.getLogger(AjaxRedirectView.class); + + private AjaxHandler ajaxHandler = new DefaultAjaxHandler(); + + AjaxRedirectView(final AjaxHandler ajaxHandler, final String redirectUrl, + final boolean redirectContextRelative, final boolean redirectHttp10Compatible) { + super(redirectUrl, redirectContextRelative, redirectHttp10Compatible); + this.ajaxHandler = ajaxHandler; + } + + @Override + protected void sendRedirect(final HttpServletRequest request, final HttpServletResponse response, + final String targetUrl, final boolean http10Compatible) + throws IOException { + + if (this.ajaxHandler == null) { + throw new ConfigurationException("[THYMELEAF] AJAX Handler set into " + + AjaxThymeleafViewResolver.class.getSimpleName() + " instance is null."); + } + + if (this.ajaxHandler.isAjaxRequest(request, response)) { + if (vlogger.isTraceEnabled()) { + vlogger.trace( + "[THYMELEAF] RedirectView for URL \"{}\" is an AJAX request. AjaxHandler of class {} " + + "will be in charge of processing the request.", targetUrl, this.ajaxHandler.getClass().getName()); + } + this.ajaxHandler.sendAjaxRedirect(targetUrl, request, response, false); + } else { + vlogger.trace( + "[THYMELEAF] RedirectView for URL \"{}\" is not an AJAX request. Request will be handled " + + "as a normal redirect", targetUrl); + super.sendRedirect(request, response, targetUrl, http10Compatible); + } + } + + } + + + +} \ No newline at end of file diff --git a/booking-mvc/src/main/java/org/thymeleaf/spring6/view/FlowAjaxThymeleafView.java b/booking-mvc/src/main/java/org/thymeleaf/spring6/view/FlowAjaxThymeleafView.java new file mode 100644 index 0000000..ed29e39 --- /dev/null +++ b/booking-mvc/src/main/java/org/thymeleaf/spring6/view/FlowAjaxThymeleafView.java @@ -0,0 +1,93 @@ +/* + * ============================================================================= + * + * Copyright (c) 2011-2018, The THYMELEAF team (http://www.thymeleaf.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============================================================================= + */ +package org.thymeleaf.spring6.view; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import org.springframework.webflow.execution.RequestContext; +import org.springframework.webflow.execution.RequestContextHolder; +import org.springframework.webflow.execution.View; + + +// Copied from thymeleaf-spring5. +// Temporarily here until available in thymeleaf-spring6. + + +/** + *+ * Subclass of {@link AjaxThymeleafView} for Spring WebFlow, + * designed for obtaining the fragments to be rendered via + * AJAX in the way needed by Spring WebFlow. + *
+ *+ * Most people will need to use this class instead of + * {@link AjaxThymeleafView} if you are using Spring WebFlow. + *
+ * + * @author Daniel Fernández + * + * @since 3.0.3 + * + */ +public class FlowAjaxThymeleafView extends AjaxThymeleafView { + + + + + + public FlowAjaxThymeleafView() { + super(); + } + + + + + + @Override + @SuppressWarnings("rawtypes") + protected Set
+
+
+
+
+
+
+
+
+
+
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 413c5bb..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp
+++ /dev/null
@@ -1,192 +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" %>
-
-
+
+
+ Icetown, + North Pole, + 0W +
+ Earth + + +
+
+ The Herb Plaza
+ + + Thyme Square, 13 ++ Icetown, + North Pole, + 0W +
+ Earth + + +
+ Nightly rate: 400.00 +
+ +
+
+
+
+
+
+
-
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..c1064d8
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
-
- ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} -
- ${booking.hotel.country} - -
- ${booking.hotel.name}
- - - ${booking.hotel.address} -- ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} -
- ${booking.hotel.country} - -
- Nightly rate:
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
+
+
+
+
+
+
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" %>
-
--
+
- Input is incorrect +
-
\ 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..ef39373
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 bfed676..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp
+++ /dev/null
@@ -1,63 +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" %>
-
-
+
+
+ Icetown, + North Pole, + 0W +
+ Earth + + +
+
+ The Herb Plaza
+ + + Thyme Square, 13 ++ Icetown, + North Pole, + 0W +
+ Earth + + +
+
+
+
+
+
+
-
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
deleted file mode 100644
index d5c5fd7..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} -
- ${booking.hotel.country} - -
- ${booking.hotel.name}
- - - ${booking.hotel.address} -- ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} -
- ${booking.hotel.country} - -
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
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 301b0ca..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 +
+ +| Name | +Address | +City, State | +Check in Date | +Check out Date | +Confirmation Number | +Action | +
|---|---|---|---|---|---|---|
| The Herb Plaza | +Thyme Square, 13 | +Icetown, North Pole | +2012-12-21 | +2012-12-21 | +1 | ++ + | +
-
-
-
- No bookings found
-
-
-
-
-
-
-
-
-
-
-
\ 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..d60087e
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+ Current Hotel Bookings
- -| Name | -Address | -City, State | -Check in Date | -Check out Date | -Confirmation Number | -Action | -
|---|---|---|---|---|---|---|
| ${booking.hotel.name} | -${booking.hotel.address} | -${booking.hotel.city}, ${booking.hotel.state} | -${booking.checkinDate} | -${booking.checkoutDate} | -${booking.id} | -
- |
-
+
+
+
+
+
+
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 4955d40..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 + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+| Name | +Address | +City, State | +Zip | +Action | +
|---|---|---|---|---|
| The Herb Plaza | +Thyme Square, 13 | +Icetown, North Pole, Earth | +0W | +View Hotel | +
| No hotels found | +||||
Hotel Results
-- Change Search - -
-
-
-
-
-
-
-
-
-
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..a1cc521
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+ | Name | -Address | -City, State | -Zip | -Action | -
|---|---|---|---|---|
| ${hotel.name} | -${hotel.address} | -${hotel.city}, ${hotel.state}, ${hotel.country} | -${hotel.zip} | -View Hotel | -
| No hotels found | -||||
+
+
+
+
+
+
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp
deleted file mode 100644
index ecc910b..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-
+ 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.
+
+
+${confirmed}
-
+
+
+
+
+
+
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 372baf7..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-
-Search Hotels
+ + + +Search Hotels
- -
+
+
+ Icetown, + North Pole, + 0W +
+ Earth + + + + +
+
+
+
+
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" %>
-
-The Herb Plaza
+ + + Thyme Square, 13 ++ Icetown, + North Pole, + 0W +
+ Earth + + + + +
${hotel.name}
- - ${hotel.address} -- ${hotel.city}, ${hotel.state}, ${hotel.zip} -
- ${hotel.country} - - diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml deleted file mode 100644 index ad0983d..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - -
+
+
+
+
+
+
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 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 +
-
-
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..8706d91
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -0,0 +1,96 @@
+
+
+
+
+
+ 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 -
+
-
- -
-
-
\ 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
deleted file mode 100644
index a5c7ddf..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - -
+
+
+
+
+
+
+
+
+
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 76b082b..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/login.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%@ 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.
+
+
+
+
++
-
-
-Valid username/passwords are:
--
-
- keith/melbourne -
- erwin/leuven -
- jeremy/atlanta -
- scott/rochester -
-
-
- " method="post">
-
-
-
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..00f4f08
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
- Your login attempt was not successful, try again.
-
-