Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 62668 invoked from network); 2 Mar 2011 15:28:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Mar 2011 15:28:46 -0000 Received: (qmail 64426 invoked by uid 500); 2 Mar 2011 15:28:45 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64311 invoked by uid 500); 2 Mar 2011 15:28:43 -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 64302 invoked by uid 99); 2 Mar 2011 15:28:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 15:28:42 +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, 02 Mar 2011 15:28:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 900D623889DA; Wed, 2 Mar 2011 15:28:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076253 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java Date: Wed, 02 Mar 2011 15:28:19 -0000 To: commits@cxf.apache.org From: asoldano@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110302152819.900D623889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asoldano Date: Wed Mar 2 15:28:18 2011 New Revision: 1076253 URL: http://svn.apache.org/viewvc?rev=1076253&view=rev Log: Merged revisions 1076246 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1076246 | asoldano | 2011-03-02 16:16:12 +0100 (Wed, 02 Mar 2011) | 2 lines [CXF-3373] Adding testcase and fixing WSDLManagerImpl to load extensions from the classloader that loaded it (WSDLManagerImpl is created using the classloader configured in the ExtensionManager, so that's indeed the TCCL by default) ........ Added: cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java - copied unchanged from r1076246, cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 2 15:28:18 2011 @@ -1 +1 @@ -/cxf/trunk:1076052,1076141-1076156,1076196 +/cxf/trunk:1076052,1076141-1076156,1076196,1076246 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1076253&r1=1076252&r2=1076253&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Wed Mar 2 15:28:18 2011 @@ -253,8 +253,7 @@ public class WSDLManagerImpl implements Properties initialExtensions = null; try { initialExtensions = PropertiesLoaderUtils.loadAllProperties(resource, - Thread.currentThread() - .getContextClassLoader()); + this.getClass().getClassLoader()); } catch (IOException ex) { throw new BusException(ex); }