Author: ningjiang Date: Tue Jun 25 06:47:28 2013 New Revision: 1496360 URL: http://svn.apache.org/r1496360 Log: 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.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java cxf/branches/2.6.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jun 25 06:47:28 2013 @@ -0,0 +1,2 @@ +/cxf/branches/2.7.x-fixes:1496358 +/cxf/trunk:1496357 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java?rev=1496360&r1=1496359&r2=1496360&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java Tue Jun 25 06:47:28 2013 @@ -361,6 +361,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.6.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory?rev=1496360&r1=1496359&r2=1496360&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory Tue Jun 25 06:47:28 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
