svn commit: r1497653 - in /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina: OpenEJBContextConfig.java TomcatResourceFactory.java

[rmannibucau]

Author: rmannibucau
Date: Fri Jun 28 06:28:20 2013
New Revision: 1497653

URL: http://svn.apache.org/r1497653
Log:
TOMEE-986 resources.xml uses a subtree for resources so respect it

Modified:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1497653&r1=1497652&r2=1497653&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 Fri Jun 28 06:28:20 2013
@@ -290,6 +290,8 @@ public class OpenEJBContextConfig extend
                             break;
                         } else if (jndiName.endsWith("/" + id) && 
mostMatchingId == null) {
                             mostMatchingId = id;
+                        } else if (id.endsWith("/" + jndiName) && 
mostMatchingId == null) {
+                            mostMatchingId = "openejb/Resource/" + id;
                         }
                     }
 

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java?rev=1497653&r1=1497652&r2=1497653&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java
 Fri Jun 28 06:28:20 2013
@@ -76,7 +76,7 @@ public class TomcatResourceFactory {
             } else if (reference != null && 
DataSource.class.equals(reference.getClassName())) {
 
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             LOGGER.error("Can't create resource " + jndiName, e);
         } finally {
             Thread.currentThread().setContextClassLoader(loader);