[Jboss-cvs] JBossAS SVN: r57050 - projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist

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

Author: kabir.khan at jboss.com
Date: 2006-09-21 08:03:34 -0400 (Thu, 21 Sep 2006)
New Revision: 57050

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java
   projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java
   projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java
   projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
Log:
[JBAOP-286] Weaken dependencies on unreleased MC 2.0

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java	2006-09-21 12:03:20 UTC (rev 57049)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java	2006-09-21 12:03:34 UTC (rev 57050)
@@ -19,7 +19,7 @@
   * 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.annotation.factory.javassist;
+package org.jboss.aop.annotation.factory.duplicate.javassist;
 
 import java.lang.reflect.InvocationHandler;
 import java.util.Map;
@@ -31,7 +31,7 @@
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
  * @version $Revision$
  */
-public class AnnotationProxy extends org.jboss.annotation.factory.AnnotationProxy implements InvocationHandler
+public class AnnotationProxy extends org.jboss.aop.annotation.factory.duplicate.AnnotationProxy implements InvocationHandler
 {
    public AnnotationProxy(Class annotationType, Map valueMap)
    {

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java	2006-09-21 12:03:20 UTC (rev 57049)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java	2006-09-21 12:03:34 UTC (rev 57050)
@@ -19,7 +19,7 @@
 * 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.annotation.factory.javassist;
+package org.jboss.aop.annotation.factory.duplicate.javassist;
 
 import java.lang.reflect.Method;
 import java.security.AccessController;
@@ -27,8 +27,8 @@
 import java.util.ArrayList;
 import java.util.Map;
 
-import org.jboss.annotation.factory.AnnotationValidationException;
-import org.jboss.annotation.factory.AnnotationValidator;
+import org.jboss.aop.annotation.factory.duplicate.AnnotationValidationException;
+import org.jboss.aop.annotation.factory.duplicate.AnnotationValidator;
 
 import javassist.ClassPool;
 import javassist.CtClass;

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java	2006-09-21 12:03:20 UTC (rev 57049)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java	2006-09-21 12:03:34 UTC (rev 57050)
@@ -19,13 +19,11 @@
 * 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.annotation.factory.javassist;
+package org.jboss.aop.annotation.factory.duplicate.javassist;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 
-import org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactoryImpl;
-
 import javassist.bytecode.annotation.Annotation;
 import javassist.bytecode.annotation.AnnotationMemberValue;
 import javassist.bytecode.annotation.ArrayMemberValue;
@@ -52,7 +50,6 @@
 {
    Object value;
    Method method;
-   static IntrospectionTypeInfoFactoryImpl typeFactory = new IntrospectionTypeInfoFactoryImpl();
 
    public MemberValueGetter(Method method)
    {

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	2006-09-21 12:03:20 UTC (rev 57049)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java	2006-09-21 12:03:34 UTC (rev 57050)
@@ -19,7 +19,7 @@
   * 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.annotation.factory.javassist;
+package org.jboss.aop.annotation.factory.duplicate.javassist;
 
 import javassist.bytecode.annotation.AnnotationMemberValue;
 import javassist.bytecode.annotation.ArrayMemberValue;