[jboss-cvs] JBossAS SVN: r88760 - in trunk/testsuite: imports and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2009-05-12 13:13:33 -0400 (Tue, 12 May 2009)
New Revision: 88760

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
JBAS-6905: merge rev 88759. from Branch_5_x

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-05-12 17:06:08 UTC (rev 88759)
+++ trunk/testsuite/build.xml	2009-05-12 17:13:33 UTC (rev 88760)
@@ -1665,9 +1665,19 @@
    <target name="tests-security-manager"
       description="Tests run against a jboss server with a security manager">
 
-      <echo message="Starting default with policy ${build.resources}/securitymgr/server.policy" />
+      <create-config baseconf="default" newconf="secmgr">
+        <patternset>
+           <include name="conf/**"/>
+           <include name="deployers/**"/>
+           <include name="deploy/**"/>
+           <include name="lib/**"/>
+        </patternset>
+      </create-config>
+
+
+      <echo message="Starting secmgr with policy ${build.resources}/securitymgr/server.policy" />
       <echo message="jboss.home.dir=${jboss.dist}" />
-      <echo message="jboss.server.home.dir=${jboss.dist}${/}server${/}default" />
+      <echo message="jboss.server.home.dir=${jboss.dist}${/}server${/}secmgr" />
       <echo message="java.naming.provider.url=${node0.jndi.url}" />
       <echo message="jbosstest.server.host=${node0}" />
 

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2009-05-12 17:06:08 UTC (rev 88759)
+++ trunk/testsuite/imports/server-config.xml	2009-05-12 17:13:33 UTC (rev 88760)
@@ -102,13 +102,13 @@
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
       </server>
-      <server name="securitymgr" config="default" host="${node0}">
+      <server name="securitymgr" config="secmgr" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <jvmarg value="-Djboss.home.dir=${jboss.dist}" />
-         <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}default" />
+         <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}secmgr" />
          <jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
          <jvmarg value="-Djava.security.manager"/>
          <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/>