Author: jharting Date: 2009-10-05 05:36:31 -0400 (Mon, 05 Oct 2009) New Revision: 11539 Modified: branches/community/Seam_2_2/src/test/ftest/build.xml branches/community/Seam_2_2/src/test/ftest/examples/build.xml branches/community/Seam_2_2/src/test/ftest/ftest.properties Log: JBSEAM-4430 removed jboss-test dependency Modified: branches/community/Seam_2_2/src/test/ftest/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:23:24 UTC (rev 11538) +++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:36:31 UTC (rev 11539) @@ -283,7 +283,6 @@ <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2"> <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/> </dependency> - <dependency groupId="org.jboss.test" artifactId="jboss-test" version="1.1.0.GA"/> <dependency groupId="org.testng" artifactId="testng" version="5.9"/> </copyInlineDependencies> </target> Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:23:24 UTC (rev 11538) +++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:36:31 UTC (rev 11539) @@ -69,10 +69,6 @@ <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"> @@ -221,13 +217,17 @@ </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}" /> + <echo message="Starting JBoss server" /> + <java classname="org.jboss.Main" fork="true" spawn="true" dir="${container.home}/bin"> + <classpath> + <pathelement location="${container.home}/bin/run.jar" /> + </classpath> + <jvmarg line="${container.jvm.arguments}" /> + <arg line="-c ${jboss.domain} -b ${jboss.host}" /> + </java> + <waitfor maxwait="2" maxwaitunit="minute"> + <socket server="localhost" port="8080" /> + </waitfor> </target> <target name="stop.container.jboss" depends="container.properties" > Modified: branches/community/Seam_2_2/src/test/ftest/ftest.properties =================================================================== --- branches/community/Seam_2_2/src/test/ftest/ftest.properties 2009-10-05 09:23:24 UTC (rev 11538) +++ branches/community/Seam_2_2/src/test/ftest/ftest.properties 2009-10-05 09:36:31 UTC (rev 11539) @@ -67,6 +67,8 @@ run.container.per.suite=false jboss.deployments.restart=10 +jboss.domain=default +jboss.host=localhost # These credentials are needed for JBoss restart. See ${JBOSS_HOME}/server/${jboss.profile}/conf/props/jmx-console-users.properties jboss.jmx.username=admin @@ -98,4 +100,3 @@ test.package=com.example.test richfaces.skin=classic icefaces.home= -jboss.domain=default