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

[rm...@apache.org]

Author: rmannibucau
Date: Thu Mar 15 19:50:36 2012
New Revision: 1301169

URL: http://svn.apache.org/viewvc?rev=1301169&view=rev
Log:
adding openejb.modulename.useHash property to be able to avoid conflict between multiple deployement of the same webapp

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.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=1301169&r1=1301168&r2=1301169&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 Thu Mar 15 19:50:36 2012
@@ -17,6 +17,7 @@
 package org.apache.openejb.config;
 
 import org.apache.openejb.jee.NamedModule;
+import org.apache.openejb.loader.SystemInstance;
 
 import java.io.File;
 import java.net.URI;
@@ -29,6 +30,8 @@ import java.util.Set;
  * @version $Rev$ $Date$
  */
 public interface DeploymentModule {
+    static String OPENEJB_MODULENAME_USE_HASH = "openejb.modulename.useHash";
+
     String getModuleId();
     
     URI getModuleUri();
@@ -79,6 +82,7 @@ public interface DeploymentModule {
             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();
             if (location != null) return moduleName(location);
             if (name != null) return name;
             return "@" + module.getClass().getSimpleName() + module.hashCode();