[seam-commits] Seam SVN: r10171 - in trunk/src/test/ftest: examples and 1 other directories.

Author: jharting Date: 2009-03-16 09:16:36 -0400 (Mon, 16 Mar 2009) New Revision: 10171 Added: trunk/src/test/ftest/lib/jboss-test-1.0.5.GA.jar Modified: trunk/src/test/ftest/build.xml trunk/src/test/ftest/examples/build.xml trunk/src/test/ftest/ftest.properties Log: JBSEAM-4017 Modified: trunk/src/test/ftest/build.xml =================================================================== --- trunk/src/test/ftest/build.xml 2009-03-16 09:40:44 UTC (rev 10170) +++ trunk/src/test/ftest/build.xml 2009-03-16 13:16:36 UTC (rev 10171) @@ -48,6 +48,7 @@ <target name="testall.jboss4"> <property name="container" value="jboss4" /> + <antcall target="start.container.before.suite" /> <antcall target="start.selenium.server" /> <!-- Execute tests for all examples jboss--> <testexample name="blog" /> @@ -84,6 +85,7 @@ <target name="testall.jboss5"> <property name="container" value="jboss5" /> + <antcall target="start.container.before.suite" /> <antcall target="start.selenium.server" /> <!-- Execute tests for all examples jboss--> <testexample name="blog" /> @@ -308,5 +310,13 @@ </ant> </sequential> </macrodef> + + <target name="start.container.before.suite" if="run.container.per.suite"> + <echo>Starting container</echo> + <ant antfile="examples/build.xml" target="start.container.jboss" inheritall="false"> + <property name="container" value="${container}" /> + </ant> + </target> + </project> Modified: trunk/src/test/ftest/examples/build.xml =================================================================== --- trunk/src/test/ftest/examples/build.xml 2009-03-16 09:40:44 UTC (rev 10170) +++ trunk/src/test/ftest/examples/build.xml 2009-03-16 13:16:36 UTC (rev 10171) @@ -20,7 +20,7 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project name="ftest.example.common.build" basedir="." default="build"> +<project name="ftest.example.common.build" basedir="." default="build" xmlns:server="http://jboss.org/ns/test/ant/server"> <!-- Location of Seam --> <dirname property="seam.dir" file="${ant.file.ftest.example.common.build}/../../../../" /> @@ -65,6 +65,10 @@ <path location="${classes.dir}" /> </path> + <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" /> + <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" /> + <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" /> + <!-- common target definitions --> <target name="clean" description="Delete all generated files"> @@ -175,7 +179,7 @@ </ant> </target> - <target name="container.properties" depends="set.deploy.properties"> + <target name="container.properties" depends="set.deploy.properties" unless="container.home"> <set.container.properties container="${container}" /> </target> @@ -184,12 +188,15 @@ <sequential> <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="container.profile" value=&quot;${(a){container}.profile}&quot; /> + <property name="container.jvm.arguments" value=&quot;${(a){container}.jvm.arguments}&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" /> + <echo>Container properties set</echo> </sequential> </macrodef> @@ -202,4 +209,14 @@ <propertyset id="jboss-embedded.deploy.properties" /> </target> + <target name="start.container.jboss" depends="container.properties"> + <server:config javaHome="${java.home}" jbossHome="${container.home}"> + <server name="${container.profile}"> + <jvmarg value="${container.jvm.arguments}" /> + <sysproperty key="java.endorsed.dirs" value="${container.home}/lib/endorsed" /> + </server> + </server:config> + <server:start name="${container.profile}" /> + </target> + </project> Modified: trunk/src/test/ftest/ftest.properties =================================================================== --- trunk/src/test/ftest/ftest.properties 2009-03-16 09:40:44 UTC (rev 10170) +++ trunk/src/test/ftest/ftest.properties 2009-03-16 13:16:36 UTC (rev 10171) @@ -54,4 +54,9 @@ #tomcat6.home= #jboss-embedded.home= +# container settings +jboss4.profile=default +jboss4.jvm.arguments=-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512 -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 +jboss5.profile=default +jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512 -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 Added: trunk/src/test/ftest/lib/jboss-test-1.0.5.GA.jar =================================================================== (Binary files differ) Property changes on: trunk/src/test/ftest/lib/jboss-test-1.0.5.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream