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

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

Author: ron.sigal at jboss.com
Date: 2008-03-27 03:08:13 -0400 (Thu, 27 Mar 2008)
New Revision: 3799

Modified:
   remoting2/branches/2.x/test.policy
Log:
JBREM-920: Simplified a couple of test suite permissions.

Modified: remoting2/branches/2.x/test.policy
===================================================================
--- remoting2/branches/2.x/test.policy	2008-03-27 07:03:12 UTC (rev 3798)
+++ remoting2/branches/2.x/test.policy	2008-03-27 07:08:13 UTC (rev 3799)
@@ -25,7 +25,7 @@
     permission javax.management.MBeanPermission "org.jboss.remoting.network.NetworkRegistry#-[remoting:type=NetworkRegistry]", "queryMBeans, isInstanceOf";
     permission javax.management.MBeanPermission "org.jboss.remoting.network.NetworkRegistry#Servers[remoting:type=NetworkRegistry]", "getAttribute";
     permission javax.management.MBeanPermission "-#ServerDataDir[jboss.system:type=ServerConfig]", "getAttribute";
-    
+
     // TODO: Figure out why these aren't covered by the AllPermission entries below
     permission javax.management.MBeanPermission "org.jboss.test.remoting.detection.metadata.MetadataTestCase$TestNetworkRegistry#-[remoting:type=NetworkRegistry]", "unregisterMBean, registerMBean, queryMBeans, isInstanceOf";
 
@@ -59,7 +59,7 @@
     permission java.util.PropertyPermission "remoting.stream.host", "read";   
     permission java.util.PropertyPermission "remoting.stream.port", "read"; 
     permission java.util.PropertyPermission "org.jboss.security.ignoreHttpsHost" , "read";   
-    
+
     // Tomcat native - TODO - this should be in a privileged block in jbossnative
     permission java.lang.RuntimePermission "loadLibrary.tcnative-1";
     permission java.lang.RuntimePermission "loadLibrary.libtcnative-1";
@@ -69,7 +69,7 @@
     permission java.io.FilePermission "${build.home}/output/tests/classes/-", "read";
     permission java.io.FilePermission "${build.home}", "read";
     permission java.io.FilePermission "${build.home}/jboss.identity", "read";
-    
+
     // Permission for org.jboss.remoting.ident.Identity to create "jboss.identity" file.  Could be extended.
     permission java.io.FilePermission "${build.home}", "write";
 
@@ -122,14 +122,12 @@
     permission javax.management.MBeanServerPermission "createMBeanServer, findMBeanServer";
     permission javax.management.MBeanTrustPermission "register";
     permission javax.management.MBeanPermission "org.jboss.remoting.ServerInvoker#-[jboss.remoting:service=invoker,*]", "unregisterMBean, registerMBean, queryMBeans, isInstanceOf";
-    permission javax.management.MBeanPermission "org.jboss.remoting.transport.Connector#-[jboss.remoting:*,transport=socket,type=Connector]", "registerMBean, unregisterMBean, queryMBeans, isInstanceOf";
-    permission javax.management.MBeanPermission "org.jboss.remoting.transport.Connector#-[jboss.remoting:transport=socket,type=Connector]", "registerMBean, unregisterMBean, queryMBeans, isInstanceOf";
+    permission javax.management.MBeanPermission "org.jboss.remoting.transport.Connector#-[jboss.remoting:type=Connector,*]", "registerMBean, unregisterMBean, queryMBeans, isInstanceOf";
     permission javax.management.MBeanPermission "org.jboss.remoting.transport.Connector#-[test:type=connector]", "registerMBean";
     permission javax.management.MBeanPermission "org.jboss.test.remoting.detection.metadata.MetadataTestCase$TestNetworkRegistry#-[remoting:type=NetworkRegistry]", "registerMBean, unregisterMBean, queryMBeans, isInstanceOf, addNotificationListener";
     permission javax.management.MBeanPermission "org.jboss.remoting.network.NetworkRegistry#-[remoting:type=NetworkRegistry]", "registerMBean, unregisterMBean, queryMBeans, isInstanceOf";
     permission javax.management.MBeanPermission "org.jboss.remoting.detection.multicast.MulticastDetector#-[remoting:type=JNDIDetector]", "registerMBean, queryMBeans, isInstanceOf";
-    permission javax.management.MBeanPermission "org.jboss.remoting.detection.multicast.MulticastDetector#-[remoting:type=MulticastDetector]", "registerMBean, queryMBeans, isInstanceOf";
-    permission javax.management.MBeanPermission "org.jboss.remoting.detection.multicast.MulticastDetector#-[remoting:type=MulticastDetector]", "registerMBean, queryMBeans, isInstanceOf";
+    permission javax.management.MBeanPermission "org.jboss.remoting.detection.multicast.MulticastDetector#-[remoting:type=MulticastDetector]", "registerMBean, unregisterMBean, queryMBeans, isInstanceOf";
     permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#-[jboss:type=serversocketfactory]", "registerMBean, queryMBeans, isInstanceOf";
     permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.config.FactoryConfigTestCaseParent$SelfIdentifyingServerSocketFactory#-[jboss:type=serversocketfactory]", "registerMBean, queryMBeans, isInstanceOf";
     permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#-[jboss:type=serversocketfactory2]", "registerMBean";