Return-Path: X-Original-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Delivered-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EF22798C6 for ; Wed, 12 Nov 2014 14:16:19 +0000 (UTC) Received: (qmail 3797 invoked by uid 500); 12 Nov 2014 14:16:19 -0000 Delivered-To: apmail-geronimo-xbean-scm-archive@geronimo.apache.org Received: (qmail 3760 invoked by uid 500); 12 Nov 2014 14:16:19 -0000 Mailing-List: contact xbean-scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: xbean-scm@geronimo.apache.org Delivered-To: mailing list xbean-scm@geronimo.apache.org Received: (qmail 3751 invoked by uid 99); 12 Nov 2014 14:16:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Nov 2014 14:16:19 +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; Wed, 12 Nov 2014 14:16:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9C0AF238899C; Wed, 12 Nov 2014 14:14:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1638797 - /geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassLoaders.java Date: Wed, 12 Nov 2014 14:14:57 -0000 To: xbean-scm@geronimo.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141112141457.9C0AF238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Wed Nov 12 14:14:57 2014 New Revision: 1638797 URL: http://svn.apache.org/r1638797 Log: XBEAN-275 try to keep nice performances but read MANIFEST.MD Class-Path as well Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassLoaders.java Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassLoaders.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassLoaders.java?rev=1638797&r1=1638796&r2=1638797&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassLoaders.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassLoaders.java Wed Nov 12 14:14:57 2014 @@ -55,6 +55,12 @@ public final class ClassLoaders { urls.add(url); } } + + // java -jar xxx.jar and use MANIFEST.MF Class-Path? + // here perf is not an issue since we would either miss all the classpath or we have a single jar + if (urls.size() == 1) { + urls.addAll(findUrlFromResources(classLoader)); + } } else { for (final URL url : findUrlFromResources(classLoader)) { urls.add(url);