You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2013/06/25 08:31:37 UTC
svn commit: r1496358 - in /cxf/branches/2.7.x-fixes: ./
api/src/main/java/org/apache/cxf/BusFactory.java
rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
Author: ningjiang
Date: Tue Jun 25 06:31:37 2013
New Revision: 1496358
URL: http://svn.apache.org/r1496358
Log:
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.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java
cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1496357
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java?rev=1496358&r1=1496357&r2=1496358&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java Tue Jun 25 06:31:37 2013
@@ -388,6 +388,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.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory?rev=1496358&r1=1496357&r2=1496358&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory (original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory Tue Jun 25 06:31: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