[jboss-cvs] JBossAS SVN: r89138 - in trunk/testsuite: imports and 2 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2009-05-19 17:47:43 -0400 (Tue, 19 May 2009)
New Revision: 89138

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
   trunk/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java
   trunk/testsuite/src/resources/securitymgr/server.policy
Log:
JBAS-6946: reEnable the JACC security manager tests.  The 5 failing tests will pass when there is a release from the JBossMX project by Adrian

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-05-19 21:36:26 UTC (rev 89137)
+++ trunk/testsuite/build.xml	2009-05-19 21:47:43 UTC (rev 89138)
@@ -982,9 +982,7 @@
       <antcall target="tomcat-federation-tests"/>
       <antcall target="tests-binding-manager"/>
       <antcall target="tests-jacc-security"/>
-<!--
       <antcall target="tests-jacc-securitymgr"/>
--->
       <antcall target="tests-jacc-security-allstarrole"/>
 <!--
       <antcall target="tests-security-jaspi-unit"/>
@@ -1837,8 +1835,8 @@
       </propertyset>
 
       <propertyset id="jacc-tests-props">
-         <propertyref prefix="java.security.auth"/>
-		 <propertyref prefix="jboss.security"/>
+      <propertyref prefix="java.security.auth"/>
+      <propertyref prefix="jboss.security"/>
       </propertyset>
 
       <run-junit junit.patternset="jacc.includes"

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2009-05-19 21:36:26 UTC (rev 89137)
+++ trunk/testsuite/imports/server-config.xml	2009-05-19 21:47:43 UTC (rev 89138)
@@ -155,7 +155,7 @@
          <jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
          <jvmarg value="-Djava.security.manager"/>
          <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/>
-         <jvmarg value="-Djava.security.debug=failure"/>
+         <jvmarg value="-Djava.security.debug=access,failure"/>
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
 	 <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>

Modified: trunk/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java	2009-05-19 21:36:26 UTC (rev 89137)
+++ trunk/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java	2009-05-19 21:47:43 UTC (rev 89138)
@@ -64,7 +64,7 @@
       //suite.addTest(new EJBSpecUnitTestCase("testDomainInteraction"));
 
       // All are baseclass tests
-      suite.addTest(new EJBSpecUnitTestCase("testSecurityDomain"));      
+      //JBAS-6944 suite.addTest(new EJBSpecUnitTestCase("testSecurityDomain"));      
       suite.addTest(new EJBSpecUnitTestCase("testStatefulCreateCaller"));  
       suite.addTest(new EJBSpecUnitTestCase("testGetCallerPrincipal"));  
       suite.addTest(new EJBSpecUnitTestCase("testPrincipalPropagation"));  

Modified: trunk/testsuite/src/resources/securitymgr/server.policy
===================================================================
--- trunk/testsuite/src/resources/securitymgr/server.policy	2009-05-19 21:36:26 UTC (rev 89137)
+++ trunk/testsuite/src/resources/securitymgr/server.policy	2009-05-19 21:47:43 UTC (rev 89138)
@@ -54,6 +54,12 @@
    permission java.security.AllPermission;
 };
 
+grant codeBase "jar:file:${jboss.server.home.dir}/common/lib/log4j.jar!/" {
+   permission java.lang.RuntimePermission "getClassLoader";
+};
+grant codeBase "jar:file:${jboss.server.home.dir}/common/lib/servlet-api.jar!/" {
+   permission java.lang.RuntimePermission "getClassLoader";
+};
 
 //********************************************
 // Trusted core JBoss code (VFS URL Version)
@@ -99,6 +105,7 @@
    permission javax.management.MBeanTrustPermission "register";
    permission java.net.SocketPermission "*", "accept,listen,resolve";
    permission java.lang.RuntimePermission "getClassLoader";
+   permission java.util.logging.LoggingPermission "control";
 };