geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1081761 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Date Tue, 15 Mar 2011 13:06:31 GMT
Author: genspring
Date: Tue Mar 15 13:06:31 2011
New Revision: 1081761

URL: http://svn.apache.org/viewvc?rev=1081761&view=rev
Log:
When the war itself is a EJBModule. the targetPath will be a meaningless "." here. We should
use the packageName as the base os module name and moduleUri.

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1081761&r1=1081760&r2=1081761&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Tue Mar 15 13:06:31 2011
@@ -414,7 +414,7 @@ public class EjbModuleBuilder implements
             name = parentModule.getName();
         } else if (ejbJar.getModuleName() != null) {
             name = ejbJar.getModuleName().trim();
-        } else if (standAlone) {
+        } else if (standAlone || ".".equals(targetPath)) {
             name = FileUtils.removeExtension(packageName, ".jar");
         } else {
             name = FileUtils.removeExtension(targetPath, ".jar");
@@ -422,7 +422,7 @@ public class EjbModuleBuilder implements
 
         ejbModule.setModuleId(name);
         
-        if (standAlone) {
+        if (standAlone || ".".equals(targetPath)) {
             ejbModule.setModuleUri(URI.create(packageName));
         } else {
             ejbModule.setModuleUri(URI.create(targetPath));



Mime
View raw message