geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1079750 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Date Wed, 09 Mar 2011 11:13:22 GMT
Author: genspring
Date: Wed Mar  9 11:13:22 2011
New Revision: 1079750

URL: http://svn.apache.org/viewvc?rev=1079750&view=rev
Log:
changes after the openejb code update in OPENEJB-1439 The link resolving code shouldn't be
using the moduleId, rather the path of the archive itself.

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=1079750&r1=1079749&r2=1079750&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
Wed Mar  9 11:13:22 2011
@@ -404,18 +404,30 @@ public class EjbModuleBuilder implements
         // Create XMLBeans version of EjbJarType for the AnnotatedApp interface
         EjbJar ejbJar = ejbModule.getEjbJar();
 
+
+        File file = new File(moduleFile.getName());
+        String packageName = file.getName();
+        
         String name;
+        
         if (subModule) {
             name = parentModule.getName();
         } else if (ejbJar.getModuleName() != null) {
             name = ejbJar.getModuleName().trim();
         } else if (standAlone) {
-            name = FileUtils.removeExtension(new File(moduleFile.getName()).getName(), ".jar");
+            name = FileUtils.removeExtension(packageName, ".jar");
         } else {
             name = FileUtils.removeExtension(targetPath, ".jar");
         }
 
         ejbModule.setModuleId(name);
+        
+        if (standAlone) {
+            ejbModule.setModulePackageName(packageName);
+        } else {
+            ejbModule.setModulePackageName(targetPath);
+        }
+
 
         Map<JndiKey, Map<String, Object>> context = null;
         if (subModule) {



Mime
View raw message