diff --git a/spring-webflow-samples/numberguess/.settings/org.springframework.ide.eclipse.core.prefs b/spring-webflow-samples/numberguess/.settings/org.springframework.ide.eclipse.core.prefs new file mode 100644 index 00000000..86df8a45 --- /dev/null +++ b/spring-webflow-samples/numberguess/.settings/org.springframework.ide.eclipse.core.prefs @@ -0,0 +1,5 @@ +#Sun Apr 01 11:30:22 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/numberguess/.springBeans b/spring-webflow-samples/numberguess/.springBeans index 71da5896..89240735 100644 --- a/spring-webflow-samples/numberguess/.springBeans +++ b/spring-webflow-samples/numberguess/.springBeans @@ -4,6 +4,7 @@ xml + src/main/webapp/WEB-INF/dispatcher-servlet.xml @@ -18,7 +19,6 @@ false false - src/main/webapp/WEB-INF/dispatcher-servlet.xml diff --git a/spring-webflow-samples/numberguess/.springWebflow b/spring-webflow-samples/numberguess/.springWebflow new file mode 100644 index 00000000..f70b8859 --- /dev/null +++ b/spring-webflow-samples/numberguess/.springWebflow @@ -0,0 +1,13 @@ + + + + + src/main/webapp/WEB-INF/mastermind.xml + mastermind + + + src/main/webapp/WEB-INF/higherlower.xml + higherlower + + + diff --git a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/higherlower.enterGuess.jsp b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/higherlower.enterGuess.jsp index 13358d58..71732fd1 100644 --- a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/higherlower.enterGuess.jsp +++ b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/higherlower.enterGuess.jsp @@ -1,4 +1,17 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> + + + HigherLower - Enter Guess + + + + + + +
@@ -31,4 +44,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/higherlower.showAnswer.jsp b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/higherlower.showAnswer.jsp index 28c9b462..54e9b228 100644 --- a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/higherlower.showAnswer.jsp +++ b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/higherlower.showAnswer.jsp @@ -1,29 +1,48 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> + + + HigherLower - You Guessed It! + + + + + + +

You guessed it!

- - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
Answer:${game.answer}
Total number of guesses:${game.guesses}
Elapsed time in seconds:${game.duration}
-
- - -
-
Answer:${game.answer}
Total number of guesses:${game.guesses}
Elapsed time in seconds:${game.duration}
+
+ + +
+
- -<%@ include file="includeBottom.jsp" %> \ No newline at end of file +
+ + + + + \ No newline at end of file diff --git a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/includeBottom.jsp deleted file mode 100644 index dfe41438..00000000 --- a/spring-webflow-samples/numberguess/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/numberguess/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/includeTop.jsp deleted file mode 100644 index c2a66b9c..00000000 --- a/spring-webflow-samples/numberguess/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" %> - - - -Play a game - - - - - - - - diff --git a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.enterGuess.jsp b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.enterGuess.jsp index 0cbca015..436b7cb9 100644 --- a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.enterGuess.jsp +++ b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.enterGuess.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" %> + + + + Mastermind - Enter Guess + + + + + + +
@@ -8,8 +23,24 @@

Note: each guess must be 4 unique digits!

Number of guesses so far: ${game.data.guesses}

- <%@include file="mastermind.guessHistoryTable.jsp" %> - + +

Guess history:

+ + + + + + + + + + + + + +
GuessRight PositionPresent But Wrong Position
${guessData.guess}${guessData.rightPosition}${guessData.correctButWrongPosition}
+ +
Your guess was invalid: it must be a 4 digit number (e.g 1234), and each digit must be unique.
@@ -31,4 +62,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.guessHistoryTable.jsp b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.guessHistoryTable.jsp deleted file mode 100644 index e4afe694..00000000 --- a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.guessHistoryTable.jsp +++ /dev/null @@ -1,15 +0,0 @@ - -

Guess history:

- - - - - - - - - - - -
GuessRight PositionPresent But Wrong Position
${guessData.guess}${guessData.rightPosition}${guessData.correctButWrongPosition}
- \ No newline at end of file diff --git a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.showAnswer.jsp b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.showAnswer.jsp index adbc2086..726b01a0 100644 --- a/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.showAnswer.jsp +++ b/spring-webflow-samples/numberguess/src/main/webapp/WEB-INF/jsp/mastermind.showAnswer.jsp @@ -1,28 +1,48 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> + + + Mastermind - You Guessed It! + + + + + + +

Show answer

- - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
Total number of guesses:${game.data.guesses}
Elapsed time in seconds:${game.data.duration}
Answer:${game.data.answer}
-
- - -
-
Total number of guesses:${game.data.guesses}
Elapsed time in seconds:${game.data.duration}
Answer:${game.data.answer}
+
+ + +
+
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file +
+ + + + + \ No newline at end of file diff --git a/spring-webflow-samples/numberguess/src/main/webapp/index.html b/spring-webflow-samples/numberguess/src/main/webapp/index.html index 33f602b0..b536f1cb 100644 --- a/spring-webflow-samples/numberguess/src/main/webapp/index.html +++ b/spring-webflow-samples/numberguess/src/main/webapp/index.html @@ -8,8 +8,8 @@ This Spring Web Flow (SWF) sample application illustrates: