[jboss-cvs] JBossAS SVN: r63658 - trunk/testsuite/imports.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-06-27 00:02:07 -0400 (Wed, 27 Jun 2007)
New Revision: 63658

Modified:
   trunk/testsuite/imports/server-config.xml
Log:
Add a jboss.dist attribute to start/stop-jboss and create-config

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2007-06-27 02:16:43 UTC (rev 63657)
+++ trunk/testsuite/imports/server-config.xml	2007-06-27 04:02:07 UTC (rev 63658)
@@ -610,10 +610,15 @@
          description="The hostname/address passed in as the -b option to jboss" />
       <attribute name="jvmargs" default="-Xmx64m"
          description="An additional jvmarg line set after any ${jpda.cmdline}"/>
+      <attribute name="jboss.dist" default="${jboss.dist}"
+         description="The jboss dist root directory" />
       <sequential>
-         <echo message="Will start the jboss instance @{host} with @{conf}"/>
-          <java classname="org.jboss.Main" fork="true" spawn="true" dir="${jboss.dist}/bin">
-            <classpath refid="jboss.boot.classpath"/>
+         <echo message="Will start the jboss instance @{host} with @{conf}, dist=@{jboss.dist}"/>
+          <java classname="org.jboss.Main" fork="true" spawn="true" dir="@{jboss.dist}/bin">
+            <classpath>
+               <pathelement location="@{jboss.dist}/bin/run.jar"/>
+               <pathelement location="${javac.jar}"/>
+            </classpath>
             <jvmarg line="${jpda.cmdline}" />
             <jvmarg line="@{jvmargs}" />
             <arg value="-c"/>
@@ -628,12 +633,17 @@
    <macrodef name="stop-jboss">
       <attribute name="url" default="jnp://${node0}:1099"
          description="The jndi provider url used to lookup the RMIAdaptor"/>
+      <attribute name="jvmargs" default=""
+         description="Addtional jvm args"/>
+      <attribute name="jboss.dist" default="${jboss.dist}"
+         description="The jboss dist root directory" />
       <sequential>
          <echo message="Will stop the jboss instance at url @{url}"/>
-         <java classname="org.jboss.Shutdown" fork="true" dir="${jboss.dist}/bin">
+         <java classname="org.jboss.Shutdown" fork="true" dir="@{jboss.dist}/bin"
+	       jvmargs="@{jvmargs}">
             <classpath>
-               <pathelement location="${jboss.dist}/bin/shutdown.jar"/>
-               <pathelement location="${jboss.dist}/client/jbossall-client.jar"/>
+               <pathelement location="@{jboss.dist}/bin/shutdown.jar"/>
+               <pathelement location="@{jboss.dist}/client/jbossall-client.jar"/>
             </classpath>
             <arg value="--server"/>
             <arg value="@{url}"/>
@@ -870,12 +880,14 @@
       description="Create new config based on an existing config">
       <attribute name="baseconf" description="The base config to start with" default="default"/>
       <attribute name="newconf" description="The name of the new config"/>
-      <attribute name="newconf-src" description="The name of the tests-config to copy over the baseconf" default="@{newconf}"/>
+      <attribute name="newconf-src" description="The name of the tests-config to copy or the baseconf" default="@{newconf}"/>
+      <attribute name="jboss.dist" default="${jboss.dist}"
+         description="The jboss dist root directory" />
       <element name="patternset" />
       <sequential>
          <echo message="creating @{newconf} config"/>
-         <copy todir="${jboss.dist}/server/@{newconf}" filtering="false">
-            <fileset dir="${jboss.dist}/server/@{baseconf}">
+         <copy todir="@{jboss.dist}/server/@{newconf}" filtering="false">
+            <fileset dir="@{jboss.dist}/server/@{baseconf}">
                <patternset />
             </fileset>
          </copy>
@@ -883,7 +895,7 @@
          resources/test-configs/@{newconf}
          -->
          <echo message="Overwriting config descriptors" />
-         <copy todir="${jboss.dist}/server/@{newconf}" overwrite="true" failonerror="false" includeEmptyDirs="false">
+         <copy todir="@{jboss.dist}/server/@{newconf}" overwrite="true" failonerror="false">
             <fileset dir="${build.resources}/test-configs/@{newconf-src}" />
          </copy>
       </sequential>