You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/03/07 07:38:37 UTC

svn commit: r634559 - in /openejb/trunk/openejb3/container/openejb-core/src/main: java/org/apache/openejb/config/JndiEncInfoBuilder.java resources/org/apache/openejb/config/Messages.properties

Author: dblevins
Date: Thu Mar  6 22:38:37 2008
New Revision: 634559

URL: http://svn.apache.org/viewvc?rev=634559&view=rev
Log:
Better i18n messages for when refs aren't immediately resolved

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=634559&r1=634558&r2=634559&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Thu Mar  6 22:38:37 2008
@@ -174,7 +174,11 @@
             info.ejbDeploymentId = deploymentId;
 
             if (info.ejbDeploymentId == null) {
-                logger.warning("config.noBeanFoundEjbLink", ref.getName(), ejbName, ref.getEjbLink());
+                if (info.link != null){
+                    logger.warning("config.noBeanFoundEjbLink", ref.getName(), ejbName, ref.getEjbLink());
+                } else {
+                    logger.warning("config.noBeanFound", ref.getName(), ejbName, ref.getEjbLink());
+                }
                 if (ref.getRefType() == EjbReference.Type.LOCAL) {
                     jndi.ejbLocalReferences.add(toLocal(info));
                 } else {

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties?rev=634559&r1=634558&r2=634559&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties Thu Mar  6 22:38:37 2008
@@ -93,10 +93,10 @@
 
 
 #fatal("config.noBeanFoundEjbLink", ejb.getEjbRefName(), referringComponent, ejb.getEjbLink());
-config.noBeanFoundEjbLink=Cannot find bean \"{0}\" referenced by bean \"{1}\" with ejb-link \"{2}\".
+config.noBeanFoundEjbLink=Unresolved ejb reference \"{0}\" with ejb-link \"{2}\" in bean \"{1}\".  Will attempt resolution again at runtime.
 
 #fatal("config.noBeanFound", ejb.getEjbRefName(), referringComponent);
-config.noBeanFound=Cannot find bean \"{0}\" referenced by bean \"{1}\".
+config.noBeanFound=Unresolved ejb reference \"{0}\" in bean \"{1}\".  Will attempt resolution again at runtime.
 
 # info("configureService.configuring", service.getId(), provider.getService(), provider.getId());
 configureService.configuring=Configuring Service(id={0}, type={1}, provider-id={2})