Seam SVN: r14863 - branches/enterprise/WFK-2_0/examples-ee6.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:58:23 -0400 (Thu, 07 Jun 2012)
New Revision: 14863
Modified:
branches/enterprise/WFK-2_0/examples-ee6/pom.xml
Log:
moved properties section up to not confuse others
Modified: branches/enterprise/WFK-2_0/examples-ee6/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-06-07 10:46:00 UTC (rev 14862)
+++ branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-06-07 10:58:23 UTC (rev 14863)
@@ -13,7 +13,40 @@
<name>Seam 2 EE 6 examples</name>
<description>Examples for Seam 2 Framework in Java EE6 environment</description>
+
+ <properties>
+ <!-- Excluded TestNG groups (ex: slow annotated tests won't run during
+ the test phase) -->
+ <tests.excludedGroups>slow</tests.excludedGroups>
+ <guava.version>12.0</guava.version>
+ <richfaces.version>4.2.2.Final</richfaces.version>
+ <slf4j.version>1.6.1</slf4j.version>
+ <!-- dependencies for functional tests -->
+ <ant.junit.version>1.6.2</ant.junit.version>
+ <ftest.version.discriminator/>
+ <selenium.browser>*firefoxproxy</selenium.browser>
+ <selenium.browser.url>http://localhost:8080</selenium.browser.url>
+ <selenium.browser.cluster.url>http://localhost:8180</selenium.browser.cluster.url>
+ <selenium.server.port>14444</selenium.server.port>
+ <selenium.server.host>localhost</selenium.server.host>
+ <selenium.speed>0</selenium.speed>
+ <selenium.timeout>30000</selenium.timeout>
+ <selenium.debug>false</selenium.debug>
+ <selenium.log.dir>${project.build.directory}/ftest-logs</selenium.log.dir>
+ <selenium.output.dir>${project.build.directory}/ftest-output</selenium.output.dir>
+ <application.deploy.timeout>300</application.deploy.timeout>
+ <browserSessionReuse>true</browserSessionReuse>
+ <ftest.resources.dir>src/test/resources-ftest</ftest.resources.dir>
+ <context.host>localhost</context.host>
+ <example.context.path>/${project.build.finalName}/</example.context.path>
+ <jboss.master.configuration>${env.JBOSS_HOME}/server/all</jboss.master.configuration>
+ <jboss.home>${env.JBOSS_HOME}</jboss.home>
+ <jboss.domain>default</jboss.domain>
+ <catalina.home>${env.CATALINA_HOME}</catalina.home>
+ <xml.namespace.aware>false</xml.namespace.aware>
+ </properties>
+
<modules>
<module>blog</module>
<module>booking</module>
@@ -976,35 +1009,5 @@
</profile>
</profiles>
- <properties>
- <!-- Excluded TestNG groups (ex: slow annotated tests won't run during
- the test phase) -->
- <tests.excludedGroups>slow</tests.excludedGroups>
- <slf4j.version>1.6.1</slf4j.version>
-
- <!-- dependencies for functional tests -->
- <ant.junit.version>1.6.2</ant.junit.version>
- <ftest.version.discriminator />
- <selenium.browser>*firefoxproxy</selenium.browser>
- <selenium.browser.url>http://localhost:8080</selenium.browser.url>
- <selenium.browser.cluster.url>http://localhost:8180</selenium.browser.cluster.url>
- <selenium.server.port>14444</selenium.server.port>
- <selenium.server.host>localhost</selenium.server.host>
- <selenium.speed>0</selenium.speed>
- <selenium.timeout>30000</selenium.timeout>
- <selenium.debug>false</selenium.debug>
- <selenium.log.dir>${project.build.directory}/ftest-logs</selenium.log.dir>
- <selenium.output.dir>${project.build.directory}/ftest-output</selenium.output.dir>
- <application.deploy.timeout>300</application.deploy.timeout>
- <browserSessionReuse>true</browserSessionReuse>
- <ftest.resources.dir>src/test/resources-ftest</ftest.resources.dir>
- <context.host>localhost</context.host>
- <example.context.path>/${project.build.finalName}/</example.context.path>
- <jboss.master.configuration>${env.JBOSS_HOME}/server/all</jboss.master.configuration>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- <catalina.home>${env.CATALINA_HOME}</catalina.home>
- <xml.namespace.aware>false</xml.namespace.aware>
- </properties>
</project>
11 years, 11 months
Seam SVN: r14861 - branches/enterprise/WFK-2_0/jboss-seam-gen/dist/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:35:05 -0400 (Thu, 07 Jun 2012)
New Revision: 14861
Modified:
branches/enterprise/WFK-2_0/jboss-seam-gen/dist/resources/WEB-INF/web.xml
Log:
JBSEAM-4961. Replaced disabled with false in richfaces settings.
Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/resources/WEB-INF/web.xml
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/resources/WEB-INF/web.xml 2012-06-07 10:34:56 UTC (rev 14860)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/resources/WEB-INF/web.xml 2012-06-07 10:35:05 UTC (rev 14861)
@@ -15,12 +15,12 @@
<context-param>
<param-name>org.richfaces.enableControlSkinning</param-name>
- <param-value>disable</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
<param-name>org.richfaces.enableControlSkinningClasses</param-name>
- <param-value>disable</param-value>
+ <param-value>false</param-value>
</context-param>
<!-- Change load strategy to DEFAULT to disable sending scripts/styles as packs -->
11 years, 11 months
Seam SVN: r14860 - branches/enterprise/WFK-2_0/jboss-seam-remoting.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:34:56 -0400 (Thu, 07 Jun 2012)
New Revision: 14860
Modified:
branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml
Log:
removed gwt from remoting as it is managed in Seam BOM and that shouldn't be dependency to remoting
Modified: branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml 2012-06-07 10:34:51 UTC (rev 14859)
+++ branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml 2012-06-07 10:34:56 UTC (rev 14860)
@@ -89,12 +89,12 @@
<optional>true</optional>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<optional>true</optional>
</dependency>
-
+-->
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
11 years, 11 months
Seam SVN: r14859 - branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:34:51 -0400 (Thu, 07 Jun 2012)
New Revision: 14859
Modified:
branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb/pom.xml
Log:
gwt-ejb in examples-ee6 requires gwt-user not as provided but as none, since it is required.
Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb/pom.xml 2012-06-07 10:34:44 UTC (rev 14858)
+++ branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb/pom.xml 2012-06-07 10:34:51 UTC (rev 14859)
@@ -70,7 +70,6 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
- <scope>provided</scope>
</dependency>
</dependencies>
11 years, 11 months
Seam SVN: r14858 - branches/enterprise/WFK-2_0/jboss-seam-remoting.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:34:44 -0400 (Thu, 07 Jun 2012)
New Revision: 14858
Modified:
branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml
Log:
Updated jboss-seam-remoting dependency gwt-user from provided to none. There is no module for it, and it is required by ear.
Modified: branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml 2012-06-07 10:34:38 UTC (rev 14857)
+++ branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml 2012-06-07 10:34:44 UTC (rev 14858)
@@ -89,6 +89,12 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
@@ -116,7 +122,6 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
-
<scope>test</scope>
</dependency>
11 years, 11 months
Seam SVN: r14857 - branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:34:38 -0400 (Thu, 07 Jun 2012)
New Revision: 14857
Modified:
branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list
branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list
branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list
Log:
Updated ear list for apps to work in jbt
Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list 2012-06-07 10:34:26 UTC (rev 14856)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list 2012-06-07 10:34:38 UTC (rev 14857)
@@ -16,7 +16,6 @@
spring-web.jar
spring-context.jar
spring-expression.jar
-guice.jar
jboss-seam-mail.jar
jboss-seam-pdf.jar
itext.jar
@@ -26,4 +25,9 @@
jboss-seam-ui.jar
jboss-seam-jul.jar
richfaces-components-ui.jar
-richfaces-core-impl.jar
\ No newline at end of file
+richfaces-core-impl.jar
+gwt-servlet.jar
+gwt-user.jar
+jboss-seam-remoting.jar
+sac.jar
+cssparser.jar
Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list 2012-06-07 10:34:26 UTC (rev 14856)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list 2012-06-07 10:34:38 UTC (rev 14857)
@@ -3,7 +3,8 @@
core.jar
drools-templates.jar
drools-decisiontables.jar
-drools-compiler.jardrools-api.jar
+drools-compiler.jar
+drools-api.jar
drools-core.jar
groovy-all.jar
jboss-el.jar
@@ -25,3 +26,4 @@
mvel2.jar
richfaces-components-api.jar
richfaces-core-api.jar
+guava.jar
\ No newline at end of file
Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list 2012-06-07 10:34:26 UTC (rev 14856)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list 2012-06-07 10:34:38 UTC (rev 14857)
@@ -68,4 +68,4 @@
richfaces-core-impl.jar
mvel2.jar
sac.jar
-cssparser.jar
\ No newline at end of file
+cssparser.jar
11 years, 11 months
Seam SVN: r14856 - in branches/enterprise/WFK-2_0: build/embedded and 4 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:34:26 -0400 (Thu, 07 Jun 2012)
New Revision: 14856
Removed:
branches/enterprise/WFK-2_0/build/embedded/build.xml
branches/enterprise/WFK-2_0/build/embedded/hibernate-all.pom.xml
branches/enterprise/WFK-2_0/build/embedded/jboss-embedded-all.pom.xml
branches/enterprise/WFK-2_0/build/embedded/jboss-embedded.pom.xml
branches/enterprise/WFK-2_0/build/embedded/shaded/hibernate-all.pom.xml
branches/enterprise/WFK-2_0/build/embedded/shaded/jboss-embedded-all.pom.xml
branches/enterprise/WFK-2_0/build/embedded/shaded/jboss-embedded.pom.xml
branches/enterprise/WFK-2_0/build/embedded/shaded/thirdparty-all.pom.xml
branches/enterprise/WFK-2_0/build/embedded/thirdparty-all.pom.xml
Modified:
branches/enterprise/WFK-2_0/jboss-seam-pdf/src/main/resources/org/jboss/seam/pdf/pdf-2.3.xsd
branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml
branches/enterprise/WFK-2_0/jboss-seam-resteasy/src/main/resources/org/jboss/seam/resteasy/resteasy-2.3.xsd
branches/enterprise/WFK-2_0/pom.xml
Log:
removed forgotten old support for deploying jboss-embedded artifacts
Deleted: branches/enterprise/WFK-2_0/build/embedded/build.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/build.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/build.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<project name="Embedded Build Utilities" basedir="." xmlns:artifact="urn:maven-artifact-ant">
-
- <property file="../build.properties" />
-
- <property name="seam.dir" value="${basedir}/../../" />
- <property name="build.dir" value="${seam.dir}/build" />
- <property name="tmp.dir" value="${seam.dir}/classes" />
- <property name="lib.dir" value="${seam.dir}/lib" />
- <import file="../utilities.build.xml" />
-
- <property name="maven.settings.xml" value="../settings.xml" />
-
- <path id="maven-ant-tasks.classpath" path="${build.dir}/lib/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-
- <property name="shaded.embedded.jars.dir" value="${tmp.dir}/embedded"/>
- <property name="embedded.jars.dir" value="${embedded.dir}/output/lib/embedded-jboss/lib" />
- <property name="embedded.dist.zip" value="${embedded.dir}/embedded-jboss-${embedded.version}.zip" />
-
- <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
- <artifact:remoteRepository id="offline.repository.jboss.org" url="file:///${offline.repository.jboss.org}" />
-
- <target name="initdav">
- <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/>
- </target>
-
- <target name="shadeEmbedded">
- <delete dir="${shaded.embedded.jars.dir}" failonerror="off"/>
- <mkdir dir="${shaded.embedded.jars.dir}" />
- <jar destfile="${shaded.embedded.jars.dir}/hibernate-all.jar" >
- <zipfileset src="${embedded.jars.dir}/hibernate-all.jar" />
- <zipfileset src="${lib.dir}/hibernate-search.jar" />
- </jar>
- <jar destfile="${shaded.embedded.jars.dir}/thirdparty-all.jar">
- <zipfileset src="${embedded.jars.dir}/thirdparty-all.jar" />
- <zipfileset src="${lib.dir}/lucene-core.jar"/>
- <zipfileset src="${lib.dir}/slf4j-log4j12.jar"/>
- <zipfileset src="${lib.dir}/slf4j-api.jar"/>
- </jar>
- <copy file="${embedded.jars.dir}/jboss-embedded.jar" todir="${shaded.embedded.jars.dir}" />
- <copy file="${embedded.jars.dir}/jboss-embedded-all.jar" todir="${shaded.embedded.jars.dir}" />
- </target>
-
- <target name="installEmbedded" depends="shadeEmbedded">
- <install pom="${embedded.poms.dir}/shaded/jboss-embedded.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded.jar" />
- <install pom="${embedded.poms.dir}/shaded/jboss-embedded-all.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded-all.jar" />
- <install pom="${embedded.poms.dir}/shaded/hibernate-all.pom.xml" jar="${shaded.embedded.jars.dir}/hibernate-all.jar" />
- <install pom="${embedded.poms.dir}/shaded/thirdparty-all.pom.xml" jar="${shaded.embedded.jars.dir}/thirdparty-all.jar" />
- <install pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" />
- <install pom="${embedded.poms.dir}/jboss-embedded-all.pom.xml" jar="${embedded.jars.dir}/jboss-embedded-all.jar" />
- <install pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" />
- <install pom="${embedded.poms.dir}/thirdparty-all.pom.xml" jar="${embedded.jars.dir}/thirdparty-all.jar" />
- </target>
-
- <target name="deployEmbeddedSnapshot" depends="initdav, shadeEmbedded">
- <input addproperty="username"
- message="JBoss.org username:" />
- <input addproperty="password"
- message="JBoss.org password:" />
- <deploy pom="${embedded.poms.dir}/shaded/jboss-embedded.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- <deploy pom="${embedded.poms.dir}/shaded/jboss-embedded-all.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- <deploy pom="${embedded.poms.dir}/shaded/hibernate-all.pom.xml" jar="${shaded.embedded.jars.dir}/hibernate-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- <deploy pom="${embedded.poms.dir}/shaded/thirdparty-all.pom.xml" jar="${shaded.embedded.jars.dir}/thirdparty-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- <deployWithAttachment pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" repositoryId="snapshots.jboss.org" attachment="${embedded.dir}/embedded-jboss-${embedded.version}.zip" unique="false">
- <authentication username="${username}" password="${password}" />
- </deployWithAttachment>
- <deploy pom="${embedded.poms.dir}/jboss-embedded-all.pom.xml" jar="${embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- <deploy pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- <deploy pom="${embedded.poms.dir}/thirdparty-all.pom.xml" jar="${embedded.jars.dir}/thirdparty-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- </target>
-
- <target name="deployEmbeddedRelease" depends="initdav, shadeEmbedded">
- <echo>Using Jars from ${embedded.jars.dir}</echo>
- <deploy pom="${embedded.poms.dir}/shaded/jboss-embedded.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded.jar" repositoryId="offline.repository.jboss.org" unique="false"/>
- <deploy pom="${embedded.poms.dir}/shaded/jboss-embedded-all.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/>
- <deploy pom="${embedded.poms.dir}/shaded/hibernate-all.pom.xml" jar="${shaded.embedded.jars.dir}/hibernate-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/>
- <deploy pom="${embedded.poms.dir}/shaded/thirdparty-all.pom.xml" jar="${shaded.embedded.jars.dir}/thirdparty-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/>
- <deployWithAttachment pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" repositoryId="offline.repository.jboss.org" attachment="${embedded.dist.zip}" unique="false"/>
- <deploy pom="${embedded.poms.dir}/jboss-embedded-all.pom.xml" jar="${embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/>
- <deploy pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/>
- <deploy pom="${embedded.poms.dir}/thirdparty-all.pom.xml" jar="${embedded.jars.dir}/thirdparty-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/>
- </target>
-
-</project>
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/build/embedded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/hibernate-all.pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/hibernate-all.pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>hibernate-all</artifactId>
- <version>beta3.SP10</version>
- <description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
- for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations)</description>
-</project>
Deleted: branches/enterprise/WFK-2_0/build/embedded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/jboss-embedded-all.pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/jboss-embedded-all.pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP10</version>
- <description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
- from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded</artifactId>
- <version>beta3.SP10</version>
- <exclusions>
- <exclusion></exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
Deleted: branches/enterprise/WFK-2_0/build/embedded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/jboss-embedded.pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/jboss-embedded.pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded</artifactId>
- <version>beta3.SP10</version>
- <description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>2.0.0.Beta6</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
Deleted: branches/enterprise/WFK-2_0/build/embedded/shaded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/shaded/hibernate-all.pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/shaded/hibernate-all.pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam.embedded</groupId>
- <artifactId>hibernate-all</artifactId>
- <version>beta3.SP10</version>
- <description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
- for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations) and Hibernate Search (specific to this seam version of hibernate-all)</description>
-</project>
Deleted: branches/enterprise/WFK-2_0/build/embedded/shaded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam.embedded</groupId>
- <artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP10</version>
- <description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
- from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.embedded</groupId>
- <artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP10</version>
- <exclusions>
- <exclusion></exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
Deleted: branches/enterprise/WFK-2_0/build/embedded/shaded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/shaded/jboss-embedded.pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/shaded/jboss-embedded.pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam.embedded</groupId>
- <artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP10</version>
- <description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all. This Seam specific version simply keeps the old jboss-embedded-api name for tooling compatibility</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>2.0.0.Beta6</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
Deleted: branches/enterprise/WFK-2_0/build/embedded/shaded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/shaded/thirdparty-all.pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/shaded/thirdparty-all.pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam.embedded</groupId>
- <artifactId>thirdparty-all</artifactId>
- <version>beta3.SP10</version>
- <description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
- dependencies distributed with JBoss AS. This Seam version also includes lucene, a dependency
- of hibernate search</description>
-</project>
Deleted: branches/enterprise/WFK-2_0/build/embedded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/embedded/thirdparty-all.pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/build/embedded/thirdparty-all.pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>thirdparty-all</artifactId>
- <version>beta3.SP10</version>
- <description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
- dependencies distributed with JBoss AS.</description>
-</project>
Modified: branches/enterprise/WFK-2_0/jboss-seam-pdf/src/main/resources/org/jboss/seam/pdf/pdf-2.3.xsd
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-pdf/src/main/resources/org/jboss/seam/pdf/pdf-2.3.xsd 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/jboss-seam-pdf/src/main/resources/org/jboss/seam/pdf/pdf-2.3.xsd 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
- targetNamespace="http://jboss.com/products/seam/pdf"
- xmlns:pdf="http://jboss.com/products/seam/pdf"
- xmlns:components="http://jboss.com/products/seam/components"
+ targetNamespace="http://jboss.org/schema/seam/pdf"
+ xmlns:pdf="http://jboss.org/schema/seam/pdf"
+ xmlns:components="http://jboss.org/schema/seam/components"
attributeFormDefault="unqualified">
- <xs:import namespace="http://jboss.com/products/seam/components"
+ <xs:import namespace="http://jboss.org/schema/seam/components"
schemaLocation="components-2.3.xsd" />
<xs:element name="key-store-config">
Modified: branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -10,6 +10,10 @@
<artifactId>jboss-seam-remoting</artifactId>
<name>Seam Remoting</name>
+ <properties>
+ <main.basedir>${project.parent.basedir}</main.basedir>
+ </properties>
+
<build>
<plugins>
<plugin>
Modified: branches/enterprise/WFK-2_0/jboss-seam-resteasy/src/main/resources/org/jboss/seam/resteasy/resteasy-2.3.xsd
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-resteasy/src/main/resources/org/jboss/seam/resteasy/resteasy-2.3.xsd 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/jboss-seam-resteasy/src/main/resources/org/jboss/seam/resteasy/resteasy-2.3.xsd 2012-06-07 10:34:26 UTC (rev 14856)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- targetNamespace="http://jboss.com/products/seam/resteasy" xmlns:resteasy="http://jboss.com/products/seam/resteasy"
- xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+ targetNamespace="http://jboss.org/schema/seam/resteasy" xmlns:resteasy="http://jboss.org/schema/seam/resteasy"
+ xmlns:components="http://jboss.org/schema/seam/components" attributeFormDefault="unqualified">
- <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/>
+ <xs:import namespace="http://jboss.org/schema/seam/components" schemaLocation="components-2.3.xsd"/>
<xs:element name="application">
<xs:annotation>
Modified: branches/enterprise/WFK-2_0/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
+++ branches/enterprise/WFK-2_0/pom.xml 2012-06-07 10:34:26 UTC (rev 14856)
@@ -521,6 +521,28 @@
<module>seam-reference-guide</module>
</modules>
</profile>
+
+ <profile>
+ <id>validate</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
11 years, 11 months
Seam SVN: r14855 - branches/enterprise/WFK-2_0/examples-ee6.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:34:05 -0400 (Thu, 07 Jun 2012)
New Revision: 14855
Modified:
branches/enterprise/WFK-2_0/examples-ee6/pom.xml
Log:
enable numberguess example
Modified: branches/enterprise/WFK-2_0/examples-ee6/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-06-07 10:33:58 UTC (rev 14854)
+++ branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-06-07 10:34:05 UTC (rev 14855)
@@ -29,7 +29,7 @@
<module>mail</module>
<module>messages</module>
<module>nestedbooking</module>
-<!-- <module>numberguess</module> -->
+ <module>numberguess</module>
<module>openid</module>
<module>quartz</module>
<module>registration</module>
11 years, 11 months
Seam SVN: r14854 - branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/src/test/java/org/jboss/seam/example/numberguess/test.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:33:58 -0400 (Thu, 07 Jun 2012)
New Revision: 14854
Modified:
branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/src/test/java/org/jboss/seam/example/numberguess/test/NumberGuessTest.java
Log:
update numberguess test
Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/src/test/java/org/jboss/seam/example/numberguess/test/NumberGuessTest.java
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/src/test/java/org/jboss/seam/example/numberguess/test/NumberGuessTest.java 2012-06-07 10:33:39 UTC (rev 14853)
+++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/src/test/java/org/jboss/seam/example/numberguess/test/NumberGuessTest.java 2012-06-07 10:33:58 UTC (rev 14854)
@@ -33,7 +33,7 @@
@Test
public void testNumberGuessWin() throws Exception {
- String id = new NonFacesRequest("/numberGuess.jspx") {
+ String id = new NonFacesRequest("/numberGuess.xhtml") {
@Override
protected void renderResponse() throws Exception {
@@ -50,7 +50,7 @@
}.run();
- String id2 = new FacesRequest("/numberGuess.jspx", id) {
+ String id2 = new FacesRequest("/numberGuess.xhtml", id) {
@Override
protected void applyRequestValues() throws Exception {
@@ -68,14 +68,14 @@
@Override
protected void afterRequest() {
assert !isRenderResponseBegun();
- assert getViewId().equals("/numberGuess.jspx");
+ assert getViewId().equals("/numberGuess.xhtml");
}
}.run();
assert id2.equals(id);
- new NonFacesRequest("/numberGuess.jspx", id) {
+ new NonFacesRequest("/numberGuess.xhtml", id) {
@Override
protected void renderResponse() throws Exception {
@@ -95,7 +95,7 @@
}.run();
- id2 = new FacesRequest("/numberGuess.jspx", id) {
+ id2 = new FacesRequest("/numberGuess.xhtml", id) {
@Override
protected void applyRequestValues() throws Exception {
@@ -112,14 +112,14 @@
@Override
protected void afterRequest() {
assert !isRenderResponseBegun();
- assert getViewId().equals("/win.jspx");
+ assert getViewId().equals("/win.xhtml");
}
}.run();
assert id2.equals(id);
- new NonFacesRequest("/win.jspx", id) {
+ new NonFacesRequest("/win.xhtml", id) {
@Override
protected void renderResponse() throws Exception {
NumberGuess ng = (NumberGuess) getInstance(NumberGuess.class);
@@ -138,7 +138,7 @@
@Test
public void testNumberGuessLose() throws Exception {
- String id = new NonFacesRequest("/numberGuess.jspx") {
+ String id = new NonFacesRequest("/numberGuess.xhtml") {
@Override
protected void renderResponse() throws Exception {
@@ -157,7 +157,7 @@
final int count = i;
- new FacesRequest("/numberGuess.jspx", id) {
+ new FacesRequest("/numberGuess.xhtml", id) {
@Override
protected void applyRequestValues() throws Exception {
@@ -177,12 +177,12 @@
@Override
protected void afterRequest() {
assert !isRenderResponseBegun();
- assert getViewId().equals("/numberGuess.jspx");
+ assert getViewId().equals("/numberGuess.xhtml");
}
}.run();
- new NonFacesRequest("/numberGuess.jspx", id) {
+ new NonFacesRequest("/numberGuess.xhtml", id) {
@Override
protected void renderResponse() throws Exception {
@@ -204,7 +204,7 @@
}
- new FacesRequest("/numberGuess.jspx", id) {
+ new FacesRequest("/numberGuess.xhtml", id) {
@Override
protected void applyRequestValues() throws Exception {
@@ -224,12 +224,12 @@
@Override
protected void afterRequest() {
assert !isRenderResponseBegun();
- assert getViewId().equals("/lose.jspx");
+ assert getViewId().equals("/lose.xhtml");
}
}.run();
- new NonFacesRequest("/lose.jspx", id) {
+ new NonFacesRequest("/lose.xhtml", id) {
@Override
protected void renderResponse() throws Exception {
11 years, 11 months
Seam SVN: r14853 - in branches/enterprise/WFK-2_0/examples-ee6/numberguess: numberguess-ear/src/main/application and 4 other directories.
by seam-commits＠lists.jboss.org
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.dtd"/>
- <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.dtd"/>
- <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.dtd"/>
- <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.dtd"/>
- <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.dtd"/>
- <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.dtd"/>
- <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>
11 years, 11 months