[jboss-remoting-commits] JBoss Remoting SVN: r4183 - remoting2/branches/2.x.

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

Author: ron.sigal at jboss.com
Date: 2008-05-13 01:29:41 -0400 (Tue, 13 May 2008)
New Revision: 4183

Modified:
   remoting2/branches/2.x/build.xml
Log:
JBREM-920: Unit test suite defaults to running with security manager; JBREM-978: changed HTTP test for security test suite.

Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml	2008-05-13 05:12:06 UTC (rev 4182)
+++ remoting2/branches/2.x/build.xml	2008-05-13 05:29:41 UTC (rev 4183)
@@ -350,22 +350,17 @@
       <property name="perf.seq.dojava" value="yes"/>
       <property name="perf.seq.dojboss" value="yes"/>
       
-      <!-- set the security manager information for unit tests -->
+      <property name="enable.security.manager" value="yes"/>
       <condition property="java.security.manager.key" value="java.security.manager">
-         <isset property="isJDK6"/>
+         <equals arg1="yes" arg2="${enable.security.manager}"/>
       </condition>
-      
-      <condition property="java.security.manager.key" value="no.java.security.manager">
-         <or>
-            <isset property="isJDK4"/>
-            <isset property="isJDK5"/>
-         </or>
+      <condition property="java.security.manager.key" value="dummy">
+         <not><equals arg1="yes" arg2="${enable.security.manager}"/></not>
       </condition>
-               
+      <property name="java.security.manager" value=""/>
       <property name="java.security.policy" value="${etc.dir}/remoting.security.policy"/>
       <property name="java.security.policy.marshal" value="${etc.dir}/remoting.security.policy.marshal"/>
       <property name="java.security.policy.strict" value="${etc.dir}/remoting.security.policy.strict"/>
-      <property name="${java.security.manager.key}" value=""/>
       <!--<property name="java.security.manager" value="org.jboss.test.security.LoggingSecurityManager"/>-->
       <!--<property name="java.security.debug" value="access,failure"/>-->
       <property name="java.security.debug" value=""/>
@@ -1336,7 +1331,7 @@
          <batchtest fork="yes" todir="${output.tests.results}"
                     haltonfailure="no">
             <fileset dir="${tests.compile.dir}">
-               <include name="**/remoting/transport/http/HTTPInvokerTestCase.class"/>
+               <include name="**/remoting/transport/http/HTTPInvokerSecurityTestCase.class"/>
                <include name="**/remoting/transport/http/ssl/custom/HTTPSInvokerTestCase.class"/>
             </fileset>
          </batchtest>