From 0213bf685331a0a65a8c3c0ec393df43526ebc48 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Sun, 1 Apr 2007 16:01:34 +0000 Subject: [PATCH] got rid of old includes for clarity and so you dont get compile errors with base wtp because it is not very smart --- .../main/webapp/WEB-INF/jsp/includeBottom.jsp | 5 -- .../main/webapp/WEB-INF/jsp/includeBottom.jsp | 5 -- .../main/webapp/WEB-INF/jsp/includeBottom.jsp | 5 -- .../main/webapp/WEB-INF/jsp/includeBottom.jsp | 5 -- .../src/main/webapp/WEB-INF/jsp/item.jsp | 24 +++++++++- .../src/main/webapp/WEB-INF/jsp/itemlist.jsp | 24 +++++++++- .../itemlist/src/main/webapp/index.jsp | 46 ++++++++----------- .../main/webapp/WEB-INF/jsp/includeBottom.jsp | 5 -- .../main/webapp/WEB-INF/jsp/includeTop.jsp | 23 ---------- 9 files changed, 63 insertions(+), 79 deletions(-) delete mode 100644 spring-webflow-samples/birthdate/src/main/webapp/WEB-INF/jsp/includeBottom.jsp delete mode 100644 spring-webflow-samples/fileupload/src/main/webapp/WEB-INF/jsp/includeBottom.jsp delete mode 100644 spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/includeBottom.jsp delete mode 100644 spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/includeBottom.jsp delete mode 100644 spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/includeBottom.jsp delete mode 100644 spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/includeTop.jsp diff --git a/spring-webflow-samples/birthdate/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/birthdate/src/main/webapp/WEB-INF/jsp/includeBottom.jsp deleted file mode 100644 index dfe41438..00000000 --- a/spring-webflow-samples/birthdate/src/main/webapp/WEB-INF/jsp/includeBottom.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/spring-webflow-samples/fileupload/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/fileupload/src/main/webapp/WEB-INF/jsp/includeBottom.jsp deleted file mode 100644 index dfe41438..00000000 --- a/spring-webflow-samples/fileupload/src/main/webapp/WEB-INF/jsp/includeBottom.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/includeBottom.jsp deleted file mode 100644 index dfe41438..00000000 --- a/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/includeBottom.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/includeBottom.jsp deleted file mode 100644 index dfe41438..00000000 --- a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/includeBottom.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/item.jsp b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/item.jsp index 375726be..cd141131 100644 --- a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/item.jsp +++ b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/item.jsp @@ -1,4 +1,19 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + Your Item List + + + + + + +
@@ -27,4 +42,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/itemlist.jsp b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/itemlist.jsp index 138ba93f..9be6e68d 100644 --- a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/itemlist.jsp +++ b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/itemlist.jsp @@ -1,4 +1,19 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + Your Item List + + + + + + +
@@ -28,4 +43,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/itemlist/src/main/webapp/index.jsp b/spring-webflow-samples/itemlist/src/main/webapp/index.jsp index 031fc66b..ebd01e64 100644 --- a/spring-webflow-samples/itemlist/src/main/webapp/index.jsp +++ b/spring-webflow-samples/itemlist/src/main/webapp/index.jsp @@ -5,42 +5,34 @@ -
Item List - A Spring Web Flow Sample
-
-

Item List -

- +

This Spring web flow sample application illustrates several features: -

    -
  • - Launching flow's using bookmark-friendly, REST-style URLS -
    • -
  • - Use of an inline-flow, including the ability to map subflow output attributes - directly into collection attributes in parent flow scope. -
    • -
  • - Event pattern matching, for matching eventId expressions to transitions. -
    • -
  • - "Always redirect on pause" - to achieve the POST+REDIRECT+GET pattern with no special coding. -
    • -
  • - Spring 1.2 compatible configuration, as an alternative to the Spring 2.0 support. -
    • -

+
    +
  • + Launching flow's using bookmark-friendly, REST-style URLS +
    • +
  • + Use of an inline-flow, including the ability to map subflow output attributes directly into collection attributes in parent flow scope. +
    • +
  • + Event pattern matching, for matching eventId expressions to transitions. +
    • +
  • + "Always redirect on pause" - to achieve the POST+REDIRECT+GET pattern with no special coding. +
    • +
  • + Spring 1.2 compatible configuration, as an alternative to the Spring 2.0 support. +
    • +
-
-
- - + \ No newline at end of file diff --git a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/includeBottom.jsp deleted file mode 100644 index dfe41438..00000000 --- a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/includeBottom.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/includeTop.jsp deleted file mode 100644 index 91100ef3..00000000 --- a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/includeTop.jsp +++ /dev/null @@ -1,23 +0,0 @@ -<%@ page contentType="text/html" %> -<%@ page session="false" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %> - - - - - -Search the Phonebook - -" type="text/css"> - - - - - - \ No newline at end of file