[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 04/11/10 19:01:21

  Modified:    .        Tag: Branch_3_2 build.xml
  Log:
  Merge the iiop changes from 4.0 to address some java5 runtime problems
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.165.2.171 +7 -5      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.165.2.170
  retrieving revision 1.165.2.171
  diff -u -r1.165.2.170 -r1.165.2.171
  --- build.xml	5 Nov 2004 18:17:54 -0000	1.165.2.170
  +++ build.xml	11 Nov 2004 03:01:17 -0000	1.165.2.171
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.165.2.170 2004/11/05 18:17:54 tdiesler Exp $ -->
  +<!-- $Id: build.xml,v 1.165.2.171 2004/11/11 03:01:17 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -1385,7 +1385,6 @@
            timeout="${junit.timeout}"
            jvm="${junit.jvm}">
   
  -         <jvmarg value="${junit.jvm.options}"/>
            <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/>
            <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/>
            <jvmarg value="-Djacorb.orb.print_version=off"/>
  @@ -1394,15 +1393,18 @@
            <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
            <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
            <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
  +         <jvmarg value="-DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/>
  +         <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
            <jvmarg value="-Djava.security.manager"/>
            <sysproperty key="java.security.policy"
               value="${build.resources}/security/tst.policy"/>
            <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"/>
  -         <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
  -         <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
  -         <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
  +         <!-- Pass along any jbosstest.* system properties -->
  +         <syspropertyset>
  +            <propertyref prefix="jbosstest."/>
  +         </syspropertyset>
   
            <classpath>
               <pathelement location="${build.classes}"/>