Return-Path: X-Original-To: apmail-openejb-commits-archive@www.apache.org Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5596965D for ; Thu, 2 Feb 2012 10:10:13 +0000 (UTC) Received: (qmail 53969 invoked by uid 500); 2 Feb 2012 10:10:12 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 53688 invoked by uid 500); 2 Feb 2012 10:10:08 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 53678 invoked by uid 99); 2 Feb 2012 10:10:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 10:10:06 +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; Thu, 02 Feb 2012 10:10:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C4B6F238889B for ; Thu, 2 Feb 2012 10:09:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239514 - /openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Date: Thu, 02 Feb 2012 10:09:43 -0000 To: commits@openejb.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120202100943.C4B6F238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Thu Feb 2 10:09:43 2012 New Revision: 1239514 URL: http://svn.apache.org/viewvc?rev=1239514&view=rev Log: shouldn't be client module checked after ejbmodule? Modified: openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Modified: openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1239514&r1=1239513&r2=1239514&view=diff ============================================================================== --- openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original) +++ openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Thu Feb 2 10:09:43 2012 @@ -1461,10 +1461,6 @@ public class DeploymentLoader implements return AppModule.class; } - if (descriptors.containsKey("application-client.xml")) { - return ClientModule.class; - } - if (descriptors.containsKey("ra.xml") || path.endsWith(".rar")) { return ConnectorModule.class; } @@ -1481,6 +1477,10 @@ public class DeploymentLoader implements return EjbModule.class; } + if (descriptors.containsKey("application-client.xml")) { + return ClientModule.class; + } + final URL manifestUrl = descriptors.get("MANIFEST.MF"); if (scanPotentialClientModules && manifestUrl != null) { // In this case scanPotentialClientModules really means "require application-client.xml"