You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/10/24 14:06:05 UTC

svn commit: r1401640 - /openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java

Author: rmannibucau
Date: Wed Oct 24 12:06:04 2012
New Revision: 1401640

URL: http://svn.apache.org/viewvc?rev=1401640&view=rev
Log:
better default module name for arquillian openejb embedded

Modified:
    openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java

Modified: openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java?rev=1401640&r1=1401639&r2=1401640&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java Wed Oct 24 12:06:04 2012
@@ -148,6 +148,15 @@ public class OpenEJBArchiveProcessor {
             ejbJar = new EjbJar();
         }
 
+        if (ejbJar.getModuleName() == null) {
+            final String name = archive.getName();
+            if (name.endsWith("ar") && name.length() > 4) {
+                ejbJar.setModuleName(name.substring(0, name.length() - ".jar".length()));
+            } else {
+                ejbJar.setModuleName(name);
+            }
+        }
+
         final EjbModule ejbModule = new EjbModule(ejbJar);
         ejbModule.setFinder(new AnnotationFinder(finderArchive));
         appModule.getEjbModules().add(ejbModule);