Author: ningjiang
Date: Tue Jun 25 06:22:06 2013
New Revision: 1496357
URL: http://svn.apache.org/r1496357
Log:
CXF-5088 Made the service file of cxf-core.jar Web Application Server friendly
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
cxf/trunk/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java?rev=1496357&r1=1496356&r2=1496357&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java Tue Jun 25
06:22:06 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/trunk/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory?rev=1496357&r1=1496356&r2=1496357&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
(original)
+++
cxf/trunk/rt/core/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
Tue Jun 25 06:22:06 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
