[seam-commits] Seam SVN: r14853 - in branches/enterprise/WFK-2_0/examples-ee6/numberguess: numberguess-ear/src/main/application and 4 other directories.

Author: manaRH Date: 2012-06-07 06:33:39 -0400 (Thu, 07 Jun 2012) New Revision: 14853 Added: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/faces-config.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/cheat.xhtml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/confirm.xhtml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.xhtml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/lose.xhtml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.xhtml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/win.xhtml Removed: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/cheat.jspx branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/confirm.jspx branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.jspx branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/lose.jspx branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.jspx branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/win.jspx Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/pom.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/src/main/application/cheat.jpdl.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/src/main/application/pageflow.jpdl.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/pages.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/web.xml Log: numberguess facelets migration Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/pom.xml 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/pom.xml 2012-06-07 10:33:39 UTC (rev 14853) @@ -43,9 +43,8 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <version>2.3.2</version> <configuration> - <version>5</version> + <version>6</version> <defaultLibBundleDir>lib</defaultLibBundleDir> <!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build --> <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/src/main/application/cheat.jpdl.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/src/main/application/cheat.jpdl.xml 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/src/main/application/cheat.jpdl.xml 2012-06-07 10:33:39 UTC (rev 14853) @@ -19,14 +19,14 @@ <transition to="confirm"/> </start-state> - <page name="confirm" view-id="/confirm.jspx"> + <page name="confirm" view-id="/confirm.xhtml"> <transition name="yes" to="cheat"> <action expression="#{numberGuess.cheated}"/> </transition> <transition name="no" to="end"/> </page> - <page name="cheat" view-id="/cheat.jspx"> + <page name="cheat" view-id="/cheat.xhtml"> <redirect/> <transition to="end"/> </page> Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/src/main/application/pageflow.jpdl.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/src/main/application/pageflow.jpdl.xml 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ear/src/main/application/pageflow.jpdl.xml 2012-06-07 10:33:39 UTC (rev 14853) @@ -16,7 +16,7 @@ "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.3.xsd" name="numberGuess"> - <start-page name="displayGuess" view-id="/numberGuess.jspx"> + <start-page name="displayGuess" view-id="/numberGuess.xhtml"> <redirect/> <transition name="guess" to="evaluateGuess"> <action expression="#{numberGuess.guess}"/> @@ -35,7 +35,7 @@ <transition name="false" to="displayGuess"/> </decision> - <page name="giveup" view-id="/giveup.jspx"> + <page name="giveup" view-id="/giveup.xhtml"> <redirect/> <transition name="yes" to="lose"/> <transition name="no" to="displayGuess"/> @@ -46,12 +46,12 @@ <transition to="displayGuess"/> </process-state> - <page name="win" view-id="/win.jspx"> + <page name="win" view-id="/win.xhtml"> <end-conversation/> <redirect/> </page> - <page name="lose" view-id="/lose.jspx"> + <page name="lose" view-id="/lose.xhtml"> <end-conversation/> <redirect/> </page> Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ejb/pom.xml 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ejb/pom.xml 2012-06-07 10:33:39 UTC (rev 14853) @@ -81,9 +81,34 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jbpm</groupId> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>3.2.3</version> + <exclusions> + <exclusion> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> + </exclusion> + <exclusion> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <artifactId>hibernate-ehcache</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> + </exclusions> </dependency> </dependencies> </project> Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/pom.xml 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/pom.xml 2012-06-07 10:33:39 UTC (rev 14853) @@ -38,23 +38,20 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - </dependency> <dependency> - <groupId>org.seleniumhq.selenium.server</groupId> + <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-server</artifactId> - <classifier>standalone</classifier> </dependency> <dependency> - <groupId>org.seleniumhq.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>functional-tests</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> @@ -76,15 +73,6 @@ <artifactId>jboss-el-api_2.2_spec</artifactId> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-jpdl</artifactId> - </dependency> </dependencies> <build> Added: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/faces-config.xml 2012-06-07 10:33:39 UTC (rev 14853) @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='UTF-8'?> +<faces-config version="2.1" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"> + +</faces-config> Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/pages.xml 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/pages.xml 2012-06-07 10:33:39 UTC (rev 14853) @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd"> - <page view-id="/numberGuess.jspx"> + <page view-id="/numberGuess.xhtml"> <begin-conversation join="true" pageflow="numberGuess"/> </page> Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/web.xml 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/WEB-INF/web.xml 2012-06-07 10:33:39 UTC (rev 14853) @@ -24,7 +24,7 @@ <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.jspx</param-value> + <param-value>.xhtml</param-value> </context-param> <servlet> Deleted: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/cheat.jspx =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/cheat.jspx 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/cheat.jspx 2012-06-07 10:33:39 UTC (rev 14853) @@ -1,27 +0,0 @@ -<?xml version="1.0"?> -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns="http://www.w3.org/1999/xhtml" - version="2.0"> - <jsp:output doctype-root-element="html" - doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" - doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional... - <jsp:directive.page contentType="text/html"/> - <html> - <head> - <title>You cheater!</title> - <link href="niceforms.css" rel="stylesheet" type="text/css" /> - <script language="javascript" type="text/javascript" src="niceforms.js"><!-- --></script> - </head> - <body> - <h1>You cheater!</h1> - <f:view> - <h:form id="cheat" styleClass="niceform"> - (The answer is <h:outputText id="RandomNumber" value="#{numberGuess.randomNumber}"/>.) - <h:commandButton id="DoneButton" value="Done"/> - </h:form> - </f:view> - </body> - </html> -</jsp:root> Added: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/cheat.xhtml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/cheat.xhtml (rev 0) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/cheat.xhtml 2012-06-07 10:33:39 UTC (rev 14853) @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.org/schema/seam/taglib"> + <head> + <title>You cheater!</title> + <link href="niceforms.css" rel="stylesheet" type="text/css" /> + <script language="javascript" type="text/javascript" src="niceforms.js"><!-- --></script> + </head> + <body> + <h1>You cheater!</h1> + <h:form id="cheat" styleClass="niceform"> + (The answer is <h:outputText id="RandomNumber" value="#{numberGuess.randomNumber}"/>.) + <h:commandButton id="DoneButton" value="Done"/> + </h:form> + </body> +</html> + Deleted: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/confirm.jspx =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/confirm.jspx 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/confirm.jspx 2012-06-07 10:33:39 UTC (rev 14853) @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns="http://www.w3.org/1999/xhtml" - version="2.0"> - <jsp:output doctype-root-element="html" - doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" - doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional... - <jsp:directive.page contentType="text/html"/> - <html> - <head> - <title>Do you really want to cheat?</title> - <link href="niceforms.css" rel="stylesheet" type="text/css" /> - <script language="javascript" type="text/javascript" src="niceforms.js"><!-- --></script> - </head> - <body> - <h1>Do you really want to cheat?</h1> - <f:view> - <h:form id="confirm" styleClass="niceform"> - I'll be really disappointed if you do this... - <h:commandButton id="YesButton" value="Yes" action="yes"/> - <h:commandButton id="NoButton" value="No" action="no"/> - </h:form> - </f:view> - </body> - </html> -</jsp:root> Added: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/confirm.xhtml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/confirm.xhtml (rev 0) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/confirm.xhtml 2012-06-07 10:33:39 UTC (rev 14853) @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.org/schema/seam/taglib"> + <head> + <title>Do you really want to cheat?</title> + <link href="niceforms.css" rel="stylesheet" type="text/css" /> + <script language="javascript" type="text/javascript" src="niceforms.js"><!-- --></script> + </head> + <body> + <h1>Do you really want to cheat?</h1> + <h:form id="confirm" styleClass="niceform"> + I'll be really disappointed if you do this... + <h:commandButton id="YesButton" value="Yes" action="yes"/> + <h:commandButton id="NoButton" value="No" action="no"/> + </h:form> + </body> +</html> Deleted: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.jspx =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.jspx 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.jspx 2012-06-07 10:33:39 UTC (rev 14853) @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns="http://www.w3.org/1999/xhtml" - version="2.0"> - <jsp:output doctype-root-element="html" - doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" - doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional... - <jsp:directive.page contentType="text/html"/> - <html> - <head> - <title>Do you really want to give up now?</title> - <link href="niceforms.css" rel="stylesheet" type="text/css" /> - <script language="javascript" type="text/javascript" src="niceforms.js"><!-- --></script> - </head> - <body> - <h1>Do you really want to give up now?</h1> - <f:view> - <h:form id="giveup" styleClass="niceform"> - You still have <h:outputText id="RemainingGuesses" value="#{numberGuess.remainingGuesses}"/> guesses remaining. - <h:commandButton id="YesButton" value="Yes" action="yes"/> - <h:commandButton id="NoButton" value="No" action="no"/> - </h:form> - </f:view> - </body> - </html> -</jsp:root> Copied: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.xhtml (from rev 14852, branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.jspx) =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.xhtml (rev 0) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/giveup.xhtml 2012-06-07 10:33:39 UTC (rev 14853) @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.org/schema/seam/taglib"> + <head> + <title>Do you really want to give up now?</title> + <link href="niceforms.css" rel="stylesheet" type="text/css" /> + <script language="javascript" type="text/javascript" src="niceforms.js"><!-- --></script> + </head> + <body> + <h1>Do you really want to give up now?</h1> + <h:form id="giveup" styleClass="niceform"> + You still have <h:outputText id="RemainingGuesses" value="#{numberGuess.remainingGuesses}"/> guesses remaining. + <h:commandButton id="YesButton" value="Yes" action="yes"/> + <h:commandButton id="NoButton" value="No" action="no"/> + </h:form> + </body> +</html> Deleted: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/lose.jspx =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/lose.jspx 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/lose.jspx 2012-06-07 10:33:39 UTC (rev 14853) @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns="http://www.w3.org/1999/xhtml" - version="2.0"> - <jsp:output doctype-root-element="html" - doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" - doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional... - <jsp:directive.page contentType="text/html"/> - <html> - <head> - <title>You lose.</title> - <link href="niceforms.css" rel="stylesheet" type="text/css" /> - </head> - <body> - <h1>You lose.</h1> - We recommend the - <a href="http://mathworld.wolfram.com/Bisection.html">bisection algorithm</a>. - Would you like to <a href="numberGuess.seam">play again</a>? - </body> - </html> -</jsp:root> Added: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/lose.xhtml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/lose.xhtml (rev 0) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/lose.xhtml 2012-06-07 10:33:39 UTC (rev 14853) @@ -0,0 +1,16 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.org/schema/seam/taglib"> + <head> + <title>You lose.</title> + <link href="niceforms.css" rel="stylesheet" type="text/css" /> + </head> + <body> + <h1>You lose.</h1> + We recommend the + <a href="http://mathworld.wolfram.com/Bisection.html">bisection algorithm</a>. + Would you like to <a href="numberGuess.seam">play again</a>? + </body> +</html> Deleted: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.jspx =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.jspx 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.jspx 2012-06-07 10:33:39 UTC (rev 14853) @@ -1,68 +0,0 @@ -<?xml version="1.0"?> -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.org/schema/seam/taglib" - xmlns="http://www.w3.org/1999/xhtml" - version="2.0"> - <jsp:output doctype-root-element="html" - doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" - doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional... - <jsp:directive.page contentType="text/html"/> - <html> - <head> - <title>Guess a number...</title> - <link href="niceforms.css" rel="stylesheet" type="text/css" /> - <script language="javascript" type="text/javascript" src="niceforms.js"><!-- --></script> - </head> - <body> - <h1>Guess a number...</h1> - <f:view> - <h:form id="NumberGuessMain" styleClass="niceform"> - - <div> - <h:messages id="messages" globalOnly="true"/> - <h:outputText id="Higher" - value="Higher!" - rendered="#{numberGuess.randomNumber gt numberGuess.currentGuess}"/> - <h:outputText id="Lower" - value="Lower!" - rendered="#{numberGuess.randomNumber lt numberGuess.currentGuess}"/> - </div> - - <div> - I'm thinking of a number between <h:outputText id="Smallest" value="#{numberGuess.smallest}"/> and - <h:outputText id="Biggest" value="#{numberGuess.biggest}"/>. You have - <h:outputText id="RemainingGuesses" value="#{numberGuess.remainingGuesses}"/> guesses. - </div> - - <div> - Your guess: - <h:inputText id="inputGuess" value="#{numberGuess.currentGuess}" required="true" size="3" - rendered="#{(numberGuess.biggest-numberGuess.smallest) gt 20}"> - <f:validateLongRange maximum="#{numberGuess.biggest}" - minimum="#{numberGuess.smallest}"/> - </h:inputText> - <h:selectOneMenu id="selectGuessMenu" value="#{numberGuess.currentGuess}" required="true" - rendered="#{(numberGuess.biggest-numberGuess.smallest) le 20 and (numberGuess.biggest-numberGuess.smallest) gt 4}"> - <s:selectItems id="PossibilitiesMenuItems" value="#{numberGuess.possibilities}" var="i" label="#{i}"/> - </h:selectOneMenu> - <h:selectOneRadio id="selectGuessRadio" value="#{numberGuess.currentGuess}" required="true" - rendered="#{(numberGuess.biggest-numberGuess.smallest) le 4}"> - <s:selectItems id="PossibilitiesRadioItems" value="#{numberGuess.possibilities}" var="i" label="#{i}"/> - </h:selectOneRadio> - <h:commandButton id="GuessButton" value="Guess" action="guess"/> - <s:button id="CheatButton" value="Cheat" action="cheat"/> - <s:button id="GiveUpButton" value="Give up" action="giveup"/> - </div> - - <div> - <h:message id="message" for="inputGuess" style="color: red"/> - </div> - - </h:form> - </f:view> - </body> - </html> -</jsp:root> - Copied: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.xhtml (from rev 14852, branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.jspx) =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.xhtml (rev 0) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/numberGuess.xhtml 2012-06-07 10:33:39 UTC (rev 14853) @@ -0,0 +1,57 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.org/schema/seam/taglib"> + <head> + <title>Guess a number...</title> + <link href="niceforms.css" rel="stylesheet" type="text/css" /> + <script language="javascript" type="text/javascript" src="niceforms.js"><!-- --></script> + </head> + <body> + <h1>Guess a number...</h1> + <h:form id="NumberGuessMain" styleClass="niceform"> + + <div> + <h:messages id="messages" globalOnly="true"/> + <h:outputText id="Higher" + value="Higher!" + rendered="#{numberGuess.randomNumber gt numberGuess.currentGuess}"/> + <h:outputText id="Lower" + value="Lower!" + rendered="#{numberGuess.randomNumber lt numberGuess.currentGuess}"/> + </div> + + <div> + I'm thinking of a number between <h:outputText id="Smallest" value="#{numberGuess.smallest}"/> and + <h:outputText id="Biggest" value="#{numberGuess.biggest}"/>. You have + <h:outputText id="RemainingGuesses" value="#{numberGuess.remainingGuesses}"/> guesses. + </div> + + <div> + Your guess: + <h:inputText id="inputGuess" value="#{numberGuess.currentGuess}" required="true" size="3" + rendered="#{(numberGuess.biggest-numberGuess.smallest) gt 20}"> + <f:validateLongRange maximum="#{numberGuess.biggest}" + minimum="#{numberGuess.smallest}"/> + </h:inputText> + <h:selectOneMenu id="selectGuessMenu" value="#{numberGuess.currentGuess}" required="true" + rendered="#{(numberGuess.biggest-numberGuess.smallest) le 20 and (numberGuess.biggest-numberGuess.smallest) gt 4}"> + <s:selectItems id="PossibilitiesMenuItems" value="#{numberGuess.possibilities}" var="i" label="#{i}"/> + </h:selectOneMenu> + <h:selectOneRadio id="selectGuessRadio" value="#{numberGuess.currentGuess}" required="true" + rendered="#{(numberGuess.biggest-numberGuess.smallest) le 4}"> + <s:selectItems id="PossibilitiesRadioItems" value="#{numberGuess.possibilities}" var="i" label="#{i}"/> + </h:selectOneRadio> + <h:commandButton id="GuessButton" value="Guess" action="guess"/> + <s:button id="CheatButton" value="Cheat" action="cheat"/> + <s:button id="GiveUpButton" value="Give up" action="giveup"/> + </div> + + <div> + <h:message id="message" for="inputGuess" style="color: red"/> + </div> + + </h:form> + </body> +</html> Deleted: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/win.jspx =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/win.jspx 2012-06-07 10:33:09 UTC (rev 14852) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/win.jspx 2012-06-07 10:33:39 UTC (rev 14853) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns="http://www.w3.org/1999/xhtml" - version="2.0"> - <jsp:output doctype-root-element="html" - doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" - doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional... - <jsp:directive.page contentType="text/html"/> - <html> - <head> - <title>You won!</title> - <link href="niceforms.css" rel="stylesheet" type="text/css" /> - </head> - <body> - <h1>You won!</h1> - <f:view> - Yes, the answer was <h:outputText id="CurrentGuess" value="#{numberGuess.currentGuess}" />. - It took you <h:outputText id="GuessCount" value="#{numberGuess.guessCount}" /> guesses. - <h:outputText id="CheatedMessage" value="But you cheated, so it doesn't count!" rendered="#{numberGuess.cheat}"/> - Would you like to <a href="numberGuess.seam">play again</a>? - </f:view> - </body> - </html> -</jsp:root> Added: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/win.xhtml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/win.xhtml (rev 0) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-web/src/main/webapp/win.xhtml 2012-06-07 10:33:39 UTC (rev 14853) @@ -0,0 +1,17 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.org/schema/seam/taglib"> + <head> + <title>You won!</title> + <link href="niceforms.css" rel="stylesheet" type="text/css" /> + </head> + <body> + <h1>You won!</h1> + Yes, the answer was <h:outputText id="CurrentGuess" value="#{numberGuess.currentGuess}" />. + It took you <h:outputText id="GuessCount" value="#{numberGuess.guessCount}" /> guesses. + <h:outputText id="CheatedMessage" value="But you cheated, so it doesn't count!" rendered="#{numberGuess.cheat}"/> + Would you like to <a href="numberGuess.seam">play again</a>? + </body> +</html>