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

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

Author: pskopek at redhat.com
Date: 2010-11-02 10:13:39 -0400 (Tue, 02 Nov 2010)
New Revision: 109068

Modified:
   branches/JBPAPP_5_1/testsuite/build.xml
   branches/JBPAPP_5_1/testsuite/imports/sections/webservice.xml
   branches/JBPAPP_5_1/testsuite/imports/server-config.xml
Log:
cc: Fixes related to Solaris runs, basically ability to split tests to localhost, node0 and node1

Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml	2010-11-02 13:10:29 UTC (rev 109067)
+++ branches/JBPAPP_5_1/testsuite/build.xml	2010-11-02 14:13:39 UTC (rev 109068)
@@ -79,6 +79,10 @@
    <property name="node1.hajndi.url" value="jnp://${node1}:1100" />
    <property name="node1.jndi.http.url" value="http://${node1}:8080/invoker/JNDIFactory" />
 
+   <!-- Client artefacts default -->
+   <property name="target.node" value="${node0}" />
+   
+   
    <!-- UDP Group -->
    <!-- The value of the -u option passed to jboss -->
    <!-- A blank value will prevent the -u option from being passed -->
@@ -1885,7 +1889,7 @@
       
       <!-- prepare run.conf for audit testing -->
       <echo file="${jboss.dist}/server/cc-audit/run.conf">
-      JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.home.dir=${jboss.dist} -Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-audit -Djava.security.manager -Djava.security.policy==${jboss.dist}${/}server${/}cc-audit/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"/></echo>
+      JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.home.dir=${jboss.dist} -Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-audit -Djava.security.manager -Djava.security.policy==${jboss.dist}${/}server${/}cc-audit/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
 
       <!-- prepare run.conf for later CXF testing -->
       <echo file="${jboss.dist}/server/cc-cxf/run.conf">
@@ -1916,8 +1920,8 @@
       <echo message="Starting CC with policy ${build.resources}/test-configs/cc/cc.policy" />
       <echo message="jboss.home.dir=${jboss.dist}" />
       <echo message="jboss.server.home.dir=${jboss.dist}${/}server${/}cc" />
-      <echo message="java.naming.provider.url=${node0.jndi.url}" />
-      <echo message="jbosstest.server.host=${node0}" />
+      <echo message="java.naming.provider.url=jnp://localhost:1099" />
+      <echo message="jbosstest.server.host=localhost" />
       <echo message="cc.java.security.debug=${cc.java.security.debug}" />
 
       <server:start name="cc" />
@@ -1927,8 +1931,10 @@
 
          <jvmarg line="${junit.jvm.options}" />
 
-         <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}" />
-         <sysproperty key="jbosstest.server.host" value="${node0}" />
+         <!-- sysproperty key="java.naming.provider.url" value="${node0.jndi.url}" />
+         <sysproperty key="jbosstest.server.host" value="${node0}" / -->
+         <sysproperty key="java.naming.provider.url" value="jnp://localhost:1099" />
+         <sysproperty key="jbosstest.server.host" value="localhost" />
          <sysproperty key="jboss.home" file="${project.root}" />
          <sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty" />
          <sysproperty key="jboss.tools.dir" file="${project.root}/tools" />
@@ -2167,10 +2173,13 @@
          <jvmarg value="-Djava.security.manager"/>
          <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/>
          <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
-         <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+         <!-- sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+         <sysproperty key="jbosstest.server.host" value="${node0}"/ -->
+         <sysproperty key="java.naming.provider.url" value="jnp://localhost:1099" />
+         <sysproperty key="jbosstest.server.host" value="localhost" />
+         
          <!-- [JBAS-3969] IOException: unknown protocol: vfsfile -->
          <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
-         <sysproperty key="jbosstest.server.host" value="${node0}"/>
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
          <!-- Pass along any jbosstest.* system properties -->

Modified: branches/JBPAPP_5_1/testsuite/imports/sections/webservice.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/sections/webservice.xml	2010-11-02 13:10:29 UTC (rev 109067)
+++ branches/JBPAPP_5_1/testsuite/imports/sections/webservice.xml	2010-11-02 14:13:39 UTC (rev 109068)
@@ -3,7 +3,7 @@
   <target name="_jars-webservice">
     <mkdir dir="${build.lib}"/>
     
-    <echo message="Using target node: ${node0}"/>
+    <echo message="Using target node: ${target.node}"/>
     
     <copy todir="${build.resources}/webservice" filtering="yes">
       <fileset dir="${source.resources}/webservice">
@@ -11,7 +11,7 @@
         <include name="**/*.xml"/>
       </fileset>
       <filterset>
-        <filter token="jbosstest.host.name" value="${node0}"/>
+        <filter token="jbosstest.host.name" value="${target.node}"/>
       </filterset>
     </copy>
     <!-- Copy binary files -->

Modified: branches/JBPAPP_5_1/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/server-config.xml	2010-11-02 13:10:29 UTC (rev 109067)
+++ branches/JBPAPP_5_1/testsuite/imports/server-config.xml	2010-11-02 14:13:39 UTC (rev 109068)
@@ -233,7 +233,7 @@
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
          <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
       </server>
-      <server name="cc" config="cc" host="${node0}">
+      <server name="cc" config="cc" host="localhost">
          <jvmarg value="${jpda.cmdline}" />
          <jvmarg value="-Xms1024m" />
          <jvmarg value="-Xmx1024m" />