From 080dd70dc5b3dde988665a926651d851515be893 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Sun, 1 Apr 2007 13:41:44 +0000 Subject: [PATCH] webflow ide enabled general cleanup --- ...org.springframework.ide.eclipse.core.prefs | 5 +++ .../phonebook/.springWebflow | 16 +++++++++ .../phonebook/SearchCriteriaValidator.java | 2 +- .../src/main/webapp/WEB-INF/jsp/details.jsp | 28 +++++++++++++-- .../src/main/webapp/WEB-INF/jsp/error.jsp | 18 ---------- .../main/webapp/WEB-INF/jsp/includeBottom.jsp | 5 --- .../main/webapp/WEB-INF/jsp/includeTop.jsp | 21 ----------- .../webapp/WEB-INF/jsp/searchCriteria.jsp | 36 +++++++++++++------ .../main/webapp/WEB-INF/jsp/searchResults.jsp | 24 +++++++++++-- 9 files changed, 94 insertions(+), 61 deletions(-) create mode 100644 spring-webflow-samples/phonebook/.settings/org.springframework.ide.eclipse.core.prefs create mode 100644 spring-webflow-samples/phonebook/.springWebflow delete mode 100644 spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/error.jsp delete mode 100644 spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/includeBottom.jsp delete mode 100644 spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/includeTop.jsp diff --git a/spring-webflow-samples/phonebook/.settings/org.springframework.ide.eclipse.core.prefs b/spring-webflow-samples/phonebook/.settings/org.springframework.ide.eclipse.core.prefs new file mode 100644 index 00000000..576a1f0b --- /dev/null +++ b/spring-webflow-samples/phonebook/.settings/org.springframework.ide.eclipse.core.prefs @@ -0,0 +1,5 @@ +#Sun Apr 01 09:18:16 EDT 2007 +eclipse.preferences.version=1 +org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true +org.springframework.ide.eclipse.core.builders.enable.beansvalidator=true +org.springframework.ide.eclipse.core.builders.enable.webflowvalidator=true diff --git a/spring-webflow-samples/phonebook/.springWebflow b/spring-webflow-samples/phonebook/.springWebflow new file mode 100644 index 00000000..8303af2c --- /dev/null +++ b/spring-webflow-samples/phonebook/.springWebflow @@ -0,0 +1,16 @@ + + + + + src/main/webapp/WEB-INF/flows/search-flow.xml + search-flow + 1:BeansModel|2:swf-phonebook|3:src/main/java/org/springframework/webflow/samples/phonebook/stub/services-config.xml + 1:BeansModel|2:swf-phonebook|3:src/main/webapp/WEB-INF/flows/search-flow-beans.xml + + + src/main/webapp/WEB-INF/flows/detail-flow.xml + detail-flow + 1:BeansModel|2:swf-phonebook|3:src/main/java/org/springframework/webflow/samples/phonebook/stub/services-config.xml + + + diff --git a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java index d7977c6f..080540a6 100644 --- a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java +++ b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java @@ -28,7 +28,7 @@ public class SearchCriteriaValidator implements Validator { public void validate(Object obj, Errors errors) { SearchCriteria query = (SearchCriteria)obj; if (!StringUtils.hasText(query.getFirstName()) && !StringUtils.hasText(query.getLastName())) { - errors.reject("noCriteria", "Please provide some query criteria!"); + errors.reject("noCriteria", "Please provide valid search criteria"); } } } \ No newline at end of file diff --git a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/details.jsp b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/details.jsp index b5cecf43..ee27588e 100644 --- a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/details.jsp +++ b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/details.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" %> + + + + Person Details + + + + + + +
@@ -10,7 +25,7 @@ Person Details -
+
First Name @@ -48,4 +63,11 @@ -
\ No newline at end of file +
+ + + + + \ No newline at end of file diff --git a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/error.jsp b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/error.jsp deleted file mode 100644 index 87754023..00000000 --- a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/error.jsp +++ /dev/null @@ -1,18 +0,0 @@ -<%@ page session="false" %> - - - - - - -
Error
-
-
-

- An error has occured! -

-
-
-
- - diff --git a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/includeBottom.jsp deleted file mode 100644 index dfe41438..00000000 --- a/spring-webflow-samples/phonebook/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/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/includeTop.jsp deleted file mode 100644 index bc8f8463..00000000 --- a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/includeTop.jsp +++ /dev/null @@ -1,21 +0,0 @@ -<%@ page contentType="text/html" %> -<%@ page session="false" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - - -Search the Phonebook - - - - - - - - diff --git a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp index 0fd259e8..e51b16d2 100644 --- a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp +++ b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp @@ -1,4 +1,20 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + + Search the Phonebook + + + + + + +
@@ -14,29 +30,22 @@
- -
Please provide valid search criteria
+ - First Name - + Last Name - - - -
- @@ -48,4 +57,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchResults.jsp b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchResults.jsp index ac186ba7..9d1cf106 100644 --- a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchResults.jsp +++ b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchResults.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" %> + + + + Phonebook Search Results + + + + + + +
@@ -50,4 +65,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file