svn commit: r1416931 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config: AnnotationDeployer.java AutoConfig.java

[rmannibucau]

Author: rmannibucau
Date: Tue Dec  4 13:43:19 2012
New Revision: 1416931

URL: http://svn.apache.org/viewvc?rev=1416931&view=rev
Log:
TOMEE-627 when a @Resource can't be resolved the message sometimes speak about 
another bean

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

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1416931&r1=1416930&r2=1416931&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 Tue Dec  4 13:43:19 2012
@@ -4051,6 +4051,8 @@ public class AnnotationDeployer implemen
                         consumer.getResourceRef().add(resourceRef);
                     }
 
+                    resourceRef.setOrigin(member.getDeclaringClass() + "#" + 
member.getName());
+
                     if (resourceRef.getResAuth() == null) {
                         if (resource.authenticationType() == 
Resource.AuthenticationType.APPLICATION) {
                             resourceRef.setResAuth(ResAuth.APPLICATION);

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1416931&r1=1416930&r2=1416931&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 Tue Dec  4 13:43:19 2012
@@ -1086,7 +1086,11 @@ public class AutoConfig implements Dynam
                 if (id.startsWith("java:")) {
                     id = id.substring("java:".length());
                 }
-                id = getResourceId(ejbDeployment.getDeploymentId(), id, 
refType, appResources);
+                try {
+                    id = getResourceId(ejbDeployment.getDeploymentId(), id, 
refType, appResources);
+                } catch (OpenEJBException e) { // changing the message to be 
explicit
+                    throw new OpenEJBException("Can't find resource for " + 
ref.getOrigin() + ". (" + e.getMessage() + ")", e.getCause());
+                }
                 logger.info("Auto-linking resource-ref '" + refName + "' in 
bean " + ejbDeployment.getDeploymentId() + " to Resource(id=" + id + ")");
 
                 link = new ResourceLink();