Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 82714 invoked from network); 16 Oct 2007 16:41:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Oct 2007 16:41:40 -0000 Received: (qmail 24890 invoked by uid 500); 16 Oct 2007 16:41:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 24653 invoked by uid 500); 16 Oct 2007 16:41:27 -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 24637 invoked by uid 99); 16 Oct 2007 16:41:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Oct 2007 09:41:27 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Oct 2007 16:41:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A31551A9832; Tue, 16 Oct 2007 09:40:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r585193 - /geronimo/server/trunk/modules/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/AbstractDeployable.java Date: Tue, 16 Oct 2007 16:40:41 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071016164042.A31551A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Tue Oct 16 09:40:34 2007 New Revision: 585193 URL: http://svn.apache.org/viewvc?rev=585193&view=rev Log: look for resources in the current classloader first and parent second. should fix the last failing console test where wrong ra.xml was loaded Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/AbstractDeployable.java Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/AbstractDeployable.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/AbstractDeployable.java?rev=585193&r1=585192&r2=585193&view=diff ============================================================================== --- geronimo/server/trunk/modules/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/AbstractDeployable.java (original) +++ geronimo/server/trunk/modules/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/AbstractDeployable.java Tue Oct 16 09:40:34 2007 @@ -37,6 +37,7 @@ import javax.enterprise.deploy.shared.ModuleType; import org.apache.geronimo.deployment.tools.DDBeanRootImpl; +import org.apache.geronimo.kernel.config.MultiParentClassLoader; /** * @@ -53,7 +54,9 @@ protected AbstractDeployable(ModuleType type, URL moduleURL, String rootDD) throws DDBeanCreateException { this.type = type; this.moduleURL = moduleURL; - rootCL = new URLClassLoader(new URL[] {moduleURL}, Thread.currentThread().getContextClassLoader()); + /* Setup classloader with inverse class loading so that resources are first checked in the + * current classloader instead of the parent classloader. */ + rootCL = new MultiParentClassLoader(null, new URL[] {moduleURL}, Thread.currentThread().getContextClassLoader(), true, new String [] {}, new String [] {}); root = new DDBeanRootImpl(this, rootCL.getResource(rootDD)); // @todo make this work with unpacked