Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4511F10791 for ; Fri, 7 Jun 2013 04:55:48 +0000 (UTC) Received: (qmail 24416 invoked by uid 500); 7 Jun 2013 04:55:46 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 24376 invoked by uid 500); 7 Jun 2013 04:55:45 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 24358 invoked by uid 99); 7 Jun 2013 04:55:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 04:55:45 +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; Fri, 07 Jun 2013 04:55:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A428723889BB; Fri, 7 Jun 2013 04:55:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1490513 - in /cxf/branches/2.5.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Date: Fri, 07 Jun 2013 04:55:22 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130607045522.A428723889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Fri Jun 7 04:55:22 2013 New Revision: 1490513 URL: http://svn.apache.org/r1490513 Log: Merged revisions 1490510 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ................ r1490510 | ffang | 2013-06-07 12:49:52 +0800 (五, 07 6 2013) | 16 lines Merged revisions 1490509 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1490509 | ffang | 2013-06-07 12:45:13 +0800 (五, 07 6 2013) | 9 lines Merged revisions 1490506 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1490506 | ffang | 2013-06-07 12:35:19 +0800 (五, 07 6 2013) | 1 line [CXF-5059]add TCCL as fallback so it can load resources from other bundles in OSGi container ........ ................ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jun 7 04:55:22 2013 @@ -0,0 +1,3 @@ +/cxf/branches/2.6.x-fixes:1490510 +/cxf/branches/2.7.x-fixes:1490509 +/cxf/trunk:1490506 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1490513&r1=1490512&r2=1490513&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Fri Jun 7 04:55:22 2013 @@ -264,6 +264,11 @@ public class WSDLManagerImpl implements try { initialExtensions = PropertiesLoaderUtils.loadAllProperties(resource, this.getClass().getClassLoader()); + //use TCCL as fallback so that can load resources from other bundles in OSGi + if (initialExtensions == null || initialExtensions.size() == 0) { + initialExtensions = PropertiesLoaderUtils.loadAllProperties(resource, + Thread.currentThread().getContextClassLoader()); + } } catch (IOException ex) { throw new BusException(ex); }