Author: cschneider
Date: Fri Jan 20 09:40:31 2012
New Revision: 1233834
URL: http://svn.apache.org/viewvc?rev=1233834&view=rev
Log:
CXF-4032 Making http conduit and destination independent of ws policy
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
cxf/trunk/rt/transports/http/pom.xml
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java?rev=1233834&r1=1233833&r2=1233834&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
Fri Jan 20 09:40:31 2012
@@ -115,7 +115,7 @@ public class CXFExtensionBundleListener
if (clazz == null) {
try {
clazz = bundle.loadClass(className);
- } catch (ClassNotFoundException e) {
+ } catch (Throwable e) {
//ignore, fall to super
}
}
@@ -125,7 +125,7 @@ public class CXFExtensionBundleListener
public Class<?> loadInterface(ClassLoader cl) {
try {
return bundle.loadClass(interfaceName);
- } catch (ClassNotFoundException e) {
+ } catch (Throwable e) {
//ignore, fall to super
}
return super.loadInterface(cl);
Modified: cxf/trunk/rt/transports/http/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1233834&r1=1233833&r2=1233834&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Fri Jan 20 09:40:31 2012
@@ -64,6 +64,7 @@
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
