November 2008 - seam-commits - Jboss List Archives

Seam SVN: r9586 - in trunk/seam-gen: resources/WEB-INF and 1 other directory.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-11-18 05:06:33 -0500 (Tue, 18 Nov 2008) New Revision: 9586 Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml trunk/seam-gen/icefaces/resources/WEB-INF/components.xml trunk/seam-gen/resources/WEB-INF/components-war.xml trunk/seam-gen/resources/WEB-INF/components.xml Log: JBSEAM-3699 - hot deploy filter should only fire on JSF requests (*.seam) Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml =================================================================== --- trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-11-18 10:04:40 UTC (rev 9585) +++ trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-11-18 10:06:33 UTC (rev 9586) @@ -22,6 +22,10 @@ conversation-timeout="120000" conversation-id-parameter="cid" parent-conversation-id-parameter="pid"/> + + <component name="org.jboss.seam.debug.hotDeployFilter"> + <property name="urlPattern">*.seam</property> + </component> <persistence:managed-persistence-context name="entityManager" auto-create="true" Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components.xml =================================================================== --- trunk/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-11-18 10:04:40 UTC (rev 9585) +++ trunk/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-11-18 10:06:33 UTC (rev 9586) @@ -22,6 +22,10 @@ conversation-timeout="120000" conversation-id-parameter="cid" parent-conversation-id-parameter="pid"/> + + <component name="org.jboss.seam.debug.hotDeployFilter"> + <property name="urlPattern">*.seam</property> + </component> <persistence:managed-persistence-context name="entityManager" auto-create="true" Modified: trunk/seam-gen/resources/WEB-INF/components-war.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/components-war.xml 2008-11-18 10:04:40 UTC (rev 9585) +++ trunk/seam-gen/resources/WEB-INF/components-war.xml 2008-11-18 10:06:33 UTC (rev 9586) @@ -17,6 +17,10 @@ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="@debug@" jndi-pattern="@jndiPattern@"/> + + <component name="org.jboss.seam.debug.hotDeployFilter"> + <property name="urlPattern">*.seam</property> + </component> <core:manager concurrent-request-timeout="500" conversation-timeout="120000" Modified: trunk/seam-gen/resources/WEB-INF/components.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/components.xml 2008-11-18 10:04:40 UTC (rev 9585) +++ trunk/seam-gen/resources/WEB-INF/components.xml 2008-11-18 10:06:33 UTC (rev 9586) @@ -23,6 +23,11 @@ conversation-id-parameter="cid" parent-conversation-id-parameter="pid"/> + + <component name="org.jboss.seam.debug.hotDeployFilter"> + <property name="urlPattern">*.seam</property> + </component> + <persistence:managed-persistence-context name="entityManager" auto-create="true" persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/>

16 years, 3 months

1
0
0 / 0

Seam SVN: r9585 - trunk/seam-gen.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-11-18 05:04:40 -0500 (Tue, 18 Nov 2008) New Revision: 9585 Modified: trunk/seam-gen/build.xml Log: introduce update-seam target that updates the project with only the latest seam jars (useful for us Seam developers) Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2008-11-18 09:59:06 UTC (rev 9584) +++ trunk/seam-gen/build.xml 2008-11-18 10:04:40 UTC (rev 9585) @@ -933,6 +933,17 @@ <echo message="IDEA Users: Open the project using File > Open project... and select the file ${project.home}/${project.name}.ipr"/> </target> + <target name="update-seam" depends="validate-project,copyseam"> + <echo message="Copying Seam to the ${project.home}/lib directory..." /> + <copy todir="${project.home}/lib" overwrite="true"> + <fileset dir="../lib"> + <include name="jboss-seam.jar"/> + <include name="jboss-seam-*.jar"/> + <include name="src/jboss-seam-*.jar"/> + </fileset> + </copy> + </target> + <target name="update-project" depends="validate-project,copy-lib" description="Update project dependencies"> <echo message="Updated project '${project.name}' with the latest Seam jars"/>

16 years, 3 months

1
0
0 / 0

Seam SVN: r9584 - in trunk/src/test/ftest: src/main/org/jboss/seam/example/common/test/booking/selenium and 1 other directories.

by seam-commits＠lists.jboss.org

