cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject svn commit: r1076056 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Date Tue, 01 Mar 2011 23:50:41 GMT
Author: asoldano
Date: Tue Mar  1 23:50:41 2011
New Revision: 1076056

URL: http://svn.apache.org/viewvc?rev=1076056&view=rev
Log:
Merged revisions 1076052 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1076052 | asoldano | 2011-03-02 00:43:57 +0100 (Wed, 02 Mar 2011) | 2 lines
  
  [CXF-3373] Allow for providing a specific classloader for bus extensions lookup
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1076052

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/bus/extension/ExtensionManagerBus.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java?rev=1076056&r1=1076055&r2=1076056&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
Tue Mar  1 23:50:41 2011
@@ -58,7 +58,8 @@ public class ExtensionManagerBus extends
     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 @@ public class ExtensionManagerBus extends
         extensions.put(ResourceManager.class, resourceManager);
 
         extensionManager = new ExtensionManagerImpl(new String[0],
-                                                    Thread.currentThread().getContextClassLoader(),
+                                                    extensionClassLoader,
                                                     extensions,
                                                     resourceManager, 
                                                     this);
@@ -133,9 +134,13 @@ public class ExtensionManagerBus extends
         
         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: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1076056&r1=1076055&r2=1076056&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Tue Mar  1 23:50:41 2011
@@ -135,7 +135,7 @@ public class ExtensionManagerImpl implem
     }
     
     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();
             



Mime
View raw message