Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 37670 invoked from network); 1 Mar 2011 03:34:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Mar 2011 03:34:39 -0000 Received: (qmail 612 invoked by uid 500); 1 Mar 2011 03:34:38 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 572 invoked by uid 500); 1 Mar 2011 03:34:36 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 565 invoked by uid 99); 1 Mar 2011 03:34:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 03:34:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 03:34:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8045B23888EC; Tue, 1 Mar 2011 03:34:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075636 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java Date: Tue, 01 Mar 2011 03:34:12 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110301033412.8045B23888EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); }