You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2018/06/28 14:12:13 UTC
[camel] branch camel-2.21.x updated (f659a84 -> 9bb0bc7)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from f659a84 CAMEL-12601: DefaultFactoryRegistry.unregister throws ConcurrentModificationException
new 10a2925 CAMEL-12599: Upgrade to CXF 3.2.5
new 9bb0bc7 CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of copy/paste from CXF
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/cxf/CxfEndpoint.java | 81 ++--------------------
parent/pom.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 56 +++++++--------
3 files changed, 36 insertions(+), 103 deletions(-)
[camel] 02/02: CAMEL-12599 - refactor how CAMEL-12326 was handled
to avoid a bunch of copy/paste from CXF
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9bb0bc7f58f4f8b34e37d382295c0d035dbfbdc1
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Jun 27 18:50:32 2018 +0200
CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of copy/paste from CXF
---
.../apache/camel/component/cxf/CxfEndpoint.java | 81 ++--------------------
1 file changed, 7 insertions(+), 74 deletions(-)
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 5a80cb1..c6d34f1 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
@@ -1176,85 +1176,18 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
CamelCxfClientImpl(Bus bus, Endpoint ep) {
super(bus, ep);
}
-
- public Bus getBus() {
- return bus;
- }
-
+
@Override
protected Object[] processResult(Message message, org.apache.cxf.message.Exchange exchange,
BindingOperationInfo oi, Map<String, Object> resContext)
throws Exception {
- Exception ex = null;
- // Check to see if there is a Fault from the outgoing chain if it's an out Message
- if (!message.get(Message.INBOUND_MESSAGE).equals(Boolean.TRUE)) {
- ex = message.getContent(Exception.class);
- }
- boolean mepCompleteCalled = false;
- if (ex != null) {
- completeExchange(exchange);
- mepCompleteCalled = true;
- if (message.getContent(Exception.class) != null) {
- throw ex;
- }
- }
- ex = message.getExchange().get(Exception.class);
- if (ex != null) {
- if (!mepCompleteCalled) {
- completeExchange(exchange);
- }
- throw ex;
- }
-
- Integer responseCode = (Integer)exchange.get(Message.RESPONSE_CODE);
- if (null != responseCode && 202 == responseCode) {
- Endpoint ep = exchange.getEndpoint();
- if (null != ep && null != ep.getEndpointInfo() && null == ep.getEndpointInfo()
- .getProperty("org.apache.cxf.ws.addressing.MAPAggregator.decoupledDestination")) {
- return null;
- }
- }
-
- // Wait for a response if we need to
- if (oi != null && !oi.getOperationInfo().isOneWay()) {
- waitResponse(exchange);
- }
-
- // leave the input stream open for the caller
- Boolean keepConduitAlive = (Boolean)exchange.get(Client.KEEP_CONDUIT_ALIVE);
- if (keepConduitAlive == null || !keepConduitAlive) {
- completeExchange(exchange);
- }
-
- // Grab the response objects if there are any
- List<Object> resList = null;
- Message inMsg = exchange.getInMessage();
- if (inMsg != null) {
- if (null != resContext) {
- resContext.putAll(inMsg);
- // remove the recursive reference if present
- resContext.remove(Message.INVOCATION_CONTEXT);
- responseContext.put(Thread.currentThread(), resContext);
- }
- resList = CastUtils.cast(inMsg.getContent(List.class));
- }
-
- // check for an incoming fault
- ex = getException(exchange);
-
- if (ex != null) {
- throw ex;
- }
-
- if (resList != null) {
- return resList.toArray();
+ try {
+ return super.processResult(message, exchange, oi, resContext);
+ } catch (IllegalEmptyResponseException ex) {
+ //Camel does not strickly enforce returning a value when a value is required from the WSDL/contract
+ //Thus, we'll capture the exception raised and return a null
+ return null;
}
-
- return null;
- }
-
- private void completeExchange(org.apache.cxf.message.Exchange exchange) {
- getConduitSelector().complete(exchange);
}
@SuppressWarnings("unchecked")
[camel] 01/02: CAMEL-12599: Upgrade to CXF 3.2.5
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 10a2925ce34ffd0a5f1eb4b7d80804d6ec01ccb5
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jun 26 22:00:52 2018 +0200
CAMEL-12599: Upgrade to CXF 3.2.5
---
parent/pom.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 56 +++++++++++-----------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4b698f5..ed2d020 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -174,7 +174,7 @@
<couchbase-client-version>1.4.13</couchbase-client-version>
<couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
<curator-version>2.12.0</curator-version>
- <cxf-version>3.2.2</cxf-version>
+ <cxf-version>3.2.5</cxf-version>
<cxf-version-range>[3.1,4.0)</cxf-version-range>
<cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index ff7230f..2db49de 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3052,142 +3052,142 @@
<dependency>
<groupId>org.apache.cxf.services.sts</groupId>
<artifactId>cxf-services-sts-core</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.ws-discovery</groupId>
<artifactId>cxf-services-ws-discovery-api</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-clustering</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-mex</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security-oauth2</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>3.2.2</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>