[jboss-cvs] JBossAS SVN: r108872 - in branches/JBPAPP_5_1/testsuite: imports and 1 other directory.

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

Author: pskopek at redhat.com
Date: 2010-10-25 08:30:48 -0400 (Mon, 25 Oct 2010)
New Revision: 108872

Modified:
   branches/JBPAPP_5_1/testsuite/build.xml
   branches/JBPAPP_5_1/testsuite/imports/server-config.xml
Log:
cc: fixing cluster server config and db config override

Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml	2010-10-25 10:16:43 UTC (rev 108871)
+++ branches/JBPAPP_5_1/testsuite/build.xml	2010-10-25 12:30:48 UTC (rev 108872)
@@ -1822,7 +1822,7 @@
 
       <!-- copy alternate part of configuration with regards to DB -->
       <copy todir="${jboss.dist}/server/cc/deploy" overwrite="true">
-        <fileset dir="${build.resources}/cc/${cc.db.config}">
+        <fileset dir="${cc.db.config.home}/${cc.db.config}">
           <include name="*"/>
         </fileset>
       </copy>

Modified: branches/JBPAPP_5_1/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/server-config.xml	2010-10-25 10:16:43 UTC (rev 108871)
+++ branches/JBPAPP_5_1/testsuite/imports/server-config.xml	2010-10-25 12:30:48 UTC (rev 108872)
@@ -289,7 +289,7 @@
          <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-cluster-0" />
          <jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
          <jvmarg value="-Djava.security.manager"/>
-         <jvmarg value="-Djava.security.policy==${jboss.test.resources.dir}/cc-cluster-0/cc.policy"/>
+         <jvmarg value="-Djava.security.policy==${jboss.dist}${/}server${/}cc-cluster-0/cc.policy"/>
          <jvmarg value="-D${cc.java.security.debug}=access,failure"/> 
          <jvmarg value="-D${cc.prop.java.library.path}=${cc.java.library.path}"/> 
          <jvmarg value="-Dcc.jdbc.driver=${cc.jdbc.driver}"/> 
@@ -318,7 +318,7 @@
          <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-cluster-1" />
          <jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
          <jvmarg value="-Djava.security.manager"/>
-         <jvmarg value="-Djava.security.policy==${jboss.test.resources.dir}/cc-cluster-1/cc.policy"/>
+         <jvmarg value="-Djava.security.policy==${jboss.dist}${/}server${/}cc-cluster-1/cc.policy"/>
          <jvmarg value="-D${cc.java.security.debug}=access,failure"/> 
          <jvmarg value="-D${cc.prop.java.library.path}=${cc.java.library.path}"/> 
          <jvmarg value="-Dcc.jdbc.driver=${cc.jdbc.driver}"/>