svn commit: r1386746 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config: DeploymentModule.java EjbJarInfoBuilder.java

[rm...@apache.org]

Author: rmannibucau
Date: Mon Sep 17 17:44:20 2012
New Revision: 1386746

URL: http://svn.apache.org/viewvc?rev=1386746&view=rev
Log:
TOMEE-419 handling of module-name for jndi names

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java?rev=1386746&r1=1386745&r2=1386746&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java Mon Sep 17 17:44:20 2012
@@ -79,10 +79,10 @@ public interface DeploymentModule {
         }
 
         private String name(NamedModule vendor, NamedModule spec, URI uri, File location, String name, DeploymentModule module) {
+            if (spec != null && spec.getModuleName() != null) return spec.getModuleName().trim(); // used to override defaults so do it first
             if (name != null && !name.startsWith("@")) return name;
             if (vendor != null && vendor.getModuleName() != null) return vendor.getModuleName().trim();
             if (vendor != null && vendor.getId() != null) return vendor.getId().trim();
-            if (spec != null && spec.getModuleName() != null) return spec.getModuleName().trim();
             if (spec != null && spec.getId() != null) return spec.getId().trim();
             if (uri != null) return stripExtension(uri.getPath());
             if (location != null && SystemInstance.get().getOptions().get(OPENEJB_MODULENAME_USE_HASH, false)) return moduleName(location) + module.hashCode();

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=1386746&r1=1386745&r2=1386746&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java Mon Sep 17 17:44:20 2012
@@ -141,9 +141,13 @@ public class EjbJarInfoBuilder {
 
         EjbJarInfo ejbJar = new EjbJarInfo();
         ejbJar.path = jar.getJarLocation();
-        ejbJar.moduleName = jar.getModuleId();
         ejbJar.moduleUri = jar.getModuleUri();
         ejbJar.moduleId = jar.getModuleId();
+        if (jar.getEjbJar() != null && jar.getEjbJar().getModuleName() != null) {
+            ejbJar.moduleName = jar.getEjbJar().getModuleName();
+        } else {
+            ejbJar.moduleName = jar.getModuleId();
+        }
 
         ejbJar.watchedResources.addAll(jar.getWatchedResources());