Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DDFB46700 for ; Thu, 9 Jun 2011 07:46:18 +0000 (UTC) Received: (qmail 4707 invoked by uid 500); 9 Jun 2011 07:46:18 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 4667 invoked by uid 500); 9 Jun 2011 07:46:18 -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 4660 invoked by uid 99); 9 Jun 2011 07:46:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jun 2011 07:46:18 +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, 09 Jun 2011 07:46:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7D68123889B2; Thu, 9 Jun 2011 07:45:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1133698 - /geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Date: Thu, 09 Jun 2011 07:45:57 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110609074557.7D68123889B2@eris.apache.org> Author: genspring Date: Thu Jun 9 07:45:57 2011 New Revision: 1133698 URL: http://svn.apache.org/viewvc?rev=1133698&view=rev Log: the module sequence should be the same order in DD if is set to true in application.xml. Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=1133698&r1=1133697&r2=1133698&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Thu Jun 9 07:45:57 2011 @@ -592,9 +592,15 @@ public class EARConfigBuilder implements // Copy over all files that are _NOT_ modules (e.g. META-INF and APP-INF files) LinkedHashSet moduleLocations = applicationInfo.getModuleLocations(); + boolean initModulesInDDOrder = false; if (ConfigurationModuleType.EAR == applicationType && earFile != null) { //get the value of the library-directory element in spec DD Application specDD = (Application) applicationInfo.getSpecDD(); + + if(specDD!=null){ + initModulesInDDOrder = specDD.getInitializeInOrder(); + } + String libDir = getLibraryDirectory(specDD); Collection libClasspath = applicationInfo.getClassPath(); for (Enumeration e = earFile.entries(); e.hasMoreElements();) { @@ -638,7 +644,9 @@ public class EARConfigBuilder implements List> modules = new ArrayList>(); modules.addAll(applicationInfo.getModules()); - Collections.sort(modules, new Module.ModulePriorityComparator()); + if (!initModulesInDDOrder){ + Collections.sort(modules, new Module.ModulePriorityComparator()); + } for (Module module : modules) { getBuilder(module).installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repositories);