Author: jharting Date: 2009-03-09 04:14:21 -0400 (Mon, 09 Mar 2009) New Revision: 10130 Added: trunk/src/test/ftest/examples/wicket-runtime/ trunk/src/test/ftest/examples/wicket-runtime/build.xml trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml Removed: trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml Modified: trunk/src/test/ftest/build.xml trunk/src/test/ftest/examples/build.xml trunk/src/test/ftest/examples/groovybooking/build.xml trunk/src/test/ftest/examples/wicket/build.xml Log: JBSEAM-4000 Modified: trunk/src/test/ftest/build.xml =================================================================== --- trunk/src/test/ftest/build.xml 2009-03-07 07:13:25 UTC (rev 10129) +++ trunk/src/test/ftest/build.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -78,6 +78,7 @@ <testexample name="todo" /> <testexample name="ui" /> <testexample name="wicket" /> + <testexample name="wicket-runtime" /> <antcall target="stop.selenium.server" /> </target> @@ -113,6 +114,7 @@ <testexample name="todo" /> <testexample name="ui" /> <testexample name="wicket" /> + <testexample name="wicket-runtime" /> <antcall target="stop.selenium.server" /> </target> @@ -208,6 +210,7 @@ <cleanexample name="todo" /> <cleanexample name="ui" /> <cleanexample name="wicket" /> + <cleanexample name="wicket-runtime" /> </target> <target name="undeployall"> Modified: trunk/src/test/ftest/examples/build.xml =================================================================== --- trunk/src/test/ftest/examples/build.xml 2009-03-07 07:13:25 UTC (rev 10129) +++ trunk/src/test/ftest/examples/build.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -53,6 +53,7 @@ <property name="jboss-embedded.context.path" value="/jboss-seam-${example.name}" /> <property name="tomcat6.context.path" value="${jboss-embedded.context.path}" /> + <!-- common path setup --> <path id="classpath.build"> @@ -76,7 +77,7 @@ <target name="build" depends="build.common" description="Compiles the Test"> <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" /> <copy todir="${classes.dir}"> - <fileset dir="src"> + <fileset dir="${src.dir}"> <exclude name="**/*.java" /> </fileset> </copy> @@ -89,7 +90,7 @@ <mkdir dir="${classes.dir}" /> <javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" /> <copy todir="${classes.dir}"> - <fileset dir="src"> + <fileset dir="${src.dir}"> <exclude name="**/*.java" /> </fileset> </copy> @@ -153,6 +154,7 @@ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}"> <property name="jboss.home" value="${container.home}" /> <property name="tomcat.home" value="${container.home}" /> + <propertyset refid="deploy.properties" /> </ant> <!-- wait for the application to be active --> <!-- TODO is there a better way? --> @@ -173,21 +175,31 @@ </ant> </target> - <target name="container.properties"> + <target name="container.properties" depends="set.deploy.properties"> <set.container.properties container="${container}" /> </target> <macrodef name="set.container.properties"> <attribute name="container" /> <sequential> - <fail unless=&quot;(a){container}.home&quot; message=&quot;(a){container}.home property has to be set"/> + <fail unless=&quot;(a){container}.home&quot; message=&quot;(a){container}.home property has to be set" /> <property name="container.home" value=&quot;${(a){container}.home}&quot; /> <property name="deploy.target" value=&quot;${(a){container}.deploy.target}&quot; /> <property name="undeploy.target" value=&quot;${(a){container}.undeploy.target}&quot; /> <property name="context.path" value=&quot;${(a){container}.context.path}&quot; /> <property name="wait.url" value="${context.path}" /> <property name="wait.time" value=&quot;${(a){container}.deploy.waittime}&quot; /> + <propertyset id="deploy.properties" refid="${container}.deploy.properties" /> </sequential> </macrodef> + <!-- this target sets empty deploy property sets by default --> + <!-- override this target in example specific build.xml to specify property sets --> + <target name="set.deploy.properties"> + <propertyset id="jboss4.deploy.properties" /> + <propertyset id="jboss5.deploy.properties" /> + <propertyset id="tomcat6.deploy.properties" /> + <propertyset id="jboss-embedded.deploy.properties" /> + </target> + </project> Modified: trunk/src/test/ftest/examples/groovybooking/build.xml =================================================================== --- trunk/src/test/ftest/examples/groovybooking/build.xml 2009-03-07 07:13:25 UTC (rev 10129) +++ trunk/src/test/ftest/examples/groovybooking/build.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -25,7 +25,16 @@ <property name="jboss4.deploy.target" value="jbosswar.explode" /> <property name="jboss4.undeploy.target" value="jbosswar.unexplode" /> <property name="jboss4.context.path" value="/jboss-seam-groovybooking" /> - + + <property name="loadPersistenceUnits" value="false" /> + + <target name="set.deploy.properties"> + <propertyset id="jboss4.deploy.properties" /> + <propertyset id="jboss5.deploy.properties"> + <propertyref name="loadPersistenceUnits" id="loadPersistenceUnits" /> + </propertyset> + </target> + <import file="../build.xml" /> </project> Modified: trunk/src/test/ftest/examples/wicket/build.xml =================================================================== --- trunk/src/test/ftest/examples/wicket/build.xml 2009-03-07 07:13:25 UTC (rev 10129) +++ trunk/src/test/ftest/examples/wicket/build.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -22,74 +22,7 @@ --> <project name="wicket" basedir="." default="build"> <property name="example.name" value="wicket" /> - <property name="jboss.example.ready.check.url" value="seam-wicket/home.seam" /> <import file="../build.xml" /> - - <target name="test" depends="build, container.properties" description="Run Tests"> - <!-- TODO all of these jboss commands must be optional with checks --> - <!-- TODO go get JBoss and extract --> - - <!-- TODO start JBoss --> - <!-- clean example --> - <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> - - <!-- deploy the example--> - <antcall target="deploy.example" /> - - <!-- execute testng tests --> - <antcall target="selenium.test" /> - - <!-- undeploy the example --> - <antcall target="undeploy.example" /> - - <!-- clean example --> - <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" /> - - <!-- deploy the example with runtime instrumentation --> - <antcall target="deploy.example.runtime.instrumentation" /> - - <!-- execute testng tests --> - <antcall target="selenium.test.runtime.instrumentation" /> - - <!-- undeploy the example --> - <antcall target="undeploy.example" /> - </target> - - <target name="deploy.example.runtime.instrumentation" depends="container.properties"> - <property name="absolute.wait.url" value="${selenium.browser.url}${wait.url}" /> - <echo>Deploying ${example.name} example to ${container} using ${deploy.target} target</echo> - <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}"> - <property name="jboss.home" value="${container.home}" /> - <property name="tomcat.home" value="${container.home}" /> - <property name="instrumentAtRunTime" value="true" /> - </ant> - <!-- wait for the application to be active --> - <!-- TODO is there a better way? --> - <echo>Waiting ${wait.time} seconds for ${absolute.wait.url}</echo> - <waitfor maxwait="${wait.time}" maxwaitunit="second"> - <and> - <!-- wait for the application to not throw 404 --> - <http url="${absolute.wait.url}" errorsBeginAt="404" /> - </and> - </waitfor> - </target> - <target name="selenium.test.runtime.instrumentation" depends="build, container.properties" description="Run Tests"> - <taskdef resource="testngtasks" classpathref="classpath.test" /> - <mkdir dir="${test.output.dir}" /> - - <!-- execute testng tests --> - <testng haltonfailure="false" outputdir="${test.output.dir}" classpathref="classpath.test"> - <xmlfileset file="${container}-runtime.xml" /> - <sysproperty key="selenium.server.port" value="${selenium.server.port}" /> - <sysproperty key="selenium.host" value="${selenium.host}" /> - <sysproperty key="selenium.browser" value="${selenium.browser}" /> - <sysproperty key="selenium.browser.url" value="${selenium.browser.url}" /> - <sysproperty key="selenium.speed" value="${selenium.speed}" /> - <sysproperty key="selenium.timeout" value="${selenium.timeout}" /> - <sysproperty key="example.context.path" value="${context.path}" /> - </testng> - </target> - </project> Deleted: trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml =================================================================== --- trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml 2009-03-07 07:13:25 UTC (rev 10129) +++ trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -1,34 +0,0 @@ - - <!-- - JBoss, Home of Professional Open Source Copyright 2008, Red Hat - Middleware LLC, and individual contributors by the @authors tag. See - the copyright.txt in the distribution for a full listing of individual - contributors. This is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. This software is - distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. You should have received a copy of the GNU - Lesser General Public License along with this software; if not, write - to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Wicket example with runtime instrumentation" verbose="2" - parallel="false"> - <test name="wicket_jboss4-runtime instrumentation"> - <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 Deleted: trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml =================================================================== --- trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml 2009-03-07 07:13:25 UTC (rev 10129) +++ trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -1,34 +0,0 @@ - - <!-- - JBoss, Home of Professional Open Source Copyright 2008, Red Hat - Middleware LLC, and individual contributors by the @authors tag. See - the copyright.txt in the distribution for a full listing of individual - contributors. This is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. This software is - distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. You should have received a copy of the GNU - Lesser General Public License along with this software; if not, write - to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Wicket example with runtime instrumentation" verbose="2" - parallel="false"> - <test name="wicket_jboss5-runtime instrumentation"> - <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 Added: trunk/src/test/ftest/examples/wicket-runtime/build.xml =================================================================== --- trunk/src/test/ftest/examples/wicket-runtime/build.xml (rev 0) +++ trunk/src/test/ftest/examples/wicket-runtime/build.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- +JBoss, Home of Professional Open Source +Copyright 2008, Red Hat Middleware LLC, and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. +--> +<project name="wicket" basedir="." default="build"> + <property name="example.name" value="wicket" /> + <property name="src.dir" value="../wicket/src" /> + + <property name="instrumentAtRunTime" value="true" /> + + <target name="set.deploy.properties"> + <propertyset id="jboss4.deploy.properties"> + <propertyref name="instrumentAtRunTime" id="instrumentAtRunTime" /> + </propertyset> + <propertyset id="jboss5.deploy.properties" refid="jboss4.deploy.properties" /> + </target> + + <import file="../build.xml" /> + +</project> Property changes on: trunk/src/test/ftest/examples/wicket-runtime/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml (from rev 10126, trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml) =================================================================== --- trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml (rev 0) +++ trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -0,0 +1,34 @@ + + <!-- + JBoss, Home of Professional Open Source Copyright 2008, Red Hat + Middleware LLC, and individual contributors by the @authors tag. See + the copyright.txt in the distribution for a full listing of individual + contributors. This is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. This software is + distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, write + to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Wicket example with runtime instrumentation" verbose="2" + parallel="false"> + <test name="wicket_jboss4-runtime instrumentation"> + <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 Property changes on: trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Copied: trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml (from rev 10126, trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml) =================================================================== --- trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml (rev 0) +++ trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml 2009-03-09 08:14:21 UTC (rev 10130) @@ -0,0 +1,34 @@ + + <!-- + JBoss, Home of Professional Open Source Copyright 2008, Red Hat + Middleware LLC, and individual contributors by the @authors tag. See + the copyright.txt in the distribution for a full listing of individual + contributors. This is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. This software is + distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, write + to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Wicket example with runtime instrumentation" verbose="2" + parallel="false"> + <test name="wicket_jboss5-runtime instrumentation"> + <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 Property changes on: trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain