You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/06/20 15:25:28 UTC
[1/2] git commit: CAMEL-7524 Fixed the issue of CxfProducer created
from wsdl detected as provider
Repository: camel
Updated Branches:
refs/heads/master f6acb63b0 -> 7616b4356
CAMEL-7524 Fixed the issue of CxfProducer created from wsdl detected as provider
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7616b435
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7616b435
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7616b435
Branch: refs/heads/master
Commit: 7616b4356e7fd6aef7576665eef46622e2f133d9
Parents: 60f50ce
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 20 21:09:48 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 20 21:10:06 2014 +0800
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 3 ++-
.../org/apache/camel/component/cxf/WSDLServiceFactoryBean.java | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7616b435/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 24e76e8..91dc76c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -379,7 +379,8 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
for (Method m : cf.getClass().getMethods()) {
if ("setServiceFactory".equals(m.getName())) {
try {
- ReflectionUtil.setAccessible(m).invoke(cf, new WSDLServiceFactoryBean());
+ // Set Object class as the service class of WSDLServiceFactoryBean
+ ReflectionUtil.setAccessible(m).invoke(cf, new WSDLServiceFactoryBean(Object.class));
} catch (Exception e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7616b435/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java
index f7a9ef2..4b5d1b2 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java
@@ -48,6 +48,11 @@ public class WSDLServiceFactoryBean extends JaxWsServiceFactoryBean {
public WSDLServiceFactoryBean() {
setServiceClass(Provider.class);
}
+
+ public WSDLServiceFactoryBean(Class<?> serviceClass) {
+ setServiceClass(serviceClass);
+ }
+
public void setServiceClass(Class<?> serviceClass) {
if (serviceClass != null) {
super.setServiceClass(serviceClass);
[2/2] git commit: CxfEndpoint and CxfSpringEndpoint should use
javax.xml.ws.Provider as the service class
Posted by ni...@apache.org.
CxfEndpoint and CxfSpringEndpoint should use javax.xml.ws.Provider as the service class
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/60f50ce8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60f50ce8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60f50ce8
Branch: refs/heads/master
Commit: 60f50ce8fda1f820ba308e42748e2702f27d3ec6
Parents: f6acb63
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 20 17:05:32 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 20 21:10:06 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 2 +-
.../java/org/apache/camel/component/cxf/CxfSpringEndpoint.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/60f50ce8/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 4f2687a..24e76e8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.cxf;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.security.Provider;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -35,6 +34,7 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stax.StAXSource;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.handler.Handler;
http://git-wip-us.apache.org/repos/asf/camel/blob/60f50ce8/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
index dc4e662..cc67660 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
@@ -16,9 +16,8 @@
*/
package org.apache.camel.component.cxf;
-import java.security.Provider;
-
import javax.xml.namespace.QName;
+import javax.xml.ws.Provider;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.util.ObjectHelper;