cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1503403 - in /cxf/branches/2.5.x-fixes: api/src/main/java/org/apache/cxf/BusFactory.java rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
Date Mon, 15 Jul 2013 18:49:38 GMT
Author: dkulp
Date: Mon Jul 15 18:49:37 2013
New Revision: 1503403

URL: http://svn.apache.org/r1503403
Log:
Merged revisions 1496360 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1496360 | ningjiang | 2013-06-25 02:47:28 -0400 (Tue, 25 Jun 2013) | 16 lines

  Merged revisions 1496358 via svnmerge from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ................
    r1496358 | ningjiang | 2013-06-25 14:31:37 +0800 (Tue, 25 Jun 2013) | 9 lines

    Merged revisions 1496357 via svnmerge from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1496357 | ningjiang | 2013-06-25 14:22:06 +0800 (Tue, 25 Jun 2013) | 1 line

      CXF-5088 Made the service file of cxf-core.jar Web Application Server friendly
    ........
  ................

........

Modified:
    cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java
    cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory

Modified: cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java?rev=1503403&r1=1503402&r2=1503403&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java (original)
+++ cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java Mon Jul 15 18:49:37
2013
@@ -332,6 +332,9 @@ public abstract class BusFactory {
                 try {
                     Class<?> cls =  ClassLoaderUtils.loadClass(busFactoryClass, BusFactory.class)
                         .asSubclass(BusFactory.class);
+                    if (busFactoryCondition.startsWith("#")) {
+                        busFactoryCondition = busFactoryCondition.substring(1);
+                    }
                     int idx = busFactoryCondition.indexOf(',');
                     while (idx != -1) {
                         cls.getClassLoader().loadClass(busFactoryCondition.substring(0, idx));

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory?rev=1503403&r1=1503402&r2=1503403&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
(original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
Mon Jul 15 18:49:37 2013
@@ -1,2 +1,2 @@
 org.apache.cxf.bus.spring.SpringBusFactory
-org.springframework.context.ApplicationContext,org.springframework.beans.BeansException,org.springframework.beans.factory.xml.NamespaceHandlerResolver
+#org.springframework.context.ApplicationContext,org.springframework.beans.BeansException,org.springframework.beans.factory.xml.NamespaceHandlerResolver



Mime
View raw message