[jboss-cvs] JBossAS SVN: r75676 - in branches/Branch_4_2/testsuite/imports: config and 1 other directory.

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

Author: dimitris at jboss.org
Date: 2008-07-11 06:16:13 -0400 (Fri, 11 Jul 2008)
New Revision: 75676

Modified:
   branches/Branch_4_2/testsuite/imports/config/tests-jacc.xml
   branches/Branch_4_2/testsuite/imports/server-config.xml
Log:
JBAS-5754, configure the jacc and jacc-securitymgr configs to use lib/endorsed

Modified: branches/Branch_4_2/testsuite/imports/config/tests-jacc.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/config/tests-jacc.xml	2008-07-11 09:30:53 UTC (rev 75675)
+++ branches/Branch_4_2/testsuite/imports/config/tests-jacc.xml	2008-07-11 10:16:13 UTC (rev 75676)
@@ -36,7 +36,8 @@
   </patternset>
 
 <!-- Tests of the JACC security implementation -->
-  <target name="tests-jacc-security" description="Tests run against a jboss server with JACC configured">
+  <target name="tests-jacc-security"
+    description="Tests run against a jboss server with JACC configured">
     <!-- Create the ssl enabled tomcat config -->
     <create-config baseconf="default" newconf="jacc">
       <patternset>
@@ -69,6 +70,7 @@
     <property name="jbosstest.secure" value="true"/>
     <property name="jboss.security.jacc" value="true"/>
     <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
+
     <propertyset id="jacc-tests-props">
       <propertyref prefix="java.security.auth"/>
       <propertyref prefix="jboss.security"/>
@@ -78,7 +80,8 @@
     <server:stop name="jacc"/>
   </target>
 
-  <target name="tests-jacc-securitymgr" description="Tests run against a jboss server with JACC configured + security manager">
+  <target name="tests-jacc-securitymgr"
+    description="Tests run against a jboss server with JACC configured + security manager">
     <!-- Create the security manager enabled jacc -->
     <create-config baseconf="default" newconf="jacc-securitymgr" newconf-src="jacc">
       <patternset>
@@ -120,12 +123,9 @@
     <property name="jbosstest.secure" value="true"/>
     <property name="jboss.security.jacc" value="true"/>
     <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
+    
     <propertyset id="jacc-tests-props">
       <propertyref prefix="java.security.auth"/>
-    </propertyset>
-
-    <propertyset id="jacc-tests-props">
-      <propertyref prefix="java.security.auth"/>
       <propertyref prefix="jboss.security"/>
     </propertyset>
 
@@ -135,8 +135,7 @@
   </target>
 
   <target name="tests-jacc-security-external"
-    description="Tests run against a jboss server with JACC configured with an
-                        external policy provider">
+    description="Tests run against a jboss server with JACC configured with an external policy provider">
     <create-config baseconf="default" newconf="jacc-security-external" newconf-src="jacc">
       <patternset>
         <include name="conf/**"/>
@@ -205,8 +204,7 @@
   </target>
 
   <target name="tests-jacc-security-allstarrole"
-    description="Tests run against a jboss server with JACC configured with an
-      external policy provider that would allow all star role">
+    description="Tests run against a jboss server with JACC configured with an external policy provider that would allow all star role">
     <create-config baseconf="default" newconf="jacc-security-allstarrole" newconf-src="jacc">
       <patternset>
         <include name="conf/**"/>

Modified: branches/Branch_4_2/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/server-config.xml	2008-07-11 09:30:53 UTC (rev 75675)
+++ branches/Branch_4_2/testsuite/imports/server-config.xml	2008-07-11 10:16:13 UTC (rev 75676)
@@ -111,9 +111,11 @@
          <jvmarg value="-Djava.security.manager"/>
          <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/>
          <jvmarg value="-Djava.security.debug="/>
+         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />         
       </server>
       <server name="jacc" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
+         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       </server>
       <server name="jacc-security-external" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
@@ -658,8 +660,8 @@
             timeout="${junit.timeout}"
             jvm="${junit.jvm}">
 
-			 <!--
-		      <jvmarg value="-verbose:gc"/>
+            <!--
+              <jvmarg value="-verbose:gc"/>
               <jvmarg value="-Xdebug"/>
               <jvmarg value="-Xnoagent"/>
               <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8686"/>
@@ -673,10 +675,11 @@
             <sysproperty key="jboss-junit-configuration" value="@{junit.configuration}"/>
             <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
             <sysproperty key="jbosstest.server.host" value="${node0}"/>
+            <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
+
             <syspropertyset>
                <propertyref prefix="jbosstest"/>
             </syspropertyset>
-
             <syspropertyset>
                <propertyset refid="@{junit.syspropertyset}" />
             </syspropertyset>