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 165DE462C for ; Mon, 23 May 2011 12:21:49 +0000 (UTC) Received: (qmail 25638 invoked by uid 500); 23 May 2011 12:21:49 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 25589 invoked by uid 500); 23 May 2011 12:21:49 -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 25582 invoked by uid 99); 23 May 2011 12:21:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2011 12:21:49 +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; Mon, 23 May 2011 12:21:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8B5A423888FE; Mon, 23 May 2011 12:21:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1126467 - /geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/osgi/GeronimoBundleClassFinder.java Date: Mon, 23 May 2011 12:21:28 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110523122128.8B5A423888FE@eris.apache.org> Author: xuhaihong Date: Mon May 23 12:21:28 2011 New Revision: 1126467 URL: http://svn.apache.org/viewvc?rev=1126467&view=rev Log: Use the getBundle to get the associated bundle instance of the taget classloader Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/osgi/GeronimoBundleClassFinder.java Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/osgi/GeronimoBundleClassFinder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/osgi/GeronimoBundleClassFinder.java?rev=1126467&r1=1126466&r2=1126467&view=diff ============================================================================== --- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/osgi/GeronimoBundleClassFinder.java (original) +++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/osgi/GeronimoBundleClassFinder.java Mon May 23 12:21:28 2011 @@ -18,12 +18,11 @@ package org.apache.geronimo.axis2.osgi; import java.util.ArrayList; -import java.util.List; import java.util.Set; import org.apache.axis2.jaxws.message.databinding.ClassFinder; import org.apache.xbean.osgi.bundle.util.BundleClassFinder; -import org.apache.xbean.osgi.bundle.util.BundleClassLoader; +import org.apache.xbean.osgi.bundle.util.BundleUtils; import org.apache.xbean.osgi.bundle.util.ClassDiscoveryFilter; import org.apache.xbean.osgi.bundle.util.DiscoveryRange; import org.osgi.framework.Bundle; @@ -41,11 +40,11 @@ public class GeronimoBundleClassFinder i } @Override - public ArrayList getClassesFromJarFile(final String packageName, ClassLoader cl) throws ClassNotFoundException { - if (!(cl instanceof BundleClassLoader)) { - return new ArrayList(0); + public ArrayList getClassesFromJarFile(final String packageName, ClassLoader cl) throws ClassNotFoundException { + Bundle bundle = BundleUtils.getBundle(cl, true); + if(bundle == null) { + return new ArrayList(); } - Bundle bundle = ((BundleClassLoader) cl).getBundle(true); //TODO Do we need to limit the scanning scope in the target application ? As we share one bundle for all the sub modules except for car BundleClassFinder bundleClassFinder = new BundleClassFinder(packageAdmin, bundle, new ClassDiscoveryFilter() {