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);
}
