[jboss-cvs] JBossAS SVN: r103624 - in projects/jboss-reflect/trunk/src: test/java/org/jboss/test/beaninfo/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 7 05:49:36 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-04-07 05:49:35 -0400 (Wed, 07 Apr 2010)
New Revision: 103624
Modified:
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/beaninfo/test/JavassistBeanInfoCacheTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/AbstractClassInfoTest.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/ClassInfoProxyTest.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistClassUnitTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistEnumUnitTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistGenericClassUnitTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistGenericInterfaceUnitTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistInterfaceUnitTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/bytecode/test/AbstractJavassistMethodAndFieldFactoryTest.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/test/JavassistHelperTestCase.java
Log:
[JBREFLECT-113] Support package annotations in javassist
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -888,9 +888,20 @@
{
String packageName = ctClass.getPackageName();
if (packageName != null)
- packageInfo = new PackageInfoImpl(ctClass.getPackageName());
+ {
+ AnnotationValue[] annotations = null;
+ try
+ {
+ ClassInfo info = (ClassInfo)factory.get(packageName + ".package-info", ctClass.getClassPool().getClassLoader());
+ annotations = info.getAnnotations();
+ }
+ catch (ClassNotFoundException e)
+ {
+ }
+
+ packageInfo = new PackageInfoImpl(ctClass.getPackageName(), annotations);
+ }
}
- // TODO package annotations
return packageInfo;
}
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/beaninfo/test/JavassistBeanInfoCacheTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/beaninfo/test/JavassistBeanInfoCacheTestCase.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/beaninfo/test/JavassistBeanInfoCacheTestCase.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.beaninfo.test;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Map;
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/AbstractClassInfoTest.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/AbstractClassInfoTest.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/AbstractClassInfoTest.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -50,8 +50,6 @@
import org.jboss.reflect.spi.Value;
import org.jboss.test.ContainerTest;
-import com.sun.mirror.declaration.Modifier;
-
/**
* AbstractClassInfoTest.
*
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/ClassInfoProxyTest.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/ClassInfoProxyTest.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/ClassInfoProxyTest.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -30,7 +30,6 @@
import org.jboss.reflect.spi.MethodInfo;
import org.jboss.reflect.spi.ModifierInfo;
import org.jboss.reflect.spi.TypeInfo;
-import org.jboss.test.classinfo.support.ClassInfoGenericFieldsInterface;
import org.jboss.test.classinfo.support.JavassistProxyMethodHandler;
import org.jboss.test.classinfo.support.JdkProxyInvocationHandler;
import org.jboss.test.classinfo.support.ProxyInterface;
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistClassUnitTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistClassUnitTestCase.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistClassUnitTestCase.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -24,7 +24,6 @@
import junit.framework.Test;
import org.jboss.reflect.plugins.javassist.JavassistTypeInfoFactory;
-import org.jboss.reflect.spi.PackageInfo;
import org.jboss.reflect.spi.TypeInfoFactory;
/**
@@ -45,11 +44,6 @@
return suite(JavassistClassUnitTestCase.class);
}
- protected void assertPackageAnnotations(Package pkg, PackageInfo packageInfo) throws Throwable
- {
- // TODO JBREFLECT-113 this is broken for javassist
- }
-
protected TypeInfoFactory getTypeInfoFactory()
{
return new JavassistTypeInfoFactory();
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistEnumUnitTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistEnumUnitTestCase.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistEnumUnitTestCase.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -24,7 +24,6 @@
import junit.framework.Test;
import org.jboss.reflect.plugins.javassist.JavassistTypeInfoFactory;
-import org.jboss.reflect.spi.PackageInfo;
import org.jboss.reflect.spi.TypeInfoFactory;
/**
@@ -45,11 +44,6 @@
return suite(JavassistEnumUnitTestCase.class);
}
- protected void assertPackageAnnotations(Package pkg, PackageInfo packageInfo) throws Throwable
- {
- // TODO JBREFLECT-113 this is broken for javassist
- }
-
protected TypeInfoFactory getTypeInfoFactory()
{
return new JavassistTypeInfoFactory();
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistGenericClassUnitTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistGenericClassUnitTestCase.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistGenericClassUnitTestCase.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -24,7 +24,6 @@
import junit.framework.Test;
import org.jboss.reflect.plugins.javassist.JavassistTypeInfoFactory;
-import org.jboss.reflect.spi.PackageInfo;
import org.jboss.reflect.spi.TypeInfoFactory;
/**
@@ -49,9 +48,4 @@
{
return new JavassistTypeInfoFactory();
}
-
- protected void assertPackageAnnotations(Package pkg, PackageInfo packageInfo) throws Throwable
- {
- // TODO JBREFLECT-113 this is broken for javassist
- }
}
\ No newline at end of file
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistGenericInterfaceUnitTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistGenericInterfaceUnitTestCase.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistGenericInterfaceUnitTestCase.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -24,7 +24,6 @@
import junit.framework.Test;
import org.jboss.reflect.plugins.javassist.JavassistTypeInfoFactory;
-import org.jboss.reflect.spi.PackageInfo;
import org.jboss.reflect.spi.TypeInfoFactory;
/**
@@ -49,9 +48,4 @@
{
return new JavassistTypeInfoFactory();
}
-
- protected void assertPackageAnnotations(Package pkg, PackageInfo packageInfo) throws Throwable
- {
- // TODO JBREFLECT-113 this is broken for javassist
- }
}
\ No newline at end of file
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistInterfaceUnitTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistInterfaceUnitTestCase.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/JavassistInterfaceUnitTestCase.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -24,7 +24,6 @@
import junit.framework.Test;
import org.jboss.reflect.plugins.javassist.JavassistTypeInfoFactory;
-import org.jboss.reflect.spi.PackageInfo;
import org.jboss.reflect.spi.TypeInfoFactory;
/**
@@ -44,11 +43,6 @@
{
return suite(JavassistInterfaceUnitTestCase.class);
}
-
- protected void assertPackageAnnotations(Package pkg, PackageInfo packageInfo) throws Throwable
- {
- // TODO JBREFLECT-113 this is broken for javassist
- }
protected TypeInfoFactory getTypeInfoFactory()
{
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/bytecode/test/AbstractJavassistMethodAndFieldFactoryTest.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/bytecode/test/AbstractJavassistMethodAndFieldFactoryTest.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/bytecode/test/AbstractJavassistMethodAndFieldFactoryTest.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -22,7 +22,6 @@
package org.jboss.test.plugins.javassist.bytecode.test;
import org.jboss.reflect.plugins.javassist.JavassistField;
-import org.jboss.reflect.plugins.javassist.JavassistMethod;
/**
* Abstract base class for testing JavassistMethod and JavassistField
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/test/JavassistHelperTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/test/JavassistHelperTestCase.java 2010-04-07 09:46:57 UTC (rev 103623)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/test/JavassistHelperTestCase.java 2010-04-07 09:49:35 UTC (rev 103624)
@@ -23,7 +23,6 @@
import java.io.Serializable;
import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
import java.util.Collection;
import javassist.ClassPool;
More information about the jboss-cvs-commits
mailing list