[jboss-cvs] JBossAS SVN: r70818 - in projects/jboss-cl/trunk/classloader/src: tests/org/jboss/test/classloader/jmx/test and 1 other directory.

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

Author: adrian at jboss.org
Date: 2008-03-13 09:36:33 -0400 (Thu, 13 Mar 2008)
New Revision: 70818

Modified:
   projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoader.java
   projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderMBean.java
   projects/jboss-cl/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java
Log:
Change attributes that can return large amounts of data to be operations

Modified: projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoader.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoader.java	2008-03-13 13:05:33 UTC (rev 70817)
+++ projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoader.java	2008-03-13 13:36:33 UTC (rev 70818)
@@ -146,7 +146,7 @@
       return basePolicy.isImportAll();
    }
 
-   public Set<String> getExportedPackages()
+   public Set<String> listExportedPackages()
    {
       HashSet<String> result = new HashSet<String>();
       String[] packageNames = policy.getPackageNames();
@@ -155,7 +155,7 @@
       return result;
    }
 
-   public List<ObjectName> getImports()
+   public List<ObjectName> listImports()
    {
       ArrayList<ObjectName> result = new ArrayList<ObjectName>();
       BaseClassLoaderPolicy basePolicy = policy;
@@ -198,19 +198,19 @@
       return null;
    }
 
-   public Set<String> getLoadedClasses()
+   public Set<String> listLoadedClasses()
    {
       return new HashSet<String>(loadedClasses);
    }
 
-   public Set<String> getLoadedResourceNames()
+   public Set<String> listLoadedResourceNames()
    {
       if (resourceCache == null)
          return Collections.emptySet();
       return new HashSet<String>(resourceCache.keySet());
    }
 
-   public Set<URL> getLoadedResources()
+   public Set<URL> listLoadedResources()
    {
       if (resourceCache == null)
          return Collections.emptySet();

Modified: projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderMBean.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderMBean.java	2008-03-13 13:05:33 UTC (rev 70817)
+++ projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderMBean.java	2008-03-13 13:36:33 UTC (rev 70818)
@@ -83,14 +83,14 @@
     * 
     * @return the exported packages
     */
-   Set<String> getExportedPackages();
+   Set<String> listExportedPackages();
 
    /**
     * Get the imports of this classloader
     * 
     * @return the imports
     */
-   List<ObjectName> getImports();
+   List<ObjectName> listImports();
    
    /**
     * Get the policy as a string
@@ -104,21 +104,21 @@
     * 
     * @return the loaded classes
     */
-   Set<String> getLoadedClasses();
+   Set<String> listLoadedClasses();
    
    /**
     * Get the loaded resource names
     * 
     * @return the loaded resources names
     */
-   Set<String> getLoadedResourceNames();
+   Set<String> listLoadedResourceNames();
    
    /**
     * Get the loaded resources
     * 
     * @return the loaded resources
     */
-   Set<URL> getLoadedResources();
+   Set<URL> listLoadedResources();
    
    /**
     * Load a class

Modified: projects/jboss-cl/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java	2008-03-13 13:05:33 UTC (rev 70817)
+++ projects/jboss-cl/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java	2008-03-13 13:36:33 UTC (rev 70818)
@@ -385,9 +385,9 @@
       assertTrue((Boolean) server.getAttribute(testObjectName, "ImportAll"));
       assertTrue((Boolean) server.getAttribute(testObjectName, "Valid"));
       Set<String> expectedPackages = makeSet(A.class.getPackage().getName(), B.class.getPackage().getName());
-      assertEquals(expectedPackages, server.getAttribute(testObjectName, "ExportedPackages"));
+      assertEquals(expectedPackages, server.invoke(testObjectName, "listExportedPackages", null, null));
       List<ObjectName> expectedImports = Arrays.asList(clA.getObjectName(), clB.getObjectName()); 
-      assertEquals(expectedImports, server.getAttribute(testObjectName, "Imports"));
+      assertEquals(expectedImports, server.invoke(testObjectName, "listImports", null, null));
       assertEquals(test.toLongString(), server.getAttribute(testObjectName, "PolicyDetails"));
    }
 
@@ -405,22 +405,22 @@
       
       ObjectName testObjectName = cl.getObjectName();
 
-      Set<String> loadedClasses = (Set) server.getAttribute(testObjectName, "LoadedClasses");
+      Set<String> loadedClasses = (Set) server.invoke(testObjectName, "listLoadedClasses", null, null);
       assertFalse(loadedClasses.contains(A.class.getName()));
       Class<?> expected = ((ClassLoader) cl).loadClass(A.class.getName());
       assertEquals(expected, server.invoke(testObjectName, "loadClass", new Object[] { A.class.getName() }, new String[] { String.class.getName() }));
-      loadedClasses = (Set) server.getAttribute(testObjectName, "LoadedClasses");
+      loadedClasses = (Set) server.invoke(testObjectName, "listLoadedClasses", null, null);
       assertTrue(loadedClasses.contains(A.class.getName()));
 
       assertEquals(cl.getObjectName(), server.invoke(testObjectName, "findClassLoaderForClass", new Object[] { A.class.getName() }, new String[] { String.class.getName() }));
       assertNull(server.invoke(testObjectName, "findClassLoaderForClass", new Object[] { Object.class.getName() }, new String[] { String.class.getName() }));
       
       String resourceName = ClassLoaderUtils.classNameToPath(B.class.getName());
-      Set<String> loadedResourceNames = (Set) server.getAttribute(testObjectName, "LoadedResourceNames");
+      Set<String> loadedResourceNames = (Set) server.invoke(testObjectName, "listLoadedResourceNames", null, null);
       assertFalse(loadedResourceNames.contains(resourceName));
       Set<URL> expectedURLs = makeSet(((ClassLoader) cl).getResource(resourceName));
       assertEquals(expectedURLs, server.invoke(testObjectName, "loadResources", new Object[] { resourceName }, new String[] { String.class.getName() }));
-      loadedResourceNames = (Set) server.getAttribute(testObjectName, "LoadedResourceNames");
+      loadedResourceNames = (Set) server.invoke(testObjectName, "listLoadedResourceNames", null, null);
       assertTrue(loadedResourceNames.contains(resourceName));
    }