[jboss-cvs] JBossAS SVN: r63167 - in projects/microcontainer/trunk/classloader/src: main/org/jboss/classloader/spi/base and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 21 03:01:31 EDT 2007
Author: adrian at jboss.org
Date: 2007-05-21 03:01:30 -0400 (Mon, 21 May 2007)
New Revision: 63167
Added:
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderMBean.java
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jmx/
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jmx/JMXClassLoader.java
projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/
projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/JMXTestSuite.java
projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/
projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/Simple.java
projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/SimpleMBean.java
projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/
projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java
Modified:
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/ClassLoaderPolicy.java
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoader.java
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderPolicy.java
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/test/support/MockClassLoaderPolicy.java
projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/ClassLoaderAllTestSuite.java
Log:
Allow the new classloader to be used as an MBean classloader.
Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/ClassLoaderPolicy.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/ClassLoaderPolicy.java 2007-05-20 10:50:33 UTC (rev 63166)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/ClassLoaderPolicy.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -32,6 +32,9 @@
import java.util.List;
import java.util.Set;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
import org.jboss.classloader.spi.base.BaseClassLoaderPolicy;
import org.jboss.classloader.spi.filter.FilteredDelegateLoader;
import org.jboss.classloader.spi.filter.PackageClassFilter;
@@ -175,7 +178,7 @@
* @param urls the list of urls to add to
* @throws IOException for any error
*/
- public abstract void getResources(String name ,Set<URL> urls) throws IOException;
+ public abstract void getResources(String name, Set<URL> urls) throws IOException;
/**
* Get the protection domain<p>
@@ -222,6 +225,23 @@
return null;
}
+ /**
+ * Get the object name the classloader is registered in the MBeanServer with
+ *
+ * @return the object name
+ */
+ public ObjectName getObjectName()
+ {
+ try
+ {
+ return ObjectName.getInstance("jboss.classloader", "id", "" + System.identityHashCode(this));
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Error creating object name", e);
+ }
+ }
+
@Override
protected void toLongString(StringBuilder builder)
{
Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoader.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoader.java 2007-05-20 10:50:33 UTC (rev 63166)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoader.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -39,10 +39,13 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
+import javax.management.ObjectName;
+
import org.jboss.classloader.plugins.ClassLoaderUtils;
import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloader.spi.DelegateLoader;
import org.jboss.classloader.spi.PackageInformation;
+import org.jboss.classloader.spi.jmx.JMXClassLoader;
import org.jboss.logging.Logger;
import org.jboss.util.collection.Iterators;
@@ -52,7 +55,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class BaseClassLoader extends SecureClassLoader
+public class BaseClassLoader extends SecureClassLoader implements BaseClassLoaderMBean, JMXClassLoader
{
/** The log */
private static final Logger log = Logger.getLogger(BaseClassLoader.class);
@@ -101,6 +104,11 @@
log.debug("Created " + this + " with policy " + policy);
}
+ public ObjectName getObjectName()
+ {
+ return policy.getObjectName();
+ }
+
/**
* Get the policy.
*
Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java 2007-05-20 10:50:33 UTC (rev 63166)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -140,6 +140,16 @@
}
/**
+ * Whether the domain has classloaders
+ *
+ * @return true when the domain has classloaders
+ */
+ public boolean hasClassLoaders()
+ {
+ return classLoaders.isEmpty() == false;
+ }
+
+ /**
* Transform the byte code<p>
*
* By default, this delegates to the classloader system
Added: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderMBean.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderMBean.java (rev 0)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderMBean.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.classloader.spi.base;
+
+/**
+ * BaseClassLoaderMBean.
+ *
+ * @author <a href="adrian at jboss.org">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public interface BaseClassLoaderMBean
+{
+}
Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderPolicy.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderPolicy.java 2007-05-20 10:50:33 UTC (rev 63166)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderPolicy.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -26,6 +26,7 @@
import java.security.ProtectionDomain;
import java.util.List;
+import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloader.spi.DelegateLoader;
import org.jboss.logging.Logger;
@@ -200,6 +201,18 @@
}
/**
+ * Get the classloader domain name
+ *
+ * @return the domain
+ */
+ public String getDomainName()
+ {
+ if (domain == null)
+ return null;
+ return ((ClassLoaderDomain) domain).getName();
+ }
+
+ /**
* Get the classloader domain
*
* @return the domain
Added: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jmx/JMXClassLoader.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jmx/JMXClassLoader.java (rev 0)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jmx/JMXClassLoader.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.classloader.spi.jmx;
+
+import javax.management.ObjectName;
+
+/**
+ * JMXClassLoader.
+ *
+ * @author <a href="adrian at jboss.org">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public interface JMXClassLoader
+{
+ /**
+ * Get the object name used to register the classloader with the MBeanServer
+ *
+ * @return the object name
+ */
+ ObjectName getObjectName();
+}
Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/test/support/MockClassLoaderPolicy.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/test/support/MockClassLoaderPolicy.java 2007-05-20 10:50:33 UTC (rev 63166)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/test/support/MockClassLoaderPolicy.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -28,9 +28,13 @@
import java.security.ProtectionDomain;
import java.util.Arrays;
import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.List;
import java.util.Set;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
import org.jboss.classloader.plugins.ClassLoaderUtils;
import org.jboss.classloader.plugins.filter.PatternClassFilter;
import org.jboss.classloader.spi.ClassLoaderPolicy;
@@ -399,6 +403,22 @@
return super.isJDKRequest(name);
}
+ @Override
+ public ObjectName getObjectName()
+ {
+ try
+ {
+ Hashtable<String, String> properties = new Hashtable<String, String>();
+ properties.put("name", "'" + name + "'");
+ properties.put("domain", "'" + getDomainName() + "'");
+ return ObjectName.getInstance("jboss.classloader", properties);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Error creating object name", e);
+ }
+ }
+
@Override
public void toLongString(StringBuilder builder)
{
Modified: projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/ClassLoaderAllTestSuite.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/ClassLoaderAllTestSuite.java 2007-05-20 10:50:33 UTC (rev 63166)
+++ projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/ClassLoaderAllTestSuite.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -29,6 +29,7 @@
import org.jboss.test.classloader.delegate.DelegateTestSuite;
import org.jboss.test.classloader.domain.ClassLoaderDomainTestSuite;
import org.jboss.test.classloader.filter.FilterTestSuite;
+import org.jboss.test.classloader.jmx.JMXTestSuite;
import org.jboss.test.classloader.old.OldTestSuite;
import org.jboss.test.classloader.policy.test.ClassLoaderPolicyUnitTestCase;
import org.jboss.test.classloader.resources.ResourceTestSuite;
@@ -69,6 +70,7 @@
suite.addTest(FilterTestSuite.suite());
suite.addTest(DelegateTestSuite.suite());
suite.addTest(ResourceTestSuite.suite());
+ suite.addTest(JMXTestSuite.suite());
return suite;
}
Added: projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/JMXTestSuite.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/JMXTestSuite.java (rev 0)
+++ projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/JMXTestSuite.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.classloader.jmx;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.jboss.test.classloader.jmx.test.JMXUnitTestCase;
+
+/**
+ * JMX Test Suite.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 37459 $
+ */
+public class JMXTestSuite extends TestSuite
+{
+ /**
+ * For running the testsuite from the command line
+ *
+ * @param args the command line args
+ */
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ /**
+ * Create the testsuite
+ *
+ * @return the testsuite
+ */
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("JMX Tests");
+
+ suite.addTest(JMXUnitTestCase.suite());
+
+ return suite;
+ }
+}
Added: projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/Simple.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/Simple.java (rev 0)
+++ projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/Simple.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.classloader.jmx.support;
+
+/**
+ * Simple.
+ *
+ * @author <a href="adrian at jboss.org">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class Simple implements SimpleMBean
+{
+ public ClassLoader getClassLoader()
+ {
+ return getClass().getClassLoader();
+ }
+}
Added: projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/SimpleMBean.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/SimpleMBean.java (rev 0)
+++ projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/support/SimpleMBean.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.classloader.jmx.support;
+
+/**
+ * SimpleMBean.
+ *
+ * @author <a href="adrian at jboss.org">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public interface SimpleMBean
+{
+ ClassLoader getClassLoader();
+}
Added: projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java (rev 0)
+++ projects/microcontainer/trunk/classloader/src/tests/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java 2007-05-21 07:01:30 UTC (rev 63167)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.classloader.jmx.test;
+
+import javax.management.MBeanInfo;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.jmx.JMXClassLoader;
+import org.jboss.classloader.test.support.MockClassLoaderPolicy;
+import org.jboss.test.classloader.AbstractClassLoaderTest;
+import org.jboss.test.classloader.jmx.support.Simple;
+
+/**
+ * JMXUnitTestCase
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class JMXUnitTestCase extends AbstractClassLoaderTest
+{
+ public static Test suite()
+ {
+ return suite(JMXUnitTestCase.class);
+ }
+
+ public JMXUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testJMXClassLoader() throws Exception
+ {
+ ClassLoaderSystem system = createClassLoaderSystemWithModifiedBootstrap();
+
+ MockClassLoaderPolicy policy = createMockClassLoaderPolicy("simple");
+ policy.setPathsAndPackageNames(Simple.class);
+ JMXClassLoader cl = (JMXClassLoader) system.registerClassLoaderPolicy(policy);
+
+ MBeanServer server = MBeanServerFactory.newMBeanServer();
+ ObjectName clName = cl.getObjectName();
+ server.registerMBean(cl, clName);
+ getLog().debug("Registered classloader " + cl + " with name " + clName);
+
+ ObjectName name = new ObjectName("test:test=simple");
+ server.createMBean(Simple.class.getName(), name, clName);
+
+ MBeanInfo info = server.getMBeanInfo(name);
+ assertEquals(Simple.class.getName(), info.getClassName());
+
+ Object actual = server.getAttribute(name, "ClassLoader");
+ getLog().debug("Actual ClassLoader=" + actual + " expected " + cl);
+ assertEquals(cl, actual);
+ }
+}
More information about the jboss-cvs-commits
mailing list