[jboss-cvs] jbosstest build.xml

[Scott M S. <st...@us...>]

  User: starksm 
  Date: 05/02/14 21:09:57

  Modified:    .        Tag: Branch_4_0_1_SP1 build.xml
  Log:
  Move the environment variable import to ../tools/etc/buildmagic/build-common.xml and run the JACC tests with a security manager
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.406.2.32.2.1 +11 -9     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.406.2.32
  retrieving revision 1.406.2.32.2.1
  diff -u -r1.406.2.32 -r1.406.2.32.2.1
  --- build.xml	23 Dec 2004 04:58:13 -0000	1.406.2.32
  +++ build.xml	15 Feb 2005 05:09:56 -0000	1.406.2.32.2.1
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.406.2.32 2004/12/23 04:58:13 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.406.2.32.2.1 2005/02/15 05:09:56 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -23,7 +23,6 @@
   
      <property name="results_web" value="http://jboss.sourceforge.net/junit-results/32"/>
      <property name="buildlog.level" value="info"/>
  -   <property environment="env"/>
   
      <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
      otherwise and initialize the node0/node1 cluster hostnames to localhost
  @@ -40,6 +39,12 @@
            <os family="windows"/>
         </not>
      </condition>
  +
  +   <!--We will use local.properties file to provide some configuration
  +       to the testsuite mainly for the Clustering framework. Please 
  +       do not checkin your local.properties file into CVS-->
  +   <property file="local.properties"/>
  +
      <!-- Cluster node0 defaults -->
      <property name="node0" value="localhost"/>
      <property name="node0.http.url" value="http://${node0}:8080"/>
  @@ -49,11 +54,6 @@
      <property name="node1.http.url" value="http://${node1}:8080"/>
      <property name="node1.jndi.url" value="jnp://${node1}:1099"/>
   
  -   <!--We will use local.properties file to provide some configuration to the testsuite
  -       mainly for the Clustering framework. Please do not checkin your local.properties file
  -       into CVS-->
  -   <property file="local.properties"/>
  -
      <!-- =================== -->
      <!-- Basic Configuration -->
      <!-- =================== -->
  @@ -978,6 +978,8 @@
            jvm="${junit.jvm}">
   
            <jvmarg value="${junit.jvm.options}"/>
  +         <!-- Used for JGroups -->
  +         <jvmarg value="-Dbind.address=${node0}"/>
            <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
            <sysproperty key="build.testlog" value="${build.testlog}"/>
            <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  @@ -1343,7 +1345,7 @@
               <include name="lib/**"/>
            </patternset>
         </create-config>
  -      <start-jboss conf="jacc"/>
  +      <start-securitymgr conf="jacc"/>
   
         <mkdir dir="${build.reports}"/>
         <mkdir dir="${build.testlog}"/>
  @@ -1402,7 +1404,7 @@
            </batchtest>
         </junit>
   
  -      <stop-jboss/>
  +      <!--stop-jboss/-->
      </target>
   
      <target name="tests-standalone-aop-unit" depends="maybejars">