Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 28743 invoked from network); 6 May 2006 05:25:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 May 2006 05:25:37 -0000 Received: (qmail 34820 invoked by uid 500); 6 May 2006 05:25:37 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 34791 invoked by uid 500); 6 May 2006 05:25: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 34780 invoked by uid 99); 6 May 2006 05:25:36 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 May 2006 22:25:36 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 05 May 2006 22:25:36 -0700 Received: (qmail 28679 invoked by uid 65534); 6 May 2006 05:25:15 -0000 Message-ID: <20060506052515.28678.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r400241 - /geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java Date: Sat, 06 May 2006 05:25:15 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: kevan Date: Fri May 5 22:25:13 2006 New Revision: 400241 URL: http://svn.apache.org/viewcvs?rev=400241&view=rev Log: Default to use the new JarFileClassLoader. To use the old MultiParentClassLoader, must specify the property -DXorg.apache.geronimo.OldClassLoader=true Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java?rev=400241&r1=400240&r2=400241&view=diff ============================================================================== --- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java (original) +++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java Fri May 5 22:25:13 2006 @@ -353,15 +353,15 @@ log.debug("ClassPath for " + id + " resolved to " + Arrays.asList(urls)); - if (Boolean.getBoolean("Xorg.apache.geronimo.NewClassLoader")) { - return new JarFileClassLoader(environment.getConfigId(), + if (Boolean.getBoolean("Xorg.apache.geronimo.OldClassLoader")) { + return new MultiParentClassLoader(environment.getConfigId(), urls, parentClassLoaders, environment.isInverseClassLoading(), hiddenClasses, nonOverridableClasses); } else { - return new MultiParentClassLoader(environment.getConfigId(), + return new JarFileClassLoader(environment.getConfigId(), urls, parentClassLoaders, environment.isInverseClassLoading(),