svn commit: r1127774 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

[genspring]

Author: genspring
Date: Thu May 26 03:41:39 2011
New Revision: 1127774

URL: http://svn.apache.org/viewvc?rev=1127774&view=rev
Log:
default Object should be allowed for "type" in @resource because the type might 
be infered from field type or type defined in DD.

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1127774&r1=1127773&r2=1127774&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 Thu May 26 03:41:39 2011
@@ -2724,10 +2724,7 @@ public class AnnotationDeployer implemen
                     fail(consumer.getJndiConsumerName(), 
"resourceAnnotation.onClassWithNoName");
                     shouldReturn = true;
                 }
-                if (resource.type().equals(Object.class)) {
-                    fail(consumer.getJndiConsumerName(), 
"resourceAnnotation.onClassWithNoType");
-                    shouldReturn = true;
-                }
+
                 if (shouldReturn) return;
             }
 
@@ -2759,7 +2756,7 @@ public class AnnotationDeployer implemen
                 }
 
                 Class type;
-                if (resource.type() != java.lang.Object.class) {
+                if (member == null) {
                     type = resource.type();
                 } else {
                     type = member.getType();