Author: jharting Date: 2008-11-18 04:59:06 -0500 (Tue, 18 Nov 2008) New Revision: 9584 Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java Log: Minor Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java =================================================================== --- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java 2008-11-17 19:58:18 UTC (rev 9583) +++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java 2008-11-18 09:59:06 UTC (rev 9584) @@ -67,7 +67,7 @@ @AfterMethod public void tearDown() { logout(browser); - stopBrowser(browser); + stopBrowser(); } public void logout(Selenium browser) { Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java 2008-11-17 19:58:18 UTC (rev 9583) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java 2008-11-18 09:59:06 UTC (rev 9584) @@ -58,7 +58,7 @@ @Override @AfterMethod public void tearDown() { - browser.stop(); + stopBrowser(); } @Test Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2008-11-17 19:58:18 UTC (rev 9583) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2008-11-18 09:59:06 UTC (rev 9584) @@ -52,7 +52,7 @@ @AfterMethod public void tearDown() { logout(); - browser.stop(); + stopBrowser(); } public boolean login() { Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2008-11-17 19:58:18 UTC (rev 9583) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2008-11-18 09:59:06 UTC (rev 9584) @@ -78,7 +78,7 @@ @AfterMethod public void tearDown() { - stopBrowser(browser); + stopBrowser(); } public void startBrowser() { @@ -88,7 +88,7 @@ browser.setSpeed(SPEED); } - public void stopBrowser(Selenium browser) { + public void stopBrowser() { browser.stop(); }

16 years, 3 months

1
0
0 / 0

Seam SVN: r9583 - branches/community/Seam_2_0/seam-gen/build-scripts.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-11-17 14:58:18 -0500 (Mon, 17 Nov 2008) New Revision: 9583 Modified: branches/community/Seam_2_0/seam-gen/build-scripts/.classpath Log: jboss-ui.jar should be jboss-seam-ui.jar Modified: branches/community/Seam_2_0/seam-gen/build-scripts/.classpath =================================================================== --- branches/community/Seam_2_0/seam-gen/build-scripts/.classpath 2008-11-17 09:59:46 UTC (rev 9582) +++ branches/community/Seam_2_0/seam-gen/build-scripts/.classpath 2008-11-17 19:58:18 UTC (rev 9583) @@ -11,7 +11,7 @@ <classpathentry kind="lib" path="lib/hibernate-commons-annotations.jar"/> <classpathentry kind="lib" path="lib/hibernate-entitymanager.jar"/> <classpathentry kind="lib" path="lib/jboss-seam.jar" sourcepath="lib/src/jboss-seam-sources.jar"/> - <classpathentry kind="lib" path="lib/jboss-ui.jar" sourcepath="lib/src/jboss-seam-ui-sources.jar"/> + <classpathentry kind="lib" path="lib/jboss-seam-ui.jar" sourcepath="lib/src/jboss-seam-ui-sources.jar"/> <classpathentry kind="lib" path="lib/jboss-seam-debug.jar"/> <classpathentry kind="lib" path="lib/jboss-cache.jar"/> <classpathentry kind="lib" path="lib/jbpm-jpdl.jar"/>

16 years, 3 months

1
0
0 / 0

Seam SVN: r9582 - in trunk: examples/jpa and 29 other directories.

by seam-commits＠lists.jboss.org

Author: jharting Date: 2008-11-17 04:59:46 -0500 (Mon, 17 Nov 2008) New Revision: 9582 Added: trunk/src/test/ftest/examples/booking/jboss-embedded.xml trunk/src/test/ftest/examples/booking/jboss.xml trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml trunk/src/test/ftest/examples/contactlist/jboss.xml trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml trunk/src/test/ftest/examples/dvdstore/jboss.xml trunk/src/test/ftest/examples/groovybooking/jboss.xml trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml trunk/src/test/ftest/examples/hibernate/jboss.xml trunk/src/test/ftest/examples/hibernate/tomcat6.xml trunk/src/test/ftest/examples/icefaces/jboss.xml trunk/src/test/ftest/examples/jpa/jboss-embedded.xml trunk/src/test/ftest/examples/jpa/jboss.xml trunk/src/test/ftest/examples/jpa/tomcat6.xml trunk/src/test/ftest/examples/nestedbooking/jboss.xml trunk/src/test/ftest/examples/quartz/jboss-embedded.xml trunk/src/test/ftest/examples/quartz/jboss.xml trunk/src/test/ftest/examples/seampay/jboss-embedded.xml trunk/src/test/ftest/examples/seampay/jboss.xml trunk/src/test/ftest/examples/spring/jboss.xml trunk/src/test/ftest/examples/wicket/jboss.xml Removed: trunk/src/test/ftest/examples/booking/testng.xml trunk/src/test/ftest/examples/contactlist/testng.xml trunk/src/test/ftest/examples/dvdstore/testng.xml trunk/src/test/ftest/examples/groovybooking/testng.xml trunk/src/test/ftest/examples/hibernate/testng.xml trunk/src/test/ftest/examples/icefaces/testng.xml trunk/src/test/ftest/examples/jpa/testng.xml trunk/src/test/ftest/examples/nestedbooking/testng.xml trunk/src/test/ftest/examples/quartz/testng.xml trunk/src/test/ftest/examples/seampay/testng.xml trunk/src/test/ftest/examples/spring/testng.xml trunk/src/test/ftest/examples/wicket/testng.xml Modified: trunk/examples/hibernate/build.xml trunk/examples/jpa/build.xml trunk/src/test/ftest/build.xml trunk/src/test/ftest/examples/booking/build.xml trunk/src/test/ftest/examples/booking/src/org/jboss/seam/example/booking/test/selenium/booking.properties trunk/src/test/ftest/examples/build.xml trunk/src/test/ftest/examples/contactlist/build.xml trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/CommentTest.java trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactCRUDTest.java trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactlistConstants.java trunk/src/test/ftest/examples/dvdstore/build.xml trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/RegistrationTest.java trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties trunk/src/test/ftest/examples/groovybooking/build.xml trunk/src/test/ftest/examples/groovybooking/src/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties trunk/src/test/ftest/examples/hibernate/build.xml trunk/src/test/ftest/examples/hibernate/src/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties trunk/src/test/ftest/examples/icefaces/build.xml trunk/src/test/ftest/examples/icefaces/src/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties trunk/src/test/ftest/examples/jpa/build.xml trunk/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties trunk/src/test/ftest/examples/nestedbooking/build.xml trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/NestedSimpleBookingTest.java trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties trunk/src/test/ftest/examples/quartz/build.xml trunk/src/test/ftest/examples/quartz/src/org/jboss/seam/example/quartz/test/selenium/quartz.properties trunk/src/test/ftest/examples/seampay/build.xml trunk/src/test/ftest/examples/seampay/src/org/jboss/seam/example/seampay/test/selenium/seampay.properties trunk/src/test/ftest/examples/spring/build.xml trunk/src/test/ftest/examples/spring/src/org/jboss/seam/example/spring/test/selenium/spring.properties trunk/src/test/ftest/examples/wicket/build.xml trunk/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties trunk/src/test/ftest/ftest.properties trunk/src/test/ftest/readme.txt trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/ConversationTest.java trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SimpleBookingTest.java trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/seampay/selenium/PaymentTest.java trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java Log: Added Tomcat support in functional tests. Modified: trunk/examples/hibernate/build.xml =================================================================== --- trunk/examples/hibernate/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/examples/hibernate/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -10,6 +10,10 @@ <ant antfile="build-jboss-embedded.xml"/> </target> + <target name="jboss-embedded.undeploy" description="Undeploy from JBoss Embedded in Tomcat"> + <ant antfile="build-jboss-embedded.xml" target="tomcat.undeploy"/> + </target> + <target name="jboss.undeploy" description="Build the Hibernate Booking example artifacts, and deploy to JBoss 4.2.0.GA"> <ant antfile="build-jboss.xml" target="jbosswar.undeploy"/> </target> @@ -37,6 +41,14 @@ <target name="tomcat6" description="Build the Hibernate Booking example artifacts, suitable for deployment to Tomcat 6"> <ant antfile="build-tomcat6.xml"/> </target> + + <target name="tomcat6.deploy" depends="tomcat6" description="Deploy to Tomcat 6.0"> + <ant antfile="build-tomcat6.xml" target="tomcat.deploy"/> + </target> + + <target name="tomcat6.undeploy" description="Undeploy from Tomcat 6.0"> + <ant antfile="build-tomcat6.xml" target="tomcat.undeploy"/> + </target> <target name="clean" description="Clean up the example"> <ant antfile="build-jboss.xml" target="clean" /> Modified: trunk/examples/jpa/build.xml =================================================================== --- trunk/examples/jpa/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/examples/jpa/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -10,6 +10,10 @@ <ant antfile="build-jboss-embedded.xml"/> </target> + <target name="jboss-embedded.undeploy" description="Undeploy from JBoss Embedded in Tomcat"> + <ant antfile="build-jboss-embedded.xml" target="tomcat.undeploy"/> + </target> + <target name="jboss.undeploy" description="Undeploy JPA example from JBoss AS"> <ant antfile="build-jboss.xml" target="jbosswar.undeploy"/> </target> @@ -41,6 +45,14 @@ <target name="tomcat6" description="Build the JPA artifacts, suitable for deployment to Tomcat 6.0"> <ant antfile="build-tomcat6.xml"/> </target> + + <target name="tomcat6.deploy" depends="tomcat6" description="Deploy to Tomcat 6.0"> + <ant antfile="build-tomcat6.xml" target="tomcat.deploy"/> + </target> + + <target name="tomcat6.undeploy" description="Undeploy from Tomcat 6.0"> + <ant antfile="build-tomcat6.xml" target="tomcat.undeploy"/> + </target> <target name="clean" description="Clean up the example"> <ant antfile="build-jboss.xml" target="clean" /> Modified: trunk/src/test/ftest/build.xml =================================================================== --- trunk/src/test/ftest/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -41,12 +41,15 @@ <include name="selenium-server-standalone.jar" /> </fileset> </path> - + <target name="testall"> - <antcall target="start.selenium.server"> - </antcall> + <antcall target="testall.jboss"/> + </target> -  + <target name="testall.jboss"> + <property name="container" value="jboss" /> + <antcall target="start.selenium.server"/> +  <testexample name="booking" /> <testexample name="dvdstore" /> <testexample name="contactlist" /> @@ -59,20 +62,58 @@ <testexample name="seampay" /> <testexample name="spring" /> <testexample name="wicket" /> - - <antcall target="stop.selenium.server"> - </antcall> + <antcall target="stop.selenium.server"/> </target> + + <target name="testall.jboss-embedded"> + <property name="container" value="jboss-embedded" /> + <antcall target="start.selenium.server"/> +  + <testexample name="dvdstore" /> + <testexample name="seampay" /> + <testexample name="booking" /> + <testexample name="jpa" /> + <testexample name="hibernate" /> + <antcall target="stop.selenium.server"/> + </target> + + <target name="testall.tomcat6"> + + <property name="container" value="tomcat6" /> + <antcall target="start.selenium.server"/> - <target name="test"> - <antcall target="start.selenium.server"> - </antcall> + <testexample name="jpa" /> + <testexample name="hibernate" /> + + <antcall target="stop.selenium.server"/> + </target> + <target name="test"> + <antcall target="test.jboss"/> + </target> + + <target name="test.jboss"> + <property name="container" value="jboss" /> + <antcall target="test.single.example"/> + </target> + + <target name="test.tomcat6"> + <property name="container" value="tomcat6" /> + <antcall target="test.single.example"/> + </target> + + <target name="test.jboss-embedded"> + <property name="container" value="jboss-embedded" /> + <antcall target="test.single.example"/> + </target> + + <target name="test.single.example"> + <antcall target="start.selenium.server"/> +  <testexample name="${test}" /> - <antcall target="stop.selenium.server"> - </antcall> + <antcall target="stop.selenium.server"/> </target> <target name="cleanall"> @@ -163,7 +204,9 @@ <attribute name="path" /> <attribute name="target" /> <sequential> - <ant dir="@{path}" target="@{target}" inheritall="false" /> + <ant dir="@{path}" target="@{target}" inheritall="false" > + <property name="container" value="${container}"></property> + </ant> </sequential> </macrodef> </project> Modified: trunk/src/test/ftest/examples/booking/build.xml =================================================================== --- trunk/src/test/ftest/examples/booking/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/booking/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,11 @@ <project name="booking.ftest.build" basedir="." default="build"> <property name="example.name" value="booking"/> <property name="jboss.deploy.target" value="deploy"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="undeploy"/> - <property name="example.ready.check.url" value="seam-booking/home.seam"/> + <property name="jboss.example.ready.check.url" value="seam-booking/home.seam"/> + <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/> + <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/> + <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-booking/home.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/booking/jboss-embedded.xml =================================================================== --- trunk/src/test/ftest/examples/booking/jboss-embedded.xml (rev 0) +++ trunk/src/test/ftest/examples/booking/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,40 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Booking example" verbose="2" parallel="false"> + <test name="booking_jboss-embedded"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/booking/test/selenium/booking.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-booking" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/booking/jboss-embedded.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/test/ftest/examples/booking/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/booking/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/booking/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,40 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Booking example" verbose="2" parallel="false"> + <test name="booking_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/booking/test/selenium/booking.properties" /> + <parameter name="CONTEXT_PATH" value="/seam-booking" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/booking/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/booking/src/org/jboss/seam/example/booking/test/selenium/booking.properties =================================================================== --- trunk/src/test/ftest/examples/booking/src/org/jboss/seam/example/booking/test/selenium/booking.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/booking/src/org/jboss/seam/example/booking/test/selenium/booking.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,8 +19,8 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /seam-booking/home.seam -MAIN_PAGE /seam-booking/main.seam +HOME_PAGE /home.seam +MAIN_PAGE /main.seam PAGE_TITLE JBoss Suites: Seam Framework LOGIN_USERNAME_FIELD id=login:username LOGIN_PASSWORD_FIELD id=login:password Deleted: trunk/src/test/ftest/examples/booking/testng.xml =================================================================== --- trunk/src/test/ftest/examples/booking/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/booking/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,39 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Booking example" verbose="2" parallel="false"> - <test name="Booking example"> - <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/booking/test/selenium/booking.properties" /> - <classes> - <class - name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> - </classes> - </test> -</suite> \ No newline at end of file Modified: trunk/src/test/ftest/examples/build.xml =================================================================== --- trunk/src/test/ftest/examples/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -80,22 +80,13 @@ </copy> </target> - <target name="test" depends="build" description="Run Tests"> - -  - <antcall target="test.jboss" /> - -  - - </target> - <target name="selenium.test" depends="build" description="Run Tests"> <taskdef resource="testngtasks" classpathref="classpath.test" /> <mkdir dir="${test.output.dir}" />  <testng haltonfailure="false" outputdir="${test.output.dir}" classpathref="classpath.test"> - <xmlfileset file="testng.xml" /> + <xmlfileset file="${container}.xml" /> <sysproperty key="selenium.server.port" value="${selenium.server.port}" /> <sysproperty key="selenium.host" value="${selenium.host}" /> <sysproperty key="selenium.browser" value="${selenium.browser}" /> @@ -105,20 +96,22 @@ </testng> </target> - <target name="test.jboss" depends="build" description="Run Tests"> + <target name="test" depends="build" description="Run Tests">    - +  + <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> +  - <antcall target="deploy.example.jboss" /> + <antcall target="deploy.example.${container}" />  <antcall target="selenium.test" />  - <antcall target="undeploy.example.jboss" /> + <antcall target="undeploy.example.${container}" />  @@ -147,7 +140,7 @@ <waitfor maxwait="${jboss.deploy.waittime}" maxwaitunit="second"> <and>  - <http url="${selenium.browser.url}/${example.ready.check.url}" errorsBeginAt="404" /> + <http url="${selenium.browser.url}/${jboss.example.ready.check.url}" errorsBeginAt="404" /> </and> </waitfor> </target> @@ -157,14 +150,40 @@ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> </target> - <target name="deploy.example.tomcat"> + <target name="deploy.example.tomcat6"> <echo>Deploying Tomcat Example - ${example.name}</echo> - <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> + <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${tomcat6.deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> +  +  + <waitfor maxwait="${tomcat6.deploy.waittime}" maxwaitunit="second"> + <and> +  + <http url="${selenium.browser.url}/${tomcat6.example.ready.check.url}" errorsBeginAt="404" /> + </and> + </waitfor> </target> - <target name="undeploy.example.tomcat"> + <target name="undeploy.example.tomcat6"> <echo>Undeploying Tomcat Example - ${example.name}</echo> - <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> + <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${tomcat6.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> </target> + + <target name="deploy.example.jboss-embedded"> + <echo>Deploying Tomcat Example - ${example.name}</echo> + <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss-embedded.deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> +  +  + <waitfor maxwait="${jboss-embedded.deploy.waittime}" maxwaitunit="second"> + <and> +  + <http url="${selenium.browser.url}/${jboss-embedded.example.ready.check.url}" errorsBeginAt="404" /> + </and> + </waitfor> + </target> + <target name="undeploy.example.jboss-embedded"> + <echo>Undeploying Tomcat Example - ${example.name}</echo> + <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss-embedded.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> + </target> + </project> Modified: trunk/src/test/ftest/examples/contactlist/build.xml =================================================================== --- trunk/src/test/ftest/examples/contactlist/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/contactlist/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,11 @@ <project name="contactlist.ftest.build" basedir="." default="build"> <property name="example.name" value="contactlist"/> <property name="jboss.deploy.target" value="deploy"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="undeploy"/> - <property name="example.ready.check.url" value="seam-contactlist/search.seam"/> + <property name="jboss.example.ready.check.url" value="seam-contactlist/search.seam"/> + <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/> + <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/> + <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-contactlist/search.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml =================================================================== --- trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml (rev 0) +++ trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,34 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Contactlist example" verbose="2" parallel="false"> + <test name="contactlist_jboss-embedded"> + <parameter name="PROPERTY_FILE" value="empty" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-contactlist" /> + <classes> + <class + name="org.jboss.seam.example.contactlist.test.selenium.ContactCRUDTest" /> + <class + name="org.jboss.seam.example.contactlist.test.selenium.CommentTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/test/ftest/examples/contactlist/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/contactlist/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/contactlist/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,34 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Contactlist example" verbose="2" parallel="false"> + <test name="contactlist_jboss"> + <parameter name="PROPERTY_FILE" value="empty" /> + <parameter name="CONTEXT_PATH" value="/seam-contactlist" /> + <classes> + <class + name="org.jboss.seam.example.contactlist.test.selenium.ContactCRUDTest" /> + <class + name="org.jboss.seam.example.contactlist.test.selenium.CommentTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/contactlist/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/CommentTest.java =================================================================== --- trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/CommentTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/CommentTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -34,7 +34,7 @@ String lastName = "King"; String message = "founder of the Hibernate open source object/relational mapping project"; // find contact - browser.open(START_PAGE); + browser.open(CONTEXT_PATH + START_PAGE); new Wait() { @Override public boolean until() { Modified: trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactCRUDTest.java =================================================================== --- trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactCRUDTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactCRUDTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -39,7 +39,7 @@ @Test public void testCreateContact() { - browser.open(START_PAGE); + browser.open(CONTEXT_PATH + START_PAGE); new Wait() { @Override public boolean until() { @@ -64,7 +64,7 @@ @Test public void testCreationCanceling() { - browser.open(START_PAGE); + browser.open(CONTEXT_PATH + START_PAGE); new Wait() { @Override public boolean until() { @@ -95,7 +95,7 @@ String firstName = "Shane"; String lastName = "Bryzak"; // find contact - browser.open(START_PAGE); + browser.open(CONTEXT_PATH + START_PAGE); new Wait() { @Override public boolean until() { @@ -130,7 +130,7 @@ String firstName = "Norman"; String lastName = "Richards"; // find contact - browser.open(START_PAGE); + browser.open(CONTEXT_PATH + START_PAGE); new Wait() { @Override public boolean until() { Modified: trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactlistConstants.java =================================================================== --- trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactlistConstants.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactlistConstants.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,7 +23,7 @@ public interface ContactlistConstants { - public static String START_PAGE = "/seam-contactlist"; + public static String START_PAGE = "/"; public static String SEARCH_CONTACT_PAGE = "id=search"; public static String SEARCH_FIRST_NAME_FIELD = "id=searchForm:firstName"; public static String SEARCH_LAST_NAME_FIELD = "id=searchForm:lastName"; Deleted: trunk/src/test/ftest/examples/contactlist/testng.xml =================================================================== --- trunk/src/test/ftest/examples/contactlist/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/contactlist/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,33 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Contactlist example" verbose="2" parallel="false"> - <test name="Contactlist example"> - <parameter name="PROPERTY_FILE" value="empty" /> - <classes> - <class - name="org.jboss.seam.example.contactlist.test.selenium.ContactCRUDTest" /> - <class - name="org.jboss.seam.example.contactlist.test.selenium.CommentTest" /> - </classes> - </test> -</suite> \ No newline at end of file Modified: trunk/src/test/ftest/examples/dvdstore/build.xml =================================================================== --- trunk/src/test/ftest/examples/dvdstore/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/dvdstore/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -24,8 +24,10 @@ <property name="example.name" value="dvdstore" /> <property name="jboss.deploy.target" value="deploy" /> <property name="jboss.undeploy.target" value="undeploy" /> - <property name="jboss.deploy.waittime" value="20" /> - <property name="example.ready.check.url" value="seam-dvdstore/home.seam"/> + <property name="jboss.example.ready.check.url" value="seam-dvdstore/search.seam"/> + <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/> + <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/> + <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-dvdstore/search.seam"/> <import file="../build.xml" /> Added: trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml =================================================================== --- trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml (rev 0) +++ trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,39 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="DVD example" verbose="2" parallel="false"> + <test name="dvdstore_jboss-embedded"> + <parameter name="PROPERTY_FILE" + value="/org/jboss/seam/example/dvd/test/selenium/dvd.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-dvdstore" /> + <classes> + <class + name="org.jboss.seam.example.dvd.test.selenium.LoginTest" /> + <class + name="org.jboss.seam.example.dvd.test.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.dvd.test.selenium.SearchTest" /> + <class + name="org.jboss.seam.example.dvd.test.selenium.ShoppingCartTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/test/ftest/examples/dvdstore/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/dvdstore/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/dvdstore/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,39 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="DVD example" verbose="2" parallel="false"> + <test name="dvdstore_jboss"> + <parameter name="PROPERTY_FILE" + value="/org/jboss/seam/example/dvd/test/selenium/dvd.properties" /> + <parameter name="CONTEXT_PATH" value="/seam-dvdstore" /> + <classes> + <class + name="org.jboss.seam.example.dvd.test.selenium.LoginTest" /> + <class + name="org.jboss.seam.example.dvd.test.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.dvd.test.selenium.SearchTest" /> + <class + name="org.jboss.seam.example.dvd.test.selenium.ShoppingCartTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/dvdstore/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/RegistrationTest.java =================================================================== --- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/RegistrationTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/RegistrationTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -46,7 +46,7 @@ @BeforeMethod public void setUp() { startBrowser(); - browser.open(getProperty("HOME_PAGE")); + browser.open(CONTEXT_PATH + getProperty("HOME_PAGE")); new Wait() { public boolean until() { return browser.isElementPresent(getProperty("REGISTRATION")); Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java =================================================================== --- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -64,22 +64,15 @@ String searchString1 = "Forrest Gump"; String searchString2 = "The Shawshank Redemption"; - // browser.openWindow(getProperty("HOME_PAGE"), "1"); - browser.openWindow(getProperty("HOME_PAGE"), "1"); + browser.openWindow(CONTEXT_PATH + getProperty("HOME_PAGE"), "1"); browser.selectWindow("1"); browser.waitForPageToLoad(TIMEOUT); assertTrue("User should be logged in by now.", isLoggedIn(browser)); - // if (!isLoggedIn(browser)) { - // login(browser, USERNAME, PASSWORD); - // } // search for dvd in first window - browser.openWindow(getProperty("HOME_PAGE"), "2"); + browser.openWindow(CONTEXT_PATH + getProperty("HOME_PAGE"), "2"); browser.selectWindow("2"); browser.waitForPageToLoad(TIMEOUT); assertTrue("User should be logged in by now.", isLoggedIn(browser)); - // if (!isLoggedIn(browser)) { - // login(browser, USERNAME, PASSWORD); - // } browser.click(getProperty("SHOP")); browser.waitForPageToLoad(TIMEOUT); browser.type(getProperty("SEARCH_FIELD"), searchString1); Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java =================================================================== --- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -48,7 +48,7 @@ } public boolean login(String username, String password) { - browser.open(getProperty("HOME_PAGE")); + browser.open(CONTEXT_PATH + getProperty("HOME_PAGE")); new Wait() { public boolean until() { return browser.isElementPresent(getProperty("LOGIN_SUBMIT")); Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties =================================================================== --- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,7 +19,7 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /seam-dvdstore/ +HOME_PAGE / HOME_PAGE_TITLE JBoss DVD Store LOGOUT id=LogoutForm:Logout REGISTRATION id=LoginForm:CreateAccount Deleted: trunk/src/test/ftest/examples/dvdstore/testng.xml =================================================================== --- trunk/src/test/ftest/examples/dvdstore/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/dvdstore/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,38 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="DVD example" verbose="2" parallel="false"> - <test name="DVD example"> - <parameter name="PROPERTY_FILE" - value="/org/jboss/seam/example/dvd/test/selenium/dvd.properties" /> - <classes> - <class - name="org.jboss.seam.example.dvd.test.selenium.LoginTest" /> - <class - name="org.jboss.seam.example.dvd.test.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.dvd.test.selenium.SearchTest" /> - <class - name="org.jboss.seam.example.dvd.test.selenium.ShoppingCartTest" /> - </classes> - </test> -</suite> \ No newline at end of file Modified: trunk/src/test/ftest/examples/groovybooking/build.xml =================================================================== --- trunk/src/test/ftest/examples/groovybooking/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/groovybooking/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,8 @@ <project name="groovybooking.ftest.build" basedir="." default="build"> <property name="example.name" value="groovybooking" /> <property name="jboss.deploy.target" value="jbosswar.deploy" /> - <property name="jboss.deploy.waittime" value="10" /> <property name="jboss.undeploy.target" value="undeploy" /> - <property name="example.ready.check.url" value="jboss-seam-groovy/home.seam" /> + <property name="jbosss.example.ready.check.url" value="jboss-seam-groovy/home.seam"/> <import file="../build.xml" /> Added: trunk/src/test/ftest/examples/groovybooking/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/groovybooking/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/groovybooking/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,41 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Groovybooking example" verbose="2" parallel="false"> + <test name="groovybooking_jboss"> + <parameter name="PROPERTY_FILE" + value="/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-groovy" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/groovybooking/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/groovybooking/src/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties =================================================================== --- trunk/src/test/ftest/examples/groovybooking/src/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/groovybooking/src/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,8 +19,8 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /jboss-seam-groovy/home.seam -MAIN_PAGE /jboss-seam-groovy/main.seam +HOME_PAGE /home.seam +MAIN_PAGE /main.seam PAGE_TITLE JBoss Suites: Seam Framework LOGIN_USERNAME_FIELD id=login:username LOGIN_PASSWORD_FIELD id=login:password Deleted: trunk/src/test/ftest/examples/groovybooking/testng.xml =================================================================== --- trunk/src/test/ftest/examples/groovybooking/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/groovybooking/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,40 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Groovybooking example" verbose="2" parallel="false"> - <test name="GroovyBooking example"> - <parameter name="PROPERTY_FILE" - value="/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties" /> - <classes> - <class - name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> - </classes> - </test> -</suite> \ No newline at end of file Modified: trunk/src/test/ftest/examples/hibernate/build.xml =================================================================== --- trunk/src/test/ftest/examples/hibernate/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/hibernate/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,14 @@ <project name="hibernate.ftest.build" basedir="." default="build"> <property name="example.name" value="hibernate"/> <property name="jboss.deploy.target" value="jboss"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="jboss.undeploy"/> - <property name="example.ready.check.url" value="jboss-seam-hibernate/home.seam"/> + <property name="jboss.example.ready.check.url" value="jboss-seam-hibernate/home.seam"/> + <property name="tomcat6.deploy.target" value="tomcat6.deploy"/> + <property name="tomcat6.undeploy.target" value="tomcat6.undeploy"/> + <property name="tomcat6.example.ready.check.url" value="jboss-seam-hibernate/home.seam"/> + <property name="jboss-embedded.deploy.target" value="jboss-embedded"/> + <property name="jboss-embedded.undeploy.target" value="jboss-embedded.undeploy"/> + <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-hibernate/home.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml =================================================================== --- trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml (rev 0) +++ trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,41 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Hibernate example" verbose="2" parallel="false"> + <test name="hibernate_jboss-embedded"> + <parameter name="PROPERTY_FILE" + value="/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-hibernate" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/test/ftest/examples/hibernate/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/hibernate/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/hibernate/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,41 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Hibernate example" verbose="2" parallel="false"> + <test name="hibernate_jboss"> + <parameter name="PROPERTY_FILE" + value="/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-hibernate" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/hibernate/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/hibernate/src/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties =================================================================== --- trunk/src/test/ftest/examples/hibernate/src/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/hibernate/src/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,8 +19,8 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /jboss-seam-hibernate/home.seam -MAIN_PAGE /jboss-seam-hibernate/main.seam +HOME_PAGE /home.seam +MAIN_PAGE /main.seam PAGE_TITLE JBoss Suites: Seam Framework LOGIN_USERNAME_FIELD id=login:username LOGIN_PASSWORD_FIELD id=login:password Deleted: trunk/src/test/ftest/examples/hibernate/testng.xml =================================================================== --- trunk/src/test/ftest/examples/hibernate/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/hibernate/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,40 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Hibernate example" verbose="2" parallel="false"> - <test name="Hibernate example"> - <parameter name="PROPERTY_FILE" - value="/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties" /> - <classes> - <class - name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> - </classes> - </test> -</suite> \ No newline at end of file Added: trunk/src/test/ftest/examples/hibernate/tomcat6.xml =================================================================== --- trunk/src/test/ftest/examples/hibernate/tomcat6.xml (rev 0) +++ trunk/src/test/ftest/examples/hibernate/tomcat6.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,41 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Hibernate example" verbose="2" parallel="false"> + <test name="hibernate_tomcat6"> + <parameter name="PROPERTY_FILE" + value="/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-hibernate" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/hibernate/tomcat6.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/icefaces/build.xml =================================================================== --- trunk/src/test/ftest/examples/icefaces/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/icefaces/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,8 @@ <project name="icefaces.ftest.build" basedir="." default="build"> <property name="example.name" value="icefaces"/> <property name="jboss.deploy.target" value="deploy"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="undeploy"/> - <property name="example.ready.check.url" value="seam-icefaces/home.seam"/> + <property name="jboss.example.ready.check.url" value="seam-icefaces/home.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/icefaces/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/icefaces/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/icefaces/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,43 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Icefaces example" verbose="2" parallel="false"> + <test name="icefaces_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties" /> + <parameter name="CONTEXT_PATH" value="/seam-icefaces" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest"> + <methods> + <include name="backbuttoningAfterLogoutTest"></include> + </methods> + </class> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/icefaces/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/icefaces/src/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties =================================================================== --- trunk/src/test/ftest/examples/icefaces/src/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/icefaces/src/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,8 +19,8 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /seam-icefaces/home.seam -MAIN_PAGE /seam-icefaces/main.seam +HOME_PAGE /home.seam +MAIN_PAGE /main.seam PAGE_TITLE JBoss Suites: Seam Framework LOGIN_USERNAME_FIELD id=login:username LOGIN_PASSWORD_FIELD id=login:password Deleted: trunk/src/test/ftest/examples/icefaces/testng.xml =================================================================== --- trunk/src/test/ftest/examples/icefaces/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/icefaces/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,42 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Icefaces example" verbose="2" parallel="false"> - <test name="Icefaces example"> - <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties" /> - <classes> - <class - name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> - <class name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest"> - <methods> - <include name="backbuttoningAfterLogoutTest"></include> - </methods> - </class> - <class - name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> - </classes> - </test> -</suite> \ No newline at end of file Modified: trunk/src/test/ftest/examples/jpa/build.xml =================================================================== --- trunk/src/test/ftest/examples/jpa/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/jpa/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,14 @@ <project name="jpa.ftest.build" basedir="." default="build"> <property name="example.name" value="jpa"/> <property name="jboss.deploy.target" value="jboss"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="jboss.undeploy"/> - <property name="example.ready.check.url" value="jboss-seam-jpa/home.seam"/> + <property name="jboss.example.ready.check.url" value="jboss-seam-jpa/home.seam"/> + <property name="tomcat6.deploy.target" value="tomcat6.deploy"/> + <property name="tomcat6.undeploy.target" value="tomcat6.undeploy"/> + <property name="tomcat6.example.ready.check.url" value="jboss-seam-jpa/home.seam"/> + <property name="jboss-embedded.deploy.target" value="jboss-embedded"/> + <property name="jboss-embedded.undeploy.target" value="jboss-embedded.undeploy"/> + <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-jpa/home.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/jpa/jboss-embedded.xml =================================================================== --- trunk/src/test/ftest/examples/jpa/jboss-embedded.xml (rev 0) +++ trunk/src/test/ftest/examples/jpa/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,40 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="JPA example" verbose="2" parallel="false"> + <test name="jpa_jboss-embedded"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jpa/test/selenium/jpa.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-jpa" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/jpa/jboss-embedded.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/test/ftest/examples/jpa/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/jpa/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/jpa/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,40 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="JPA example" verbose="2" parallel="false"> + <test name="jpa_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jpa/test/selenium/jpa.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-jpa" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/jpa/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties =================================================================== --- trunk/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,8 +19,8 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /jboss-seam-jpa/home.seam -MAIN_PAGE /jboss-seam-jpa/main.seam +HOME_PAGE /home.seam +MAIN_PAGE /main.seam PAGE_TITLE JBoss Suites: Seam Framework LOGIN_USERNAME_FIELD id=login:username LOGIN_PASSWORD_FIELD id=login:password Deleted: trunk/src/test/ftest/examples/jpa/testng.xml =================================================================== --- trunk/src/test/ftest/examples/jpa/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/jpa/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,39 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="JPA example" verbose="2" parallel="false"> - <test name="JPA example"> - <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jpa/test/selenium/jpa.properties" /> - <classes> - <class - name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> - </classes> - </test> -</suite> \ No newline at end of file Added: trunk/src/test/ftest/examples/jpa/tomcat6.xml =================================================================== --- trunk/src/test/ftest/examples/jpa/tomcat6.xml (rev 0) +++ trunk/src/test/ftest/examples/jpa/tomcat6.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,40 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="JPA example" verbose="2" parallel="false"> + <test name="jpa_tomcat6"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jpa/test/selenium/jpa.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-jpa" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/jpa/tomcat6.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/nestedbooking/build.xml =================================================================== --- trunk/src/test/ftest/examples/nestedbooking/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/nestedbooking/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,8 @@ <project name="nestedbooking.ftest.build" basedir="." default="build"> <property name="example.name" value="nestedbooking"/> <property name="jboss.deploy.target" value="deploy"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="undeploy"/> - <property name="example.ready.check.url" value="seam-nestedbooking/home.seam"/> + <property name="jboss.example.ready.check.url" value="seam-nestedbooking/home.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/nestedbooking/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/nestedbooking/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/nestedbooking/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,36 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Nested booking example" verbose="2" parallel="false"> + <test name="nestedbooking_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties" /> + <parameter name="CONTEXT_PATH" value="/seam-nestedbooking" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class name="org.jboss.seam.example.nestedbooking.test.selenium.NestedSimpleBookingTest"></class> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/nestedbooking/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/NestedSimpleBookingTest.java =================================================================== --- trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/NestedSimpleBookingTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/NestedSimpleBookingTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -43,7 +43,7 @@ } if (!browser.isElementPresent(getProperty("SEARCH_SUBMIT"))) { - browser.open(getProperty("MAIN_PAGE")); + browser.open(CONTEXT_PATH + getProperty("MAIN_PAGE")); browser.waitForPageToLoad(TIMEOUT); } Modified: trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties =================================================================== --- trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,8 +19,8 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /seam-nestedbooking/home.seam -MAIN_PAGE /seam-nestedbooking/main.seam +HOME_PAGE /home.seam +MAIN_PAGE /main.seam PAGE_TITLE JBoss Suites: Seam Framework LOGIN_USERNAME_FIELD id=login:username LOGIN_PASSWORD_FIELD id=login:password Deleted: trunk/src/test/ftest/examples/nestedbooking/testng.xml =================================================================== --- trunk/src/test/ftest/examples/nestedbooking/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/nestedbooking/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,35 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Nested booking example" verbose="2" parallel="false"> - <test name="Nested booking example"> - <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties" /> - <classes> - <class - name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> - <class name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> - <class name="org.jboss.seam.example.nestedbooking.test.selenium.NestedSimpleBookingTest"></class> - </classes> - </test> -</suite> \ No newline at end of file Modified: trunk/src/test/ftest/examples/quartz/build.xml =================================================================== --- trunk/src/test/ftest/examples/quartz/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/quartz/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,11 @@ <project name="quartz.ftest.build" basedir="." default="build"> <property name="example.name" value="quartz"/> <property name="jboss.deploy.target" value="deploy"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="undeploy"/> - <property name="example.ready.check.url" value="seam-quartz/search.seam"/> + <property name="jboss.example.ready.check.url" value="seam-quartz/search.seam"/> + <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/> + <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/> + <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-quartz/search.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/quartz/jboss-embedded.xml =================================================================== --- trunk/src/test/ftest/examples/quartz/jboss-embedded.xml (rev 0) +++ trunk/src/test/ftest/examples/quartz/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,31 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Quartz example" verbose="2" parallel="false"> + <test name="quartz_jboss-embedded"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/quartz/test/selenium/quartz.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-quartz" /> + <classes> + <class name="org.jboss.seam.example.quartz.test.selenium.QuartzPaymentTest" /> + </classes> + </test> +</suite> Property changes on: trunk/src/test/ftest/examples/quartz/jboss-embedded.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/test/ftest/examples/quartz/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/quartz/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/quartz/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,31 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Quartz example" verbose="2" parallel="false"> + <test name="quartz_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/quartz/test/selenium/quartz.properties" /> + <parameter name="CONTEXT_PATH" value="/seam-quartz" /> + <classes> + <class name="org.jboss.seam.example.quartz.test.selenium.QuartzPaymentTest" /> + </classes> + </test> +</suite> Property changes on: trunk/src/test/ftest/examples/quartz/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/quartz/src/org/jboss/seam/example/quartz/test/selenium/quartz.properties =================================================================== --- trunk/src/test/ftest/examples/quartz/src/org/jboss/seam/example/quartz/test/selenium/quartz.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/quartz/src/org/jboss/seam/example/quartz/test/selenium/quartz.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,7 +19,7 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -MAIN_PAGE = /seam-quartz/search.seam +MAIN_PAGE = /search.seam MAIN_PAGE_TITLE = Seam Pay ACCOUNT_TABLE_LINK = id=accountTable:{0}:link ACCOUNT_TABLE_BALANCE = id=accountTable:{0}:balance @@ -31,4 +31,4 @@ PAYMENT_EVERY_MINUTE_RADIO = id=accountView:paymentForm:radioList:1 PAYMENT_SUBMIT = id=accountView:paymentForm:submit PAYMENT_CONFIRMATION_MESSAGE =Created a new payment to {0} -PAYMENTS_COUNT = //table[@id='payments']/tbody/tr \ No newline at end of file +PAYMENTS_COUNT =//table[@id\='payments']/tbody/tr \ No newline at end of file Deleted: trunk/src/test/ftest/examples/quartz/testng.xml =================================================================== --- trunk/src/test/ftest/examples/quartz/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/quartz/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,30 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Quartz example" verbose="2" parallel="false"> - <test name="Quartz example"> - <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/quartz/test/selenium/quartz.properties" /> - <classes> - <class name="org.jboss.seam.example.quartz.test.selenium.QuartzPaymentTest" /> - </classes> - </test> -</suite> Modified: trunk/src/test/ftest/examples/seampay/build.xml =================================================================== --- trunk/src/test/ftest/examples/seampay/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/seampay/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,11 @@ <project name="seampay.ftest.build" basedir="." default="build"> <property name="example.name" value="seampay"/> <property name="jboss.deploy.target" value="deploy"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="undeploy"/> - <property name="example.ready.check.url" value="seam-pay/search.seam"/> - + <property name="jboss.example.ready.check.url" value="seam-pay/search.seam"/> + <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/> + <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/> + <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-pay/search.seam"/> + <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/seampay/jboss-embedded.xml =================================================================== --- trunk/src/test/ftest/examples/seampay/jboss-embedded.xml (rev 0) +++ trunk/src/test/ftest/examples/seampay/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,31 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Seampay example" verbose="2" parallel="false"> + <test name="seampay_jboss-embedded"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/seampay/test/selenium/seampay.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-pay" /> + <classes> + <class name="org.jboss.seam.example.common.test.seampay.selenium.PaymentTest" /> + </classes> + </test> +</suite> Property changes on: trunk/src/test/ftest/examples/seampay/jboss-embedded.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/test/ftest/examples/seampay/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/seampay/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/seampay/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,31 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Seampay example" verbose="2" parallel="false"> + <test name="seampay_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/seampay/test/selenium/seampay.properties" /> + <parameter name="CONTEXT_PATH" value="/seam-pay" /> + <classes> + <class name="org.jboss.seam.example.common.test.seampay.selenium.PaymentTest" /> + </classes> + </test> +</suite> Property changes on: trunk/src/test/ftest/examples/seampay/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/seampay/src/org/jboss/seam/example/seampay/test/selenium/seampay.properties =================================================================== --- trunk/src/test/ftest/examples/seampay/src/org/jboss/seam/example/seampay/test/selenium/seampay.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/seampay/src/org/jboss/seam/example/seampay/test/selenium/seampay.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,7 +19,7 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -MAIN_PAGE = /seam-pay/search.seam +MAIN_PAGE = /search.seam MAIN_PAGE_TITLE = Seam Pay ACCOUNT_TABLE_LINK = id=accountTable:{0}:link ACCOUNT_TABLE_BALANCE = id=accountTable:{0}:balance @@ -29,4 +29,4 @@ PAYMENT_EVERY_MINUTE_RADIO = id=accountView:paymentForm:radioList:1 PAYMENT_SUBMIT = id=accountView:paymentForm:submit PAYMENT_CONFIRMATION_MESSAGE = Created a new payment to {0} -PAYMENTS_COUNT = //table[@id='payments']/tbody/tr \ No newline at end of file +PAYMENTS_COUNT =//table[@id\='payments']/tbody/tr \ No newline at end of file Deleted: trunk/src/test/ftest/examples/seampay/testng.xml =================================================================== --- trunk/src/test/ftest/examples/seampay/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/seampay/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,30 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Seampay example" verbose="2" parallel="false"> - <test name="Seampay example"> - <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/seampay/test/selenium/seampay.properties" /> - <classes> - <class name="org.jboss.seam.example.common.test.seampay.selenium.PaymentTest" /> - </classes> - </test> -</suite> Modified: trunk/src/test/ftest/examples/spring/build.xml =================================================================== --- trunk/src/test/ftest/examples/spring/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/spring/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,8 @@ <project name="spring.ftest.build" basedir="." default="build"> <property name="example.name" value="spring"/> <property name="jboss.deploy.target" value="jbosswar"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="jbosswar.undeploy"/> - <property name="example.ready.check.url" value="jboss-seam-spring/home.seam"/> + <property name="jboss.example.ready.check.url" value="jboss-seam-spring/home.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/spring/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/spring/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/spring/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,39 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Spring example" verbose="2" parallel="false"> + <test name="spring_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/spring/test/selenium/spring.properties" /> + <parameter name="CONTEXT_PATH" value="/jboss-seam-spring" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.spring.test.selenium.SpringChangePasswordTest" /> + <class name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/spring/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/spring/src/org/jboss/seam/example/spring/test/selenium/spring.properties =================================================================== --- trunk/src/test/ftest/examples/spring/src/org/jboss/seam/example/spring/test/selenium/spring.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/spring/src/org/jboss/seam/example/spring/test/selenium/spring.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,8 +19,8 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /jboss-seam-spring/home.seam -MAIN_PAGE /jboss-seam-spring/main.seam +HOME_PAGE /home.seam +MAIN_PAGE /main.seam PAGE_TITLE JBoss Suites: Seam Framework LOGIN_USERNAME_FIELD id=login:username LOGIN_PASSWORD_FIELD id=login:password Deleted: trunk/src/test/ftest/examples/spring/testng.xml =================================================================== --- trunk/src/test/ftest/examples/spring/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/spring/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,38 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Spring example" verbose="2" parallel="false"> - <test name="Spring example"> - <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/spring/test/selenium/spring.properties" /> - <classes> - <class - name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.spring.test.selenium.SpringChangePasswordTest" /> - <class name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" /> - </classes> - </test> -</suite> \ No newline at end of file Modified: trunk/src/test/ftest/examples/wicket/build.xml =================================================================== --- trunk/src/test/ftest/examples/wicket/build.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/wicket/build.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -23,9 +23,8 @@ <project name="wicket" basedir="." default="build"> <property name="example.name" value="wicket"/> <property name="jboss.deploy.target" value="deploy"/> - <property name="jboss.deploy.waittime" value="10"/> <property name="jboss.undeploy.target" value="undeploy"/> - <property name="example.ready.check.url" value="seam-wicket/home.seam"/> + <property name="jboss.example.ready.check.url" value="seam-wicket/home.seam"/> <import file="../build.xml" /> </project> Added: trunk/src/test/ftest/examples/wicket/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/wicket/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/wicket/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -0,0 +1,37 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Wicket example" verbose="2" parallel="false"> + <test name="wicket_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/wicket/test/selenium/wicket.properties" /> + <parameter name="CONTEXT_PATH" value="/seam-wicket" /> + <classes> + <class + name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> + <class + name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> + <class + name="org.jboss.seam.example.wicket.test.selenium.WicketSimpleBookingTest"> + </class> + </classes> + </test> +</suite> \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/wicket/jboss.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties =================================================================== --- trunk/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -19,8 +19,8 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -HOME_PAGE /seam-wicket -MAIN_PAGE /seam-wicket +HOME_PAGE / +MAIN_PAGE / PAGE_TITLE JBoss Suites: Seam Framework LOGIN_USERNAME_FIELD identifier=username LOGIN_PASSWORD_FIELD identifier=password Deleted: trunk/src/test/ftest/examples/wicket/testng.xml =================================================================== --- trunk/src/test/ftest/examples/wicket/testng.xml 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/examples/wicket/testng.xml 2008-11-17 09:59:46 UTC (rev 9582) @@ -1,36 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Wicket example" verbose="2" parallel="false"> - <test name="Wicket example"> - <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/wicket/test/selenium/wicket.properties" /> - <classes> - <class - name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" /> - <class - name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" /> - <class - name="org.jboss.seam.example.wicket.test.selenium.WicketSimpleBookingTest"> - </class> - </classes> - </test> -</suite> \ No newline at end of file Modified: trunk/src/test/ftest/ftest.properties =================================================================== --- trunk/src/test/ftest/ftest.properties 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/ftest.properties 2008-11-17 09:59:46 UTC (rev 9582) @@ -37,3 +37,12 @@ # enter any commands wanted for the selenium server # -log selenium.server.log will create a debug log selenium.server.cmd.args= + +# default wait times for examples to deploy +# these values can be overriden in local build.xml file for specific example +jboss.deploy.waittime=30 +tomcat6.deploy.waittime=30 +jboss-embedded.deploy.waittime=30 + + + Modified: trunk/src/test/ftest/readme.txt =================================================================== --- trunk/src/test/ftest/readme.txt 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/readme.txt 2008-11-17 09:59:46 UTC (rev 9582) @@ -28,15 +28,22 @@ ---------- * Follow specific instructions for your OS * Set jboss.home in $SEAM_HOME/build.properties +* Set tomcat.home in $SEAM_HOME/build.properties to be able to run tests on Tomcat (with JBoss Embedded) * Change to the $SEAM_HOME/src/test/ftest directory - * execute "ant testall" to run all of the functional tests - * execute "ant test -Dtest=booking" to only run the functional tests for the booking example - + To run all the functional tests run: + * "ant testall" for JBoss AS + * "ant testall.jboss-embedded" for Tomcat + JBoss Embedded + * "ant testall.tomcat6" for plain Tomcat6 + To run functional tests for single example run: + * "ant test -Dtest=example_name" for JBoss AS + * "ant test.jboss-embedded -Dtest=example_name" for Tomcat + JBoss Embedded + * "ant test.tomcat6 -Dtest=example_name" for Tomcat6 + Known Limitations: --------------------- * Only tested on Linux with Firefox * jboss.home must be set in $SEAM_HOME/build.properties -* JBoss AS must be started (preferably with nothing deployed) +* Container must be started (preferably with nothing deployed) Windows Setup -------------- Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/ConversationTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/ConversationTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/ConversationTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -45,8 +45,8 @@ @Test public void testConversations() { // Start booking in window 1 - browser.openWindow(getProperty("MAIN_PAGE"), "1"); - browser.openWindow(getProperty("MAIN_PAGE"), "2"); + browser.openWindow(CONTEXT_PATH + getProperty("MAIN_PAGE"), "1"); + browser.openWindow(CONTEXT_PATH + getProperty("MAIN_PAGE"), "2"); browser.selectWindow("1"); browser.refresh(); browser.waitForPageToLoad(TIMEOUT); Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -116,7 +116,7 @@ private void register(String username, String name, String password, String verify) { - browser.open(getProperty("HOME_PAGE")); + browser.open(CONTEXT_PATH + getProperty("HOME_PAGE")); browser.waitForPageToLoad(TIMEOUT); assertEquals("Unable to load home page.", getProperty("PAGE_TITLE"), browser .getTitle()); Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -63,7 +63,7 @@ if (isLoggedIn()) { fail("User already logged in."); } - browser.open(getProperty("HOME_PAGE")); + browser.open(CONTEXT_PATH + getProperty("HOME_PAGE")); browser.waitForPageToLoad(TIMEOUT); if (!browser.getTitle().equals(getProperty("PAGE_TITLE"))) { return false; Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SimpleBookingTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SimpleBookingTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SimpleBookingTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -135,15 +135,13 @@ if (!isLoggedIn()) fail(); if (!browser.isElementPresent(getProperty("SEARCH_SUBMIT"))) { - browser.open(getProperty("MAIN_PAGE")); + browser.open(CONTEXT_PATH + getProperty("MAIN_PAGE")); browser.waitForPageToLoad(TIMEOUT); } enterSearchQuery(hotelName); browser.click(getProperty("SEARCH_RESULT_TABLE_FIRST_ROW_LINK")); browser.waitForPageToLoad(TIMEOUT); // booking page - // assertEquals("Booking failed.", get("PAGE_TITLE"), - // browser.getTitle()); browser.click(getProperty("BOOKING_BOOK")); browser.waitForPageToLoad(TIMEOUT); // hotel page Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/seampay/selenium/PaymentTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/seampay/selenium/PaymentTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/seampay/selenium/PaymentTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -46,7 +46,7 @@ public void setUp() { super.setUp(); - browser.open(getProperty("MAIN_PAGE")); + browser.open(CONTEXT_PATH + getProperty("MAIN_PAGE")); browser.waitForPageToLoad(TIMEOUT); } Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java =================================================================== --- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2008-11-17 06:51:56 UTC (rev 9581) +++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2008-11-17 09:59:46 UTC (rev 9582) @@ -27,13 +27,13 @@ import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; -import org.testng.annotations.BeforeTest; +import org.testng.annotations.Optional; import org.testng.annotations.Parameters; import com.thoughtworks.selenium.DefaultSelenium; import com.thoughtworks.selenium.Selenium; -import com.thoughtworks.selenium.Wait; /** * Base class for all Seam based selenium tests. @@ -49,17 +49,18 @@ private static String SPEED; public static String TIMEOUT; private static String PROPERTY_FILE; + protected String CONTEXT_PATH = ""; private static Properties properties = new Properties(); private static boolean propertiesLoaded = false; protected Selenium browser; - @BeforeTest + @BeforeClass @Parameters( { "selenium.host", "selenium.server.port", "selenium.browser", "selenium.browser.url", "selenium.speed", "selenium.timeout", - "PROPERTY_FILE" }) + "PROPERTY_FILE", "CONTEXT_PATH" }) public void setParameters(String host, String port, String browser, - String browserUrl, String speed, String timeout, String propertyFile) { + String browserUrl, String speed, String timeout, String propertyFile, @Optional String contextPath) { HOST = host; PORT = Integer.parseInt(port); BROWSER = browser; @@ -67,6 +68,7 @@ SPEED = speed; TIMEOUT = timeout; PROPERTY_FILE = propertyFile; + CONTEXT_PATH = contextPath; } @BeforeMethod

16 years, 3 months

1
0
0 / 0

Seam SVN: r9581 - in trunk: examples and 3 other directories.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-11-17 01:51:56 -0500 (Mon, 17 Nov 2008) New Revision: 9581 Modified: trunk/build/gen.pom.xml trunk/examples/build.xml trunk/seam-gen/build-scripts/build-war.xml trunk/seam-gen/build-scripts/build.xml trunk/seam-gen/build.xml trunk/seam-gen/icefaces/build-scripts/build-war.xml trunk/seam-gen/icefaces/build-scripts/build.xml Log: JBSEAM-3642 Modified: trunk/build/gen.pom.xml =================================================================== --- trunk/build/gen.pom.xml 2008-11-17 06:37:27 UTC (rev 9580) +++ trunk/build/gen.pom.xml 2008-11-17 06:51:56 UTC (rev 9581) @@ -70,12 +70,6 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> Modified: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2008-11-17 06:37:27 UTC (rev 9580) +++ trunk/examples/build.xml 2008-11-17 06:51:56 UTC (rev 9581) @@ -992,6 +992,13 @@ </target> <target name="test" depends="buildtest, copyjbossembedded,getemma" description="Run the tests"> + <condition property="incompatible.jdk"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpathref="test.classpath" /> <testng outputdir="${test-report.dir}"> <jvmarg line="-Xmx800M" /> Modified: trunk/seam-gen/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/build-scripts/build-war.xml 2008-11-17 06:37:27 UTC (rev 9580) +++ trunk/seam-gen/build-scripts/build-war.xml 2008-11-17 06:51:56 UTC (rev 9581) @@ -382,6 +382,13 @@ </target> <target name="test" depends="buildtest" description="Run the tests"> + <condition property="incompatible.jdk"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpath="${testng.jar}" /> <path id="test.path"> <path path="${test.dir}" /> Modified: trunk/seam-gen/build-scripts/build.xml =================================================================== --- trunk/seam-gen/build-scripts/build.xml 2008-11-17 06:37:27 UTC (rev 9580) +++ trunk/seam-gen/build-scripts/build.xml 2008-11-17 06:51:56 UTC (rev 9581) @@ -395,6 +395,13 @@ </target> <target name="test" depends="buildtest" description="Run the tests"> + <condition property="incompatible.jdk"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpath="${testng.jar}"/> <path id="test.path"> <path path="${test.dir}"/> Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2008-11-17 06:37:27 UTC (rev 9580) +++ trunk/seam-gen/build.xml 2008-11-17 06:51:56 UTC (rev 9581) @@ -618,9 +618,6 @@ <fileset file="${driver.jar}"/> </copy> -  - <copy todir="${project.home}/lib/endorsed" file="${seam.dir}/lib/gen/jaxb-api.jar" overwrite="true"/> - <echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..."/> <copy todir="${project.home}/bootstrap" overwrite="true"> <fileset dir="${seam.dir}/bootstrap"/> Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-11-17 06:37:27 UTC (rev 9580) +++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-11-17 06:51:56 UTC (rev 9581) @@ -376,6 +376,13 @@ </target> <target name="test" depends="buildtest" description="Run the tests"> + <condition property="incompatible.jdk"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpath="${testng.jar}" /> <path id="test.path"> <path path="${test.dir}" /> Modified: trunk/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-11-17 06:37:27 UTC (rev 9580) +++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-11-17 06:51:56 UTC (rev 9581) @@ -390,6 +390,13 @@ </target> <target name="test" depends="buildtest" description="Run the tests"> + <condition property="incompatible.jdk"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpath="${testng.jar}"/> <path id="test.path"> <path path="${test.dir}"/>

16 years, 3 months

1
0
0 / 0

Seam SVN: r9580 - trunk.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-11-17 01:37:27 -0500 (Mon, 17 Nov 2008) New Revision: 9580 Modified: trunk/build.xml Log: unit tests don't need the JDK 6 classloader setting fix (in fact they shouldn't because they are unit tests) Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-11-17 06:34:00 UTC (rev 9579) +++ trunk/build.xml 2008-11-17 06:37:27 UTC (rev 9580) @@ -756,8 +756,6 @@ <testng outputdir="${test.dir}"> <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> <jvmarg line="-Djava.awt.headless=true" /> -  - <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath> <path path="${classes.test.core.dir}" /> <path path="${classes.test.dir}" />

16 years, 3 months

1
0
0 / 0

Seam SVN: r9579 - trunk/src/main/org/jboss/seam/security/openid.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-11-17 01:34:00 -0500 (Mon, 17 Nov 2008) New Revision: 9579 Modified: trunk/src/main/org/jboss/seam/security/openid/OpenId.java Log: component needs to be serializable Modified: trunk/src/main/org/jboss/seam/security/openid/OpenId.java =================================================================== --- trunk/src/main/org/jboss/seam/security/openid/OpenId.java 2008-11-17 05:15:05 UTC (rev 9578) +++ trunk/src/main/org/jboss/seam/security/openid/OpenId.java 2008-11-17 06:34:00 UTC (rev 9579) @@ -1,7 +1,7 @@ package org.jboss.seam.security.openid; +import java.io.Serializable; - import org.openid4java.*; import org.openid4java.consumer.*; import org.openid4java.discovery.*; @@ -25,7 +25,7 @@ @Name("openid") @Install(precedence=Install.BUILT_IN, classDependencies="org.openid4java.consumer.ConsumerManager") @Scope(ScopeType.SESSION) -public class OpenId +public class OpenId implements Serializable { String id; String validatedId;

16 years, 3 months

1
0
0 / 0

Seam SVN: r9578 - in trunk/src: main/org/jboss/seam/persistence and 1 other directories.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-11-17 00:15:05 -0500 (Mon, 17 Nov 2008) New Revision: 9578 Modified: trunk/src/main/org/jboss/seam/core/ConversationEntry.java trunk/src/main/org/jboss/seam/persistence/ManagedEntityInterceptor.java trunk/src/main/org/jboss/seam/persistence/ManagedEntityWrapper.java trunk/src/test/integration/src/org/jboss/seam/test/integration/EntityPassivationTest.java Log: JBSEAM-2209 note that this commit includes formatting changes (explains some of the modified lines) Modified: trunk/src/main/org/jboss/seam/core/ConversationEntry.java =================================================================== --- trunk/src/main/org/jboss/seam/core/ConversationEntry.java 2008-11-16 10:11:21 UTC (rev 9577) +++ trunk/src/main/org/jboss/seam/core/ConversationEntry.java 2008-11-17 05:15:05 UTC (rev 9578) @@ -6,6 +6,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import org.jboss.seam.Component; +import org.jboss.seam.ScopeType; +import org.jboss.seam.contexts.Context; +import org.jboss.seam.contexts.Contexts; + /** * Metadata about an active conversation. Also used * by the conversation list and breadcrumbs. @@ -245,6 +250,43 @@ { return conversationIdStack.size()>1; } + + /** + * Determines which conversation in the stack is holding the instance of this + * component. A nested conversation can see context variables in all ancestor + * conversations. In this case, we are interesting in knowing where that + * instance was found. We are assuming that if the reference is not in an + * ancestor conversation, then it must be in the current conversation. The + * goal here is not to locate the instance, but rather to determine which + * conversation is contributing the instance that we already know exists. + * + * The low-level interaction with the session context should be refactored + * out. The problem is that it is defined in private areas of + * ServerConversationContext and cannot be reused. Actually, what we really + * need is a general purpose utility for analyzing the contents of each + * conversation in the stack (at least the keys). + */ + public String findPositionInConversationStack(Component component) + { + if (component.isPerNestedConversation()) { + return id; + } + + String name = component.getName(); + Context session = Contexts.getSessionContext(); + String location = id; + for (int i = 1, len = conversationIdStack.size(); i < len; i++) { + String cid = conversationIdStack.get(i); + String key = ScopeType.CONVERSATION.getPrefix() + '#' + cid + '$' + name; + if (session.get(key) != null) { + location = cid; + break; + } + } + + return location; + } + @Override public String toString() { Modified: trunk/src/main/org/jboss/seam/persistence/ManagedEntityInterceptor.java =================================================================== --- trunk/src/main/org/jboss/seam/persistence/ManagedEntityInterceptor.java 2008-11-16 10:11:21 UTC (rev 9577) +++ trunk/src/main/org/jboss/seam/persistence/ManagedEntityInterceptor.java 2008-11-17 05:15:05 UTC (rev 9578) @@ -2,23 +2,14 @@ import static org.jboss.seam.ScopeType.CONVERSATION; -import java.io.Serializable; - -import org.jboss.seam.Component; -import org.jboss.seam.ComponentType; import org.jboss.seam.annotations.intercept.AroundInvoke; import org.jboss.seam.annotations.intercept.Interceptor; -import org.jboss.seam.annotations.intercept.PostActivate; -import org.jboss.seam.annotations.intercept.PrePassivate; -import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.BijectionInterceptor; -import org.jboss.seam.core.Conversation; import org.jboss.seam.intercept.AbstractInterceptor; import org.jboss.seam.intercept.InvocationContext; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; import org.jboss.seam.transaction.Transaction; -import org.jboss.seam.web.Session; /** * Swizzles entity references around each invocation, maintaining referential @@ -69,8 +60,6 @@ } } - - public boolean isInterceptorEnabled() { return getComponent().getScope() == CONVERSATION; Modified: trunk/src/main/org/jboss/seam/persistence/ManagedEntityWrapper.java =================================================================== --- trunk/src/main/org/jboss/seam/persistence/ManagedEntityWrapper.java 2008-11-16 10:11:21 UTC (rev 9577) +++ trunk/src/main/org/jboss/seam/persistence/ManagedEntityWrapper.java 2008-11-17 05:15:05 UTC (rev 9578) @@ -6,14 +6,16 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.List; +import java.util.Collection; +import java.util.Iterator; import java.util.Map; -import java.util.Set; +import java.util.Map.Entry; import org.jboss.seam.Component; import org.jboss.seam.Seam; import org.jboss.seam.annotations.In; import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.core.Manager; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; import org.jboss.seam.util.Reflections; @@ -22,7 +24,7 @@ * @author Gavin King * @author Pete Muir * @author Norman Richards - * + * @author Dan Allen */ public class ManagedEntityWrapper { @@ -31,98 +33,129 @@ public void wrap(Object target, Component component) throws Exception { - if ( touchedContextsExist() ) + if ( !touchedContextsExist() ) { - Class beanClass = target.getClass(); - for (; beanClass!=Object.class; beanClass=beanClass.getSuperclass()) + log.trace("No touched persistence contexts. Therefore, there are no entities in this conversation whose identities need to be preserved."); + return; + } + + String oldCid = switchToConversationContextOfComponent(component); + Class beanClass = target.getClass(); + for (; beanClass!=Object.class; beanClass=beanClass.getSuperclass()) + { + log.trace("Examining fields on " + beanClass); + for ( Field field: beanClass.getDeclaredFields() ) { - log.trace("Examining fields on " + beanClass); - for ( Field field: beanClass.getDeclaredFields() ) + if ( !ignore(field) ) { - if ( !ignore(field) ) + Object value = getFieldValue(target, field); + if (value!=null) { - Object value = getFieldValue(target, field); - if (value!=null) + Object dataModel = null; + if ( DATA_MODEL.isInstance(value) ) { - Object dataModel = null; - if ( DATA_MODEL.isInstance(value) ) - { - dataModel = value; - value = getWrappedData(dataModel); - } - if ( isRef(value) ) - { - log.trace("Attempting to save wrapper for " + field + " (" + value + ")"); - saveWrapper(target, component, field, dataModel, value); - } - else - { - log.trace("Clearing wrapper for " + field + " (" + value + ") as it isn't a entity reference"); - clearWrapper(component, field); - } + dataModel = value; + value = getWrappedData(dataModel); } + if ( containsReferenceToEntityInstance(value) ) + { + log.trace("Attempting to save wrapper for " + field + " (" + value + ")"); + saveWrapper(target, component, field, dataModel, value); + } else { - log.trace("Clearing wrapper for " + field + " as it is null"); + log.trace("Clearing wrapper for " + field + " (" + value + ") as it isn't a entity reference"); clearWrapper(component, field); } } else { - log.trace("Ignoring field " + field + " as it is static, transient or annotated with @In"); + log.trace("Clearing wrapper for " + field + " as it is null"); + clearWrapper(component, field); } } + else + { + log.trace("Ignoring field " + field + " as it is static, transient or annotated with @In"); + } } } - else - { - log.trace("No touched persistence contexts"); - } + restorePreviousConversationContextIfNecessary(oldCid); } public void deserialize(Object controllerBean, Component component) throws Exception - { - if ( touchedContextsExist() ) + { + if ( !touchedContextsExist() ) { - Class beanClass = controllerBean.getClass(); - for (; beanClass!=Object.class; beanClass=beanClass.getSuperclass()) + log.trace("No touched persistence contexts. Therefore, there are no entities in this conversation whose identities need to be restored."); + return; + } + + Class beanClass = controllerBean.getClass(); + for (; beanClass!=Object.class; beanClass=beanClass.getSuperclass()) + { + log.trace("Examining fields on " + beanClass); + for ( Field field: beanClass.getDeclaredFields() ) { - log.trace("Examining fields on " + beanClass); - for ( Field field: beanClass.getDeclaredFields() ) + if ( !ignore(field) ) { - if ( !ignore(field) ) + Object value = getFieldValue(controllerBean, field); + Object dataModel = null; + if (value!=null && DATA_MODEL.isInstance(value) ) { - Object value = getFieldValue(controllerBean, field); - Object dataModel = null; - if (value!=null && DATA_MODEL.isInstance(value) ) - { - dataModel = value; - } - log.trace("Attempting to restore wrapper for " + field + " (" + value + ")"); - //TODO: be more selective - getFromWrapper(controllerBean, component, field, dataModel); + dataModel = value; } - else - { - log.trace("Ignoring field " + field + " as it is static, transient or annotated with @In"); - } + log.trace("Attempting to restore wrapper for " + field + " (" + value + ")"); + //TODO: be more selective + getFromWrapper(controllerBean, component, field, dataModel); } + else + { + log.trace("Ignoring field " + field + " as it is static, transient or annotated with @In"); + } } } - else - { - log.trace("No touched persistence contexts"); - } } - private boolean isRef(Object value) + private boolean containsReferenceToEntityInstance(Object value) { - //TODO: could do better by checking if the - // collection really contains an entity - return value instanceof List || - value instanceof Map || - value instanceof Set || - Seam.getEntityClass(value.getClass()) != null; + if (value == null) + { + return false; + } + else if (value instanceof Collection) + { + // Do a lazy man's generic check by scanning the collection until an entity is found (nested objects not considered). + for (Iterator iter = ((Collection) value).iterator(); iter.hasNext();) + { + Object v = iter.next(); + if (v != null && Seam.getEntityClass(v.getClass()) != null) + { + return true; + } + } + return false; + } + else if (value instanceof Map) + { + // Do a lazy man's generic check by scanning the collection until an entity is found (nested objects not considered). + for (Iterator iter = ((Map) value).entrySet().iterator(); iter.hasNext();) + { + Entry e = (Entry) iter.next(); + if ((e.getKey() != null && Seam.getEntityClass(e.getKey().getClass()) != null) || + (e.getValue() != null && Seam.getEntityClass(e.getValue().getClass()) != null)) + { + return true; + } + } + return false; + } + else if (Seam.getEntityClass(value.getClass()) != null) + { + return true; + } + + return false; } private Object getFieldValue(Object bean, Field field) throws Exception @@ -183,6 +216,37 @@ } } } - + /** + * Changes the thread's current conversation context to the one that holds a reference to this + * component. This is necessary if a nested conversation is making a call to a component in + * a parent conversation. + */ + private String switchToConversationContextOfComponent(Component component) + { + Manager manager = Manager.instance(); + if (manager.isNestedConversation()) + { + String currentCid = manager.getCurrentConversationId(); + String residentCid = manager.getCurrentConversationEntry().findPositionInConversationStack(component); + if (residentCid != currentCid) + { + Contexts.getConversationContext().flush(); + Manager.instance().switchConversation(residentCid); + return currentCid; + } + } + + return null; + } + + private void restorePreviousConversationContextIfNecessary(String oldCid) + { + if (oldCid != null) + { + Contexts.getConversationContext().flush(); + Manager.instance().switchConversation(oldCid); + } + } + } Modified: trunk/src/test/integration/src/org/jboss/seam/test/integration/EntityPassivationTest.java =================================================================== --- trunk/src/test/integration/src/org/jboss/seam/test/integration/EntityPassivationTest.java 2008-11-16 10:11:21 UTC (rev 9577) +++ trunk/src/test/integration/src/org/jboss/seam/test/integration/EntityPassivationTest.java 2008-11-17 05:15:05 UTC (rev 9578) @@ -1,6 +1,7 @@ package org.jboss.seam.test.integration; import java.io.Serializable; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -9,135 +10,243 @@ import javax.persistence.EntityManager; +import org.jboss.seam.Component; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; +import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Conversation; import org.jboss.seam.mock.SeamTest; +import org.jboss.seam.persistence.ManagedEntityInterceptor; import org.testng.annotations.Test; -public class EntityPassivationTest - extends SeamTest +/** + * Verifies the work of the ManagedEntityInterceptor. Specifically that + * collections containing entity instances are properly put into the session and + * pulled back into the conversation-scoped component between requests (during a + * potential period of passivation of the SFSB). The test also verifies that + * when a component in a nested conversation calls a component in a parent + * conversation, that the passivated state is kept with the parent conversation. + * + * @author Norman Richards + * @author Dan Allen + */ +public class EntityPassivationTest extends SeamTest { + @Test + public void testEntityList() throws Exception + { + String pid = new FacesRequest("/test.xhtml") + { + @Override + protected void invokeApplication() throws Exception + { + // MEI is not installed by default, so we need to enable it + Component.forName("entitytest.someComponent").addInterceptor(new ManagedEntityInterceptor()); + Component.forName("entitytest.nestedComponent").addInterceptor(new ManagedEntityInterceptor()); + + Conversation.instance().begin(true, false); - @Test - public void testEntityList() - throws Exception - { - String id = new FacesRequest("/test.xhtml") { - @Override - protected void invokeApplication() - throws Exception - { - Conversation.instance().begin(true, false); + invokeAction("#{entitytest.someComponent.createSomeThings}"); + invokeAction("#{entitytest.someComponent.loadThings}"); + } - invokeAction("#{entitytest.someComponent.createSomeThings}"); - invokeAction("#{entitytest.someComponent.loadThings}"); + @Override + protected void renderResponse() throws Exception + { + Object thing = getValue("#{entitytest.someComponent.thing}"); + assert thing != null; - } - @Override - protected void renderResponse() - throws Exception - { - Object thing = getValue("#{entitytest.someComponent.thing}"); - assert thing!=null; - - List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); - assert thingList!=null && !thingList.isEmpty(); - assert thingList.get(0) != null; - - - Set thingSet = (Set) getValue("#{entitytest.someComponent.thingsAsSet}"); - assert thingSet!=null && thingSet.size() > 0; - assert thingSet.iterator().next() != null; - - Map thingMap = (Map) getValue("#{entitytest.someComponent.thingsAsMap}"); - assert thingMap!=null && thingMap.size() > 0; - } - }.run(); + List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); + assert thingList != null && !thingList.isEmpty(); + assert thingList.get(0) != null; - new FacesRequest("/test.xhtml", id) { - // the entities should be passivated - }.run(); + Set thingSet = (Set) getValue("#{entitytest.someComponent.thingsAsSet}"); + assert thingSet != null && thingSet.size() > 0; + assert thingSet.iterator().next() != null; - new FacesRequest("/test.xhtml", id) { - // passivated a second time - }.run(); + Map thingMap = (Map) getValue("#{entitytest.someComponent.thingsAsMap}"); + assert thingMap != null && thingMap.size() > 0; + } + }.run(); - new FacesRequest("/test.xhtml", id) { - @Override - protected void renderResponse() - throws Exception - { - Object thing = getValue("#{entitytest.someComponent.thing}"); - assert thing!=null; - - List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); - assert thingList!=null && !thingList.isEmpty(); - assert thingList.get(0) != null; - - - Set thingSet = (Set) getValue("#{entitytest.someComponent.thingsAsSet}"); - assert thingSet!=null && thingSet.size() > 0; - assert thingSet.iterator().next() != null; - - Map thingMap = (Map) getValue("#{entitytest.someComponent.thingsAsMap}"); - assert thingMap!=null && thingMap.size() > 0; - } - - - }.run(); - } - - - - @Name("entitytest.someComponent") - @Scope(ScopeType.CONVERSATION) - @AutoCreate - public static class SomeComponent implements Serializable { - @In EntityManager entityManager; - - - Set<UnversionedThing> thingSet; - List<UnversionedThing> thingList; - Map<Long,UnversionedThing> thingMap; - UnversionedThing thing; - - public void loadThings() { - thingList = entityManager.createQuery("select t from UnversionedThing t").getResultList(); - thingSet = new HashSet<UnversionedThing>(thingList); - - thingMap = new HashMap<Long,UnversionedThing>(); - for (UnversionedThing thing: thingList) { - thingMap.put(thing.getId(),thing); - } - - thing = thingList.get(0); - } - - public List<UnversionedThing> getThingsAsList() { - return thingList; - } - - public Set<UnversionedThing> getThingsAsSet() { - return thingSet; - } - - public Map<Long,UnversionedThing> getThingsAsMap() { - return thingMap; - } - - public UnversionedThing getThing() { - return thing; - } - - public void createSomeThings() { - UnversionedThing thing1 = new UnversionedThing(); - thing1.setName("thing one"); - entityManager.persist(thing1); - } - - } + new FacesRequest("/test.xhtml", pid) + { + // the entities should be passivated + }.run(); + + new FacesRequest("/test.xhtml", pid) + { + // passivated a second time + }.run(); + + new FacesRequest("/test.xhtml", pid) + { + @Override + protected void renderResponse() throws Exception + { + Object thing = getValue("#{entitytest.someComponent.thing}"); + assert thing != null; + + List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); + assert thingList != null && !thingList.isEmpty(); + assert thingList.get(0) != null; + + Set thingSet = (Set) getValue("#{entitytest.someComponent.thingsAsSet}"); + assert thingSet != null && thingSet.size() > 0; + assert thingSet.iterator().next() != null; + + Map thingMap = (Map) getValue("#{entitytest.someComponent.thingsAsMap}"); + assert thingMap != null && thingMap.size() > 0; + } + + }.run(); + + // Start a nested conversation to verify that calls to a component in a parent conversation + // will passivate that component's state in the parent conversation context and not in + // the nested conversation. Thus, when the parent conversation is restored, its state + // will be properly restored. + String nid = new FacesRequest("/test.xhtml", pid) + { + @Override + protected void invokeApplication() throws Exception + { + invokeMethod("#{entitytest.nestedComponent.nest}"); + } + + @Override + protected void renderResponse() throws Exception + { + assert Conversation.instance().isNested(); + } + + }.run(); + + new FacesRequest("/test.xhtml", nid) + { + @Override + protected void invokeApplication() throws Exception + { + // invoke component in parent conversation from nested conversation + invokeMethod("#{entitytest.someComponent.removeFirstThingFromList}"); + } + + @Override + protected void renderResponse() throws Exception + { + // the nested conversation should not hold the serialized property of the component in the parent conversation + assert !Arrays.asList(Contexts.getConversationContext().getNames()).contains("entitytest.someComponent.thingList"); + List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); + assert thingList.size() == 1; + } + }.run(); + + new FacesRequest("/test.xhtml", nid) + { + @Override + protected void invokeApplication() throws Exception + { + invokeMethod("#{entitytest.nestedComponent.end}"); + } + }.run(); + + new FacesRequest("/test.xhtml", pid) + { + @Override + protected void renderResponse() throws Exception + { + // The state of the component in the parent conversation should be preserved. + List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); + assert thingList.size() == 1; + } + }.run(); + } + + @Name("entitytest.someComponent") + @Scope(ScopeType.CONVERSATION) + @AutoCreate + public static class SomeComponent implements Serializable + { + @In + EntityManager entityManager; + + Set<UnversionedThing> thingSet; + List<UnversionedThing> thingList; + Map<Long, UnversionedThing> thingMap; + UnversionedThing thing; + + public void loadThings() + { + thingList = entityManager.createQuery("select t from UnversionedThing t").getResultList(); + thingSet = new HashSet<UnversionedThing>(thingList); + + thingMap = new HashMap<Long, UnversionedThing>(); + for (UnversionedThing thing : thingList) + { + thingMap.put(thing.getId(), thing); + } + + thing = thingList.get(0); + } + + public List<UnversionedThing> getThingsAsList() + { + return thingList; + } + + public Set<UnversionedThing> getThingsAsSet() + { + return thingSet; + } + + public Map<Long, UnversionedThing> getThingsAsMap() + { + return thingMap; + } + + public UnversionedThing getThing() + { + return thing; + } + + public void removeFirstThingFromList() + { + loadThings(); + thingList.remove(0); + } + + public void createSomeThings() + { + UnversionedThing thing1 = new UnversionedThing(); + thing1.setName("thing one"); + entityManager.persist(thing1); + + UnversionedThing thing2 = new UnversionedThing(); + thing1.setName("thing two"); + entityManager.persist(thing2); + } + + } + + @Name("entitytest.nestedComponent") + @Scope(ScopeType.CONVERSATION) + @AutoCreate + public static class NestedComponent implements Serializable + { + @In + EntityManager entityManager; + + @Begin(nested = true) + public void nest() + { + } + + public void end() + { + Conversation.instance().end(); + } + } }

16 years, 3 months

1
0
0 / 0

Seam SVN: r9577 - trunk/doc/Seam_Reference_Guide/en-US.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-11-16 05:11:21 -0500 (Sun, 16 Nov 2008) New Revision: 9577 Modified: trunk/doc/Seam_Reference_Guide/en-US/Itext.xml Log: fix invalid namespace declarations Modified: trunk/doc/Seam_Reference_Guide/en-US/Itext.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Itext.xml 2008-11-16 07:01:39 UTC (rev 9576) +++ trunk/doc/Seam_Reference_Guide/en-US/Itext.xml 2008-11-16 10:11:21 UTC (rev 9577) @@ -2506,9 +2506,13 @@ functionality by instructing the document store to generate URLs with the correct filename extension for the document type being generated. </para> - <programlisting role="XML"><![CDATA[<components xmlns="http://jboss.com/products/seam/document" - xmlns:pdf="http://jboss.com/products/seam/document"> - <document:document-store use-extensions="true" /> + <programlisting role="XML"><![CDATA[<components xmlns="http://jboss.com/products/seam/components" + xmlns:document="http://jboss.com/products/seam/document" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://jboss.com/products/seam/document http://jboss.com/products/seam/document-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> + <document:document-store use-extensions="true"/> </components>]]></programlisting> <para> The document store stores documents in conversation scope, and documents will expire when the conversation ends. At

16 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits November 2008