[jboss-cvs] JBossAS SVN: r68908 - in projects/microcontainer/trunk: classloader/src/main/org/jboss/classloader/plugins/loader and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 11 17:00:51 EST 2008
Author: alesj
Date: 2008-01-11 17:00:51 -0500 (Fri, 11 Jan 2008)
New Revision: 68908
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/plugins/loader/ClassLoaderToLoaderAdapter.java
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jdk/JDKCheckerFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectionUtils.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/ear/test/EARStructureUnitTestCase.java
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/ConfiguredSuffixJARStructureUnitTestCase.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/IgnoredAnnotatedLifecycleBean.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java
Log:
JDK6 support.
ClassLoader.loadClass --> Class.forName(className, false, classLoader).
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -43,22 +43,22 @@
{
this.server = server;
}
-
+
+ @SuppressWarnings("unchecked")
public void install(ControllerContext context) throws Exception
{
validateServer();
JMX jmx = readJmxAnnotation(context);
ObjectName objectName = createObjectName(context, jmx);
- Class<?> intfClass = null;
+ Class intfClass = null;
boolean registerDirectly = false;
if (jmx != null)
{
intfClass = jmx.exposedInterface();
registerDirectly = jmx.registerDirectly();
}
- Object mbean = (registerDirectly ? context.getTarget()
- : new StandardMBean(context.getTarget(), intfClass));
+ Object mbean = (registerDirectly ? context.getTarget() : new StandardMBean(context.getTarget(), intfClass));
server.registerMBean(mbean, objectName);
log.debug("Registered MBean " + objectName);
}
Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/plugins/loader/ClassLoaderToLoaderAdapter.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/plugins/loader/ClassLoaderToLoaderAdapter.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/plugins/loader/ClassLoaderToLoaderAdapter.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -170,7 +170,7 @@
{
try
{
- return classLoader.loadClass(className);
+ return Class.forName(className, false, classLoader);
}
catch (ClassNotFoundException e)
{
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 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -201,7 +201,7 @@
{
if (trace)
log.trace(this + " trying to load " + name + " using hack " + hack);
- Class<?> result = hack.loadClass(name);
+ Class<?> result = Class.forName(name, false, hack);
if (result != null)
{
if (trace)
@@ -250,7 +250,7 @@
// Work out the rules
ClassLoaderInformation info = null;
- BaseClassLoaderPolicy policy = null;
+ BaseClassLoaderPolicy policy;
if (classLoader != null)
{
info = infos.get(classLoader);
@@ -312,7 +312,7 @@
// Work out the rules
ClassLoaderInformation info = null;
- BaseClassLoaderPolicy policy = null;
+ BaseClassLoaderPolicy policy;
if (classLoader != null)
{
policy = classLoader.getPolicy();
@@ -383,7 +383,7 @@
// Work out the rules
ClassLoaderInformation info = null;
- BaseClassLoaderPolicy policy = null;
+ BaseClassLoaderPolicy policy;
if (classLoader != null)
{
policy = classLoader.getPolicy();
@@ -436,7 +436,7 @@
// Work out the rules
ClassLoaderInformation info = null;
- BaseClassLoaderPolicy policy = null;
+ BaseClassLoaderPolicy policy;
if (classLoader != null)
{
policy = classLoader.getPolicy();
@@ -506,7 +506,7 @@
// Work out the rules
ClassLoaderInformation info = null;
- BaseClassLoaderPolicy policy = null;
+ BaseClassLoaderPolicy policy;
if (classLoader != null)
{
policy = classLoader.getPolicy();
Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jdk/JDKCheckerFactory.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jdk/JDKCheckerFactory.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/jdk/JDKCheckerFactory.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -50,7 +50,7 @@
String className = System.getProperty(JDKChecker.class.getName(), defaultChecker);
try
{
- Class<?> clazz = null;
+ Class<?> clazz;
try
{
clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -21,6 +21,16 @@
*/
package org.jboss.annotation.factory;
+import java.io.StringReader;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.HashMap;
+
import org.jboss.annotation.factory.ast.ASTAnnotation;
import org.jboss.annotation.factory.ast.ASTChar;
import org.jboss.annotation.factory.ast.ASTIdentifier;
@@ -36,16 +46,6 @@
import org.jboss.annotation.factory.ast.SimpleNode;
import org.jboss.annotation.factory.javassist.DefaultValueAnnotationValidator;
-import java.io.StringReader;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.HashMap;
-
/**
* Comment
*
@@ -158,7 +158,8 @@
}
else
{
- typeValue = Thread.currentThread().getContextClassLoader().loadClass(classname);
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ typeValue = Class.forName(classname, false, loader);
}
}
else if (type.isPrimitive())
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -205,7 +205,8 @@
}
else
{
- value = Thread.currentThread().getContextClassLoader().loadClass(classMemberValue.getValue());
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ value = Class.forName(classMemberValue.getValue(), false, loader);
}
}
catch (ClassNotFoundException e)
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationInfoImpl.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationInfoImpl.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -21,11 +21,11 @@
*/
package org.jboss.reflect.plugins;
+import java.util.HashMap;
+
import org.jboss.reflect.spi.AnnotationAttribute;
import org.jboss.reflect.spi.AnnotationInfo;
-import java.util.HashMap;
-
/**
* Annotation Info
*
@@ -80,11 +80,6 @@
}
}
- public String getName()
- {
- return name;
- }
-
public boolean isAnnotation()
{
return true;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -595,7 +595,7 @@
{
if (attachment == null)
return;
- attachments = new TypeInfoAttachments();;
+ attachments = new TypeInfoAttachments();
}
}
if (attachment == null)
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -358,13 +358,21 @@
return new ArrayInfoImpl(componentType);
}
- private TypeInfo resolveComplexTypeInfo(ClassLoader cl, String name)
+ /**
+ * Resolve complex type info.
+ *
+ * @param cl the classloader to use
+ * @param name the class name
+ * @return type info from the name and classloader
+ * @throws ClassNotFoundException for any error
+ */
+ protected TypeInfo resolveComplexTypeInfo(ClassLoader cl, String name)
throws ClassNotFoundException
{
if (cl == null)
cl = Thread.currentThread().getContextClassLoader();
- Class clazz = cl.loadClass(name);
+ Class clazz = Class.forName(name, false, cl);
return getTypeInfo(clazz);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectionUtils.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectionUtils.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectionUtils.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -96,7 +96,7 @@
throw new IllegalArgumentException("Null class name");
if (cl == null)
throw new IllegalArgumentException("Null classloader");
- Class clazz = cl.loadClass(className);
+ Class clazz = Class.forName(className, false, cl);
try
{
return clazz.newInstance();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -31,13 +31,17 @@
import javassist.CtMethod;
import javassist.CtPrimitiveType;
import javassist.NotFoundException;
-
import org.jboss.reflect.plugins.AnnotationAttributeImpl;
import org.jboss.reflect.plugins.AnnotationHelper;
import org.jboss.reflect.plugins.AnnotationValueFactory;
import org.jboss.reflect.plugins.AnnotationValueImpl;
import org.jboss.reflect.plugins.EnumConstantInfoImpl;
-import org.jboss.reflect.spi.*;
+import org.jboss.reflect.spi.AnnotationInfo;
+import org.jboss.reflect.spi.AnnotationValue;
+import org.jboss.reflect.spi.NumberInfo;
+import org.jboss.reflect.spi.PrimitiveInfo;
+import org.jboss.reflect.spi.TypeInfo;
+import org.jboss.reflect.spi.TypeInfoFactory;
import org.jboss.util.JBossStringBuilder;
import org.jboss.util.collection.WeakClassCache;
@@ -284,12 +288,12 @@
{
if (number.isInitialized() == false)
{
- number.setDelegate((TypeInfo) get(cl.loadClass(name)));
+ number.setDelegate((TypeInfo) get(Class.forName(name, false, cl)));
}
return number;
}
- Class clazz = cl.loadClass(name);
+ Class clazz = Class.forName(name, false, cl);
return getTypeInfo(clazz);
}
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/ear/test/EARStructureUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/ear/test/EARStructureUnitTestCase.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/ear/test/EARStructureUnitTestCase.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -26,7 +26,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.jboss.deployers.vfs.plugins.structure.file.FileStructure;
import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
import org.jboss.deployers.vfs.plugins.structure.war.WARStructure;
@@ -34,6 +33,7 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
import org.jboss.test.deployers.vfs.structure.AbstractStructureTest;
import org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer;
+import org.jboss.virtual.plugins.context.jar.JarUtils;
/**
* Mock ear structure deployer tests
@@ -63,11 +63,19 @@
protected VFSDeploymentContext determineStructure(VFSDeployment deployment) throws Exception
{
+ Set<String> defaultSuffixes = JarUtils.getSuffixes();
JARStructure jarStructure = new JARStructure();
- Set<String> suffixes = new HashSet<String>(jarStructure.getSuffixes());
- suffixes.add(".ejb3");
- jarStructure.setSuffixes(suffixes);
- return determineStructureWithStructureDeployers(deployment, new FileStructure(), new WARStructure(), jarStructure, new MockEarStructureDeployer());
+ try
+ {
+ Set<String> suffixes = new HashSet<String>(jarStructure.getSuffixes());
+ suffixes.add(".ejb3");
+ jarStructure.setSuffixes(suffixes);
+ return determineStructureWithStructureDeployers(deployment, new FileStructure(), new WARStructure(), jarStructure, new MockEarStructureDeployer());
+ }
+ finally
+ {
+ jarStructure.setSuffixes(defaultSuffixes);
+ }
}
public void testNotAnEAR() throws Throwable
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/ConfiguredSuffixJARStructureUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/ConfiguredSuffixJARStructureUnitTestCase.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/ConfiguredSuffixJARStructureUnitTestCase.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -24,13 +24,12 @@
import java.util.HashSet;
import java.util.Set;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
import org.jboss.test.BaseTestCase;
import org.jboss.virtual.plugins.context.jar.JarUtils;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* ConfiguredSuffixJARStructureUnitTestCase.
*
@@ -65,7 +64,7 @@
Set<String> suffixes = structure.getSuffixes();
assertNotNull(suffixes);
- assertEquals(defaultSuffixes.size(), suffixes.size());
+ assertEquals(defaultSuffixes + " != " + suffixes, defaultSuffixes.size(), suffixes.size());
for (String suff : defaultSuffixes)
{
suffixes.contains(suff);
@@ -87,7 +86,7 @@
assertEquals(3, suffixes.size());
assertTrue(suffixes.contains(".bar"));
assertTrue(suffixes.contains(".tar"));
- assertTrue(suffixes.contains(".bar"));
+ assertTrue(suffixes.contains(".far"));
}
finally
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -89,7 +89,7 @@
Class<?> clazz;
try
{
- clazz = cl.loadClass(className);
+ clazz = Class.forName(className, false, cl);
}
catch (ClassNotFoundException e)
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/IgnoredAnnotatedLifecycleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/IgnoredAnnotatedLifecycleBean.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/IgnoredAnnotatedLifecycleBean.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -32,7 +32,7 @@
public class IgnoredAnnotatedLifecycleBean extends AnnotatedLifecycleBean
{
@Create(ignored = true)
- public void ignoredCreate()
+ public void annotatedCreate()
{
m_create = true;
}
@@ -51,10 +51,9 @@
}
@Destroy(ignored = true)
- public void ignoredDestroy()
+ public void annotatedDestroy()
{
m_create = false;
m_destroy = true;
}
-
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -366,10 +366,11 @@
return this.equals(av.getMetaType());
}
// Check the element classes
- Class thisClass = null;
+ Class thisClass;
try
{
- thisClass = Thread.currentThread().getContextClassLoader().loadClass(getClassName());
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ thisClass = Class.forName(getClassName(), false, loader);
}
catch (ClassNotFoundException e)
{
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java 2008-01-11 21:12:42 UTC (rev 68907)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java 2008-01-11 22:00:51 UTC (rev 68908)
@@ -81,7 +81,7 @@
throw new IllegalArgumentException("Null className");
if (classLoader == null)
throw new IllegalArgumentException("Null classLoader");
- Class clazz = classLoader.loadClass(className);
+ Class clazz = Class.forName(className, false, classLoader);
return resolve(clazz);
}
More information about the jboss-cvs-commits
mailing list