svn commit: r1307808 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/proxy/ main/java/org/apache/webbeans/util/ test/java/org/apache/webbeans/test/unittests/annotation/

[struberg]

Author: struberg
Date: Sat Mar 31 14:13:51 2012
New Revision: 1307808

URL: http://svn.apache.org/viewvc?rev=1307808&view=rev
Log:
OWB-662 remove XML config WebBeansAnnotation

Removed:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/annotation/AnnotationTest.java
Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java?rev=1307808&r1=1307807&r2=1307808&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
 Sat Mar 31 14:13:51 2012
@@ -19,7 +19,6 @@
 package org.apache.webbeans.proxy;
 
 import java.io.Serializable;
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
@@ -38,7 +37,6 @@ import javax.enterprise.inject.spi.Decor
 import javassist.util.proxy.ProxyFactory;
 import javassist.util.proxy.ProxyFactory.ClassLoaderProvider;
 import javassist.util.proxy.ProxyObject;
-import org.apache.webbeans.annotation.WebBeansAnnotation;
 import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.component.OwbBean;
 import org.apache.webbeans.component.ResourceBean;
@@ -489,27 +487,6 @@ public final class JavassistProxyFactory
         
     }
     
-    public static WebBeansAnnotation createNewAnnotationProxy(Class<? extends 
Annotation> annotationType)
-    {
-        WebBeansAnnotation result = null;
-
-        try
-        {
-            ProxyFactory pf = new ProxyFactory();
-            pf.setInterfaces(new Class<?>[] { annotationType, Annotation.class 
});
-            pf.setSuperclass(WebBeansAnnotation.class);
-
-            result = (WebBeansAnnotation) pf.create(new Class[] { Class.class 
}, new Object[] { annotationType });
-            ((ProxyObject)result).setHandler(new 
WebBeansAnnotation(annotationType));
-        }
-        catch (Exception e)
-        {
-            WebBeansUtil.throwRuntimeExceptions(e);
-        }
-
-        return result;
-    }
-    
     /**
      * @param o the object to check
      * @return <code>true</code> if the given object is a proxy

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=1307808&r1=1307807&r2=1307808&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
 Sat Mar 31 14:13:51 2012
@@ -385,7 +385,7 @@ public final class AnnotationUtil
 
         // check if the annotationTypes are equal
         if (qualifier1AnnotationType == null
-                || 
!qualifier1AnnotationType.equals(qualifier2.annotationType()))
+            || !qualifier1AnnotationType.equals(qualifier2.annotationType()))
         {
             return false;
         }