mx4j/src/test/test/javax/management LocalSecurityManagerTest.java,1.4,1.5 SecurityManagerTestCase.java,1.4,1.5
Jeremy Boynes <[email protected]> Mon, 14 Feb 2005 09:06:47 +0000
| Newsgroups | gmane.comp.java.mx4j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mx4j/mx4j/src/test/test/javax/management
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8818/src/test/test/javax/management
Modified Files:
LocalSecurityManagerTest.java SecurityManagerTestCase.java
Log Message:
Fix for [ 1122228 ] Default domain is "DefaultDomain"
Index: LocalSecurityManagerTest.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/test/test/javax/management/LocalSecurityManagerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LocalSecurityManagerTest.java 13 Nov 2004 16:38:30 -0000 1.4
--- LocalSecurityManagerTest.java 14 Feb 2005 09:06:45 -0000 1.5
***************
*** 265,269 ****
// Check also the overloaded version, we need an MLet
String mletClassName = "javax.management.loading.MLet";
! ObjectName name = new ObjectName(":mbean=mlet");
resetPermissions();
addPermission(new MBeanPermission(mletClassName, "instantiate, registerMBean"));
--- 265,269 ----
// Check also the overloaded version, we need an MLet
String mletClassName = "javax.management.loading.MLet";
! ObjectName name = new ObjectName(server.getDefaultDomain(), "mbean", "mlet");
resetPermissions();
addPermission(new MBeanPermission(mletClassName, "instantiate, registerMBean"));
***************
*** 325,329 ****
MBeanServerDelegate mbean = new MBeanServerDelegate();
! ObjectName name = new ObjectName(":name=test");
try
--- 325,329 ----
MBeanServerDelegate mbean = new MBeanServerDelegate();
! ObjectName name = new ObjectName(server.getDefaultDomain(), "name", "test");
try
***************
*** 368,372 ****
// Needed to create an MLet, which is a ClassLoader
addPermission(new RuntimePermission("createClassLoader"));
! ObjectName name = new ObjectName(":mbean=mlet");
MLet mlet = new MLet();
addPermission(new MBeanPermission(mlet.getClass().getName(), "registerMBean"));
--- 368,372 ----
// Needed to create an MLet, which is a ClassLoader
addPermission(new RuntimePermission("createClassLoader"));
! ObjectName name = new ObjectName(server.getDefaultDomain(), "mbean", "mlet");
MLet mlet = new MLet();
addPermission(new MBeanPermission(mlet.getClass().getName(), "registerMBean"));
Index: SecurityManagerTestCase.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/test/test/javax/management/SecurityManagerTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SecurityManagerTestCase.java 8 Feb 2005 07:12:23 -0000 1.4
--- SecurityManagerTestCase.java 14 Feb 2005 09:06:45 -0000 1.5
***************
*** 122,126 ****
// Needed to create an MLet, which is a ClassLoader
addPermission(new RuntimePermission("createClassLoader"));
! ObjectName mletName = new ObjectName(":name=mlet");
String mletClassName = "javax.management.loading.MLet";
addPermission(new MBeanPermission(mletClassName + "[" + mletName.getCanonicalName() + "]", "instantiate, registerMBean"));
--- 122,126 ----
// Needed to create an MLet, which is a ClassLoader
addPermission(new RuntimePermission("createClassLoader"));
! ObjectName mletName = new ObjectName(server.getDefaultDomain(), "name", "mlet");
String mletClassName = "javax.management.loading.MLet";
addPermission(new MBeanPermission(mletClassName + "[" + mletName.getCanonicalName() + "]", "instantiate, registerMBean"));
***************
*** 129,133 ****
// Now we have something in the CLR
String mbeanClassName = "javax.management.MBeanServerDelegate";
! ObjectName mbeanName = new ObjectName(":name=delegate");
try
--- 129,133 ----
// Now we have something in the CLR
String mbeanClassName = "javax.management.MBeanServerDelegate";
! ObjectName mbeanName = new ObjectName(server.getDefaultDomain(), "name", "delegate");
try
***************
*** 150,154 ****
addPermission(new RuntimePermission("createClassLoader"));
! ObjectName mletName = new ObjectName(":name=mlet");
String mletClassName = "javax.management.loading.MLet";
--- 150,154 ----
addPermission(new RuntimePermission("createClassLoader"));
! ObjectName mletName = new ObjectName(server.getDefaultDomain(), "name", "mlet");
String mletClassName = "javax.management.loading.MLet";
***************
*** 321,325 ****
protected void testInvoke(MBeanServerConnection server) throws Exception
{
! ObjectName mbeanName = new ObjectName(":mbean=simple");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
--- 321,325 ----
protected void testInvoke(MBeanServerConnection server) throws Exception
{
! ObjectName mbeanName = new ObjectName(server.getDefaultDomain(), "mbean", "simple");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
***************
*** 375,379 ****
protected void testQueryMBeans(MBeanServerConnection server) throws Exception
{
! ObjectName mbeanName = new ObjectName(":mbean=simple");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
--- 375,379 ----
protected void testQueryMBeans(MBeanServerConnection server) throws Exception
{
! ObjectName mbeanName = new ObjectName(server.getDefaultDomain(), "mbean", "simple");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
***************
*** 390,394 ****
// Check that an ObjectName that does not match returns an empty list
! ObjectName dummy = new ObjectName(":type=dummy");
addPermission(new MBeanPermission("[" + dummy.getCanonicalName() + "]", "queryMBeans"));
Set mbeans = server.queryMBeans(null, null);
--- 390,394 ----
// Check that an ObjectName that does not match returns an empty list
! ObjectName dummy = new ObjectName(server.getDefaultDomain(), "type", "dummy");
addPermission(new MBeanPermission("[" + dummy.getCanonicalName() + "]", "queryMBeans"));
Set mbeans = server.queryMBeans(null, null);
***************
*** 405,409 ****
// Check the right one for a pattern in permission
resetPermissions();
! addPermission(new MBeanPermission("[:*]", "queryMBeans"));
mbeans = server.queryMBeans(null, null);
assertEquals(mbeans.size(), 1);
--- 405,409 ----
// Check the right one for a pattern in permission
resetPermissions();
! addPermission(new MBeanPermission("[" + server.getDefaultDomain() + ":*]", "queryMBeans"));
mbeans = server.queryMBeans(null, null);
assertEquals(mbeans.size(), 1);
***************
*** 447,451 ****
protected void testQueryNames(MBeanServerConnection server) throws Exception
{
! ObjectName mbeanName = new ObjectName(":mbean=simple");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
--- 447,451 ----
protected void testQueryNames(MBeanServerConnection server) throws Exception
{
! ObjectName mbeanName = new ObjectName(server.getDefaultDomain(), "mbean", "simple");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
***************
*** 462,466 ****
// Check that an ObjectName that does not match returns an empty list
! ObjectName dummy = new ObjectName(":type=dummy");
addPermission(new MBeanPermission("[" + dummy.getCanonicalName() + "]", "queryNames"));
Set mbeans = server.queryNames(null, null);
--- 462,466 ----
// Check that an ObjectName that does not match returns an empty list
! ObjectName dummy = new ObjectName(server.getDefaultDomain(), "type", "dummy");
addPermission(new MBeanPermission("[" + dummy.getCanonicalName() + "]", "queryNames"));
Set mbeans = server.queryNames(null, null);
***************
*** 477,481 ****
// Check the right one for a pattern in permission
resetPermissions();
! addPermission(new MBeanPermission("[:*]", "queryNames"));
mbeans = server.queryNames(null, null);
assertEquals(mbeans.size(), 1);
--- 477,481 ----
// Check the right one for a pattern in permission
resetPermissions();
! addPermission(new MBeanPermission("["+ server.getDefaultDomain() + ":*]", "queryNames"));
mbeans = server.queryNames(null, null);
assertEquals(mbeans.size(), 1);
***************
*** 518,522 ****
protected void testSetAttribute(MBeanServerConnection server) throws Exception
{
! ObjectName name = new ObjectName(":name=test");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
--- 518,522 ----
protected void testSetAttribute(MBeanServerConnection server) throws Exception
{
! ObjectName name = new ObjectName(server.getDefaultDomain(), "name", "test");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
***************
*** 547,551 ****
protected void testSetAttributes(MBeanServerConnection server) throws Exception
{
! ObjectName mbeanName = new ObjectName(":mbean=simple");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
--- 547,551 ----
protected void testSetAttributes(MBeanServerConnection server) throws Exception
{
! ObjectName mbeanName = new ObjectName(server.getDefaultDomain(), "mbean", "simple");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
***************
*** 627,631 ****
protected void testUnregisterMBean(MBeanServerConnection server) throws Exception
{
! ObjectName name = new ObjectName(":name=test");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
--- 627,631 ----
protected void testUnregisterMBean(MBeanServerConnection server) throws Exception
{
! ObjectName name = new ObjectName(server.getDefaultDomain(), "name", "test");
addPermission(new MBeanPermission(Simple.class.getName(), "instantiate, registerMBean"));
addPermission(new MBeanTrustPermission("register"));
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click