From e011bebd169815dcd9ca2f38a2be3544298d99e8 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Wed, 27 Feb 2008 16:42:44 +0000 Subject: [PATCH] polish --- .../WEB-INF/flows/booking/{booking.xml => booking-flow.xml} | 0 .../src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml | 3 ++- .../src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml | 2 +- .../src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml | 3 ++- .../main/webapp/WEB-INF/flows/main/{main.xml => main-flow.xml} | 0 .../booking-jsf/src/main/webapp/WEB-INF/flows/main/main.xhtml | 2 +- .../webapp/WEB-INF/{template.xhtml => layouts/standard.xhtml} | 0 7 files changed, 6 insertions(+), 4 deletions(-) rename spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/{booking.xml => booking-flow.xml} (100%) rename spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/{main.xml => main-flow.xml} (100%) rename spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/{template.xhtml => layouts/standard.xhtml} (100%) diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/booking.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/booking-flow.xml similarity index 100% rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/booking.xml rename to spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/booking-flow.xml diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml index 63f43e10..3451a176 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml @@ -3,7 +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" - template="/template.xhtml"> + xmlns:sf="http://www.springframework.org/tags/faces" + template="/WEB-INF/layouts/standard.xhtml"> diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml index fadcacde..548c96f8 100644 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:sf="http://www.springframework.org/tags/faces" - template="/template.xhtml"> + template="/WEB-INF/layouts/standard.xhtml"> diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml index a2cdb9fb..c9ec60e9 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml @@ -3,7 +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" - template="/template.xhtml"> + xmlns:sf="http://www.springframework.org/tags/faces" + template="/WEB-INF/layouts/standard.xhtml"> diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main-flow.xml similarity index 100% rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main.xml rename to spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main-flow.xml diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main.xhtml index c2058977..7b64fde5 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main.xhtml @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:sf="http://www.springframework.org/tags/faces" - template="/template.xhtml"> + template="/WEB-INF/layouts/standard.xhtml"> diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/template.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/layouts/standard.xhtml similarity index 100% rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/template.xhtml rename to spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/layouts/standard.xhtml