You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/03/01 04:34:12 UTC

svn commit: r1075636 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java

Author: genspring
Date: Tue Mar  1 03:34:12 2011
New Revision: 1075636

URL: http://svn.apache.org/viewvc?rev=1075636&view=rev
Log:
Now WAR is also a EJBModule according to the latest changes in openejb deploymetLoader.

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java?rev=1075636&r1=1075635&r2=1075636&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java Tue Mar  1 03:34:12 2011
@@ -227,6 +227,12 @@ public class EjbModuleImpl implements EJ
         if (!keyPropertyList.containsKey("J2EEApplication")) {
             throw new InvalidObjectNameException("EJBModule object name must contain a J2EEApplication property", objectName);
         }
+        
+        // EJB in WAR, The war itself is one big EjbModule
+        if (keyPropertyList.size() == 5 && keyPropertyList.containsKey("WebModule")) {
+            return;
+        }
+        
         if (keyPropertyList.size() != 4) {
             throw new InvalidObjectNameException("EJBModule object name can only have j2eeType, name, J2EEApplication, and J2EEServer properties", objectName);
         }