cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1138932 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java
Date Thu, 23 Jun 2011 15:30:07 GMT
Author: ningjiang
Date: Thu Jun 23 15:30:06 2011
New Revision: 1138932

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

........
  r1138913 | ningjiang | 2011-06-23 23:02:13 +0800 (Thu, 23 Jun 2011) | 1 line
  
  CXF-3615 set the classloader when creating the BlueprintBus
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 23 15:30:06 2011
@@ -1 +1 @@
-/cxf/trunk:1137793,1137960,1138220,1138644
+/cxf/trunk:1137793,1137960,1138220,1138644,1138913

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 23 15:30:06 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1138220,1138644
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1138220,1138644,1138913

Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java?rev=1138932&r1=1138931&r2=1138932&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java
Thu Jun 23 15:30:06 2011
@@ -36,6 +36,8 @@ public class BlueprintBus extends Extens
     BlueprintContainer container;
     
     public BlueprintBus() {
+        // Using the BlueprintBus Classloader to load the extensions
+        super(null, null, BlueprintBus.class.getClassLoader());
     }
     
     public void setBundleContext(BundleContext c) {

Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java?rev=1138932&r1=1138931&r2=1138932&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java
Thu Jun 23 15:30:06 2011
@@ -27,10 +27,12 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Logger;
 
 import org.apache.cxf.bus.extension.Extension;
 import org.apache.cxf.bus.extension.ExtensionFragmentParser;
 import org.apache.cxf.bus.extension.ExtensionRegistry;
+import org.apache.cxf.common.logging.LogUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -41,6 +43,7 @@ import org.osgi.framework.SynchronousBun
  * 
  */
 public class OSGiExtensionLocator implements BundleActivator, SynchronousBundleListener {
+    private static final Logger LOG = LogUtils.getL7dLogger(OSGiExtensionLocator.class);
     private ConcurrentMap<Long, List<Extension>> extensions 
         = new ConcurrentHashMap<Long, List<Extension>>();
     private long id;
@@ -92,7 +95,7 @@ public class OSGiExtensionLocator implem
                 List<Extension> orig = new ExtensionFragmentParser()
                     .getExtensionsFromText(ins);
                 ins.close();
-
+                LOG.info("Loading the extension from bundle " + bundle.getBundleId());
                 if (orig != null && !orig.isEmpty()) {
                     if (list == null) {
                         list = new CopyOnWriteArrayList<Extension>();
@@ -109,6 +112,7 @@ public class OSGiExtensionLocator implem
     protected void unregister(final long bundleId) {
         List<Extension> list = extensions.remove(bundleId);
         if (list != null) {
+            LOG.info("Removed the extensions for bundle " + bundleId);
             ExtensionRegistry.removeExtensions(list);
         }
     }
@@ -136,6 +140,7 @@ public class OSGiExtensionLocator implem
             }
             return super.loadInterface(cl);
         }
+       
     }
 
 }



Mime
View raw message