Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 75176 invoked from network); 8 Aug 2010 05:45:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Aug 2010 05:45:33 -0000 Received: (qmail 96501 invoked by uid 500); 8 Aug 2010 05:45:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 96375 invoked by uid 500); 8 Aug 2010 05:45:30 -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 96368 invoked by uid 99); 8 Aug 2010 05:45:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Aug 2010 05:45:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 08 Aug 2010 05:45:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 815F323889B6; Sun, 8 Aug 2010 05:44:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r983347 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Date: Sun, 08 Aug 2010 05:44:08 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100808054408.815F323889B6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Sun Aug 8 05:44:08 2010 New Revision: 983347 URL: http://svn.apache.org/viewvc?rev=983347&view=rev Log: use new flag to search for annotated ejbs before web.xml 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=983347&r1=983346&r2=983347&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 Sun Aug 8 05:44:08 2010 @@ -295,7 +295,7 @@ public class EjbModuleBuilder implements if (targetPath.endsWith("/")) throw new IllegalArgumentException("targetPath must not end with a '/'"); // Load the module file - DeploymentLoader loader = new DeploymentLoader(ddDir); + DeploymentLoader loader = new DeploymentLoader(ddDir, true); AppModule appModule; try { appModule = loader.load(new File(moduleFile.getName()));