[jbossws-commits] JBossWS SVN: r13916 - thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension.
Author: alessio.soldano(a)jboss.com
Date: 2011-03-23 06:29:00 -0400 (Wed, 23 Mar 2011)
New Revision: 13916
Modified:
thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Log:
Porting fix for CXF-3373
Modified:
thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
===================================================================
---
thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java 2011-03-22
23:11:28 UTC (rev 13915)
+++
thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java 2011-03-23
10:29:00 UTC (rev 13916)
@@ -58,7 +58,8 @@
private static final String BUS_ID_PROPERTY_NAME =
"org.apache.cxf.bus.id";
private final ExtensionManagerImpl extensionManager;
- public ExtensionManagerBus(Map<Class, Object> e, Map<String, Object>
properties) {
+ public ExtensionManagerBus(Map<Class, Object> e, Map<String, Object>
properties,
+ ClassLoader extensionClassLoader) {
super(e);
if (null == properties) {
@@ -93,7 +94,7 @@
extensions.put(ResourceManager.class, resourceManager);
extensionManager = new ExtensionManagerImpl(new String[0],
-
Thread.currentThread().getContextClassLoader(),
+ extensionClassLoader,
extensions,
resourceManager,
this);
@@ -133,9 +134,13 @@
this.setExtension(extensionManager, ExtensionManager.class);
}
+
+ public ExtensionManagerBus(Map<Class, Object> e, Map<String, Object>
properties) {
+ this(e, properties, Thread.currentThread().getContextClassLoader());
+ }
public ExtensionManagerBus() {
- this(null, null);
+ this(null, null, Thread.currentThread().getContextClassLoader());
}
protected synchronized ConfiguredBeanLocator createConfiguredBeanLocator() {
ConfiguredBeanLocator loc =
(ConfiguredBeanLocator)extensions.get(ConfiguredBeanLocator.class);
Modified:
thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
===================================================================
---
thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java 2011-03-22
23:11:28 UTC (rev 13915)
+++
thirdparty/cxf/branches/cxf-2.3.3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java 2011-03-23
10:29:00 UTC (rev 13916)
@@ -135,7 +135,7 @@
}
final void load(String resource) throws IOException {
- Enumeration<URL> urls =
Thread.currentThread().getContextClassLoader().getResources(resource);
+ Enumeration<URL> urls = loader.getResources(resource);
while (urls.hasMoreElements()) {
URL url = urls.nextElement();