[camel] branch CAMEL-13755 updated: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13755 in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/CAMEL-13755 by this push: new 5fa62dc CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS 5fa62dc is described below commit 5fa62dc74646775f960b32957f6573255d746ea0 Author: Claus Ibsen AuthorDate: Sun Jul 21 20:20:26 2019 +0200 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS --- .../apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java index 8a84359..85e8b69 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java @@ -16,14 +16,14 @@ */ package org.apache.camel.component.cxf; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Text; import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; +import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.spring.SpringCamelContext; import org.apache.camel.test.junit4.CamelTestSupport;
[camel] 08/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a1cce3314540307104b70011afd392805441afe7
Author: Claus Ibsen
AuthorDate: Sun Jul 21 13:02:57 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
.../component/openstack/cinder/VolumeProducerTest.java | 16
.../component/openstack/keystone/DomainProducerTest.java | 7 ---
.../component/openstack/keystone/GroupProducerTest.java | 7 ---
.../openstack/keystone/ProjectProducerTest.java | 7 ---
.../component/openstack/keystone/RegionProducerTest.java | 7 ---
.../component/openstack/keystone/UserProducerTest.java | 7 ---
.../component/openstack/neutron/NetworkProducerTest.java | 7 ---
.../component/openstack/neutron/PortProducerTest.java| 7 ---
.../component/openstack/neutron/RouterProducerTest.java | 7 ---
.../component/openstack/neutron/SubnetProducerTest.java | 7 ---
.../component/openstack/nova/FlavorProducerTest.java | 3 ---
.../component/openstack/nova/ServerProducerTest.java | 7 ---
.../component/openstack/swift/ContainerProducerTest.java | 13 -
.../component/openstack/swift/ObjectProducerTest.java| 14 --
.../component/sjms/tx/TransactedQueueProducerTest.java | 10 --
.../component/sjms/tx/TransactedTopicProducerTest.java | 10 --
.../modules/ROOT/pages/activemq-component.adoc | 9 +++--
docs/components/modules/ROOT/pages/amqp-component.adoc | 9 +++--
docs/components/modules/ROOT/pages/jms-component.adoc| 10 +++---
docs/components/modules/ROOT/pages/spring-boot.adoc | 3 +--
20 files changed, 26 insertions(+), 141 deletions(-)
diff --git
a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
index adff34a..69bfbb2 100644
---
a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
+++
b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
@@ -114,22 +114,6 @@ public class VolumeProducerTest extends
CinderProducerTestSupport {
}
@Test
-public void updateVolumeFailTest() throws Exception {
-final String faultMessage = "fault";
-when(volumeService.update(anyString(), anyString(),
anyString())).thenReturn(ActionResponse.actionFailed(faultMessage, 401));
-
-msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
-final String id = "id";
-msg.setHeader(OpenstackConstants.ID, id);
-msg.setBody(createTestVolume());
-
-producer.process(exchange);
-
-assertTrue(msg.getExchange().isFailed());
-
assertTrue(msg.getExchange().getException().getMessage().contains(faultMessage));
-}
-
-@Test
public void getVolumeTest() throws Exception {
when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET);
msg.setHeader(OpenstackConstants.ID, "anyID");
diff --git
a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
index 2e3b871..fa02d1e 100644
---
a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
+++
b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
@@ -152,13 +152,6 @@ public class DomainProducerTest extends
KeystoneProducerTestSupport {
verify(domainService).delete(domainIdCaptor.capture());
assertEquals(networkID, domainIdCaptor.getValue());
-
-//in case of failure
-final String failureMessage = "fail";
-
when(domainService.delete(anyString())).thenReturn(ActionResponse.actionFailed(failureMessage,
404));
-producer.process(exchange);
-assertTrue(msg.getExchange().isFailed());
-
assertTrue(msg.getExchange().getException().getMessage().contains(failureMessage));
}
private void assertEqualsDomain(Domain old, Domain newDomain) {
diff --git
a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
index f8d4ca1..605c206 100644
---
a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
+++
[camel] 05/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 793a04b477bbffc9eda7a09e3cd216df818626d2
Author: Claus Ibsen
AuthorDate: Sat Jul 20 14:18:16 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
.../camel/blueprint/CamelContextFactoryBean.java | 10 ---
.../camel/cdi/xml/CamelContextFactoryBean.java | 11 ---
.../spring/boot/CamelConfigurationProperties.java | 7 --
.../camel/spring/CamelContextFactoryBean.java | 13
.../camel/spring/CamelContextFactoryBeanTest.java | 2 -
.../camel/impl/engine/DefaultRouteContext.java | 1 -
.../interceptor/HandleFaultInterceptor.java| 81 --
.../camel/main/DefaultConfigurationProperties.java | 24 ---
.../camel-main-configuration-metadata.json | 6 --
.../apt/CoreEipAnnotationProcessorHelper.java | 5 --
.../apache/camel/main/parser/MyConfiguration.java | 14
11 files changed, 174 deletions(-)
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index c4afd2f..5c80272 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -102,8 +102,6 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean routePolicyList = new ArrayList<>();
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
deleted file mode 100644
index 11bef3e..000
---
a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.processor.interceptor;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.CamelException;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.camel.support.processor.DelegateAsyncProcessor;
-
-public class HandleFaultInterceptor extends DelegateAsyncProcessor {
-
-public HandleFaultInterceptor() {
-}
-
-public HandleFaultInterceptor(Processor processor) {
-super(processor);
-}
-
-@Override
-public String toString() {
-return "HandleFaultInterceptor[" + processor + "]";
-}
-
-@Override
-public boolean process(final Exchange exchange, final AsyncCallback
callback) {
-return processor.process(exchange, new AsyncCallback() {
-public void done(boolean doneSync) {
-try {
-// handle fault after we are done
-handleFault(exchange);
-} finally {
-// and let the original callback know we are done as well
-callback.done(doneSync);
-}
-}
-});
-}
-
-/**
- * Handles the fault message by converting it to an Exception
- */
-protected void handleFault(Exchange exchange) {
-// Take the fault message out before we keep on going
-Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
-if (msg.isFault()) {
-final Object faultBody = msg.getBody();
-if (faultBody != null && exchange.getException() == null) {
-// remove fault as we are converting it to an exception
-if (exchange.hasOut()) {
-exchange.setOut(null);
-} else {
-exchange.setIn(null);
-}
-if (faultBody instanceof Throwable) {
-exchange.setException((Throwable) faultBody);
-} else {
[camel] 03/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e76b1672f7e1d4d8ad963832ab81cb1d2c0f24a4
Author: Claus Ibsen
AuthorDate: Sat Jul 20 12:05:00 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
.../component/cxf/CxfCustomizedExceptionTest.java | 8 ++-
.../cxf/CxfSpringCustomizedExceptionTest.java | 12 +++-
.../cxf/CxfCustomizedExceptionContext.xml | 34 ++--
.../SplitterAndExceptionRouteTwistIssueTest.java | 2 -
.../jms/issues/BruceHandlingBeanExceptionTest.java | 10 +---
.../mina2/Mina2TransferExchangeOptionTest.java | 9 +--
.../mina2/Mina2VMTransferExchangeOptionTest.java | 9 +--
.../netty4/NettyTransferExchangeOptionTest.java| 9 +--
.../spring/processor/SpringSetFaultBodyTest.java | 46
.../spring/processor/SpringSetFaultBodyTest.xml| 37 -
.../apache/camel/model/SetFaultBodyDefinition.java | 64 --
.../org/apache/camel/reifier/ProcessorReifier.java | 1 -
.../modules/ROOT/pages/language-component.adoc | 2 +-
13 files changed, 45 insertions(+), 198 deletions(-)
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
index 3ffbb8f..8bb9a66 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
@@ -110,7 +110,13 @@ public class CxfCustomizedExceptionTest extends
CamelTestSupport {
.to(serviceURI);
// END SNIPPET: onException
// START SNIPPET: ThrowFault
-from(routerEndpointURI).setFaultBody(constant(SOAP_FAULT));
+from(routerEndpointURI).process(new Processor() {
+@Override
+public void process(Exchange exchange) throws Exception {
+exchange.getMessage().setFault(true);
+exchange.getMessage().setBody(SOAP_FAULT);
+}
+});
// END SNIPPET: ThrowFault
}
};
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
index 81a7099..b00300a 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.cxf;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -94,10 +96,14 @@ public class CxfSpringCustomizedExceptionTest extends
CamelTestSupport {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/CxfCustomizedExceptionContext.xml");
}
-public static class SOAPFaultFactory {
-public SoapFault getSoapFault() {
-return SOAP_FAULT;
+public static class SOAPFaultProcessor implements Processor {
+
+@Override
+public void process(Exchange exchange) throws Exception {
+exchange.getMessage().setFault(true);
+exchange.getMessage().setBody(SOAP_FAULT);
}
}
+
}
diff --git
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/CxfCustomizedExceptionContext.xml
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/CxfCustomizedExceptionContext.xml
index 9397439..6886963 100644
---
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/CxfCustomizedExceptionContext.xml
+++
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/CxfCustomizedExceptionContext.xml
@@ -25,21 +25,23 @@
">
- http://camel.apache.org/schema/spring;>
- http://localhost:${CXFTestSupport.port1}/CxfSpringCustomizedExceptionTest/router?serviceClass=org.apache.camel.component.cxf.HelloService"/>
- http://localhost:${CXFTestSupport.port1}/CxfSpringCustomizedExceptionTest/router?serviceClass=org.apache.camel.component.cxf.HelloService"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+http://camel.apache.org/schema/spring;>
+
[camel] 02/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 374fe43ea9a27745273339610a8c0bdb0a468ce1
Author: Claus Ibsen
AuthorDate: Fri Jul 19 10:12:03 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
.../org/apache/camel/reifier/ProcessorReifier.java | 1 -
.../apache/camel/reifier/SetFaultBodyReifier.java | 41 -
.../camel/builder/FluentProducerTemplateTest.java | 15
.../camel/impl/DefaultProducerTemplateTest.java| 12 ---
.../org/apache/camel/processor/PipelineTest.java | 19 -
.../RedeliverWithExceptionAndFaultTest.java| 98 --
...deliveryWithExceptionAndFaultDelayInHeader.java | 97 -
.../UnitOfWorkSynchronizationAdapterTest.java | 6 +-
.../org/apache/camel/processor/UnitOfWorkTest.java | 19 +
.../camel/processor/enricher/EnricherTest.java | 34 +---
.../camel/processor/enricher/FailureProcessor.java | 18 +---
11 files changed, 5 insertions(+), 355 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
b/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index c8685ec..c84b4c3 100644
---
a/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++
b/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -161,7 +161,6 @@ public abstract class ProcessorReifier> {
map.put(ServiceCallDefinition.class, ServiceCallReifier::new);
map.put(SetBodyDefinition.class, SetBodyReifier::new);
map.put(SetExchangePatternDefinition.class,
SetExchangePatternReifier::new);
-map.put(SetFaultBodyDefinition.class, SetFaultBodyReifier::new);
map.put(SetHeaderDefinition.class, SetHeaderReifier::new);
map.put(SetPropertyDefinition.class, SetPropertyReifier::new);
map.put(SortDefinition.class, SortReifier::new);
diff --git
a/core/camel-core/src/main/java/org/apache/camel/reifier/SetFaultBodyReifier.java
b/core/camel-core/src/main/java/org/apache/camel/reifier/SetFaultBodyReifier.java
deleted file mode 100644
index c948c7e..000
---
a/core/camel-core/src/main/java/org/apache/camel/reifier/SetFaultBodyReifier.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.reifier;
-
-import org.apache.camel.Expression;
-import org.apache.camel.Processor;
-import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.model.SetFaultBodyDefinition;
-import org.apache.camel.spi.RouteContext;
-
-@Deprecated
-public class SetFaultBodyReifier extends
ExpressionReifier {
-
-SetFaultBodyReifier(ProcessorDefinition definition) {
-super((SetFaultBodyDefinition) definition);
-}
-
-@Override
-public Processor createProcessor(RouteContext routeContext) throws
Exception {
-final Expression expr =
definition.getExpression().createExpression(routeContext);
-return exchange -> {
-Object body = expr.evaluate(exchange, Object.class);
-exchange.getMessage().setFault(true);
-exchange.getMessage().setBody(body);
-};
-}
-}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
index 2cb75ad..c35b5fd 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
@@ -153,21 +153,6 @@ public class FluentProducerTemplateTest extends
ContextTestSupport {
}
@Test
-public void testFault() throws Exception {
-MockEndpoint mock = getMockEndpoint("mock:result");
-mock.expectedMessageCount(0);
-
-Object result = DefaultFluentProducerTemplate.on(context)
-.withBody("Hello World")
-
[camel] 09/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 573c4a51ba9205ed62afa399c3da1c49b6c25143
Author: Claus Ibsen
AuthorDate: Sun Jul 21 18:48:43 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
.../java/org/apache/camel/component/cxf/CxfConsumer.java | 15 +++
.../camel/main/parser/MyConfigurationParserTest.java | 2 +-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index cad4692..34cb15a 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -325,14 +325,21 @@ public class CxfConsumer extends DefaultConsumer
implements Suspendable {
}
private void checkFailure(org.apache.camel.Exchange camelExchange,
Exchange cxfExchange) throws Fault {
-final Throwable t;
-if (camelExchange.isFailed()) {
-t = camelExchange.getException();
+Throwable t = camelExchange.getException();
+if (t == null) {
+// SOAP faults can be stored as exceptions as message body (to
be backwards compatible)
+Object body = camelExchange.getMessage().getBody();
+if (body instanceof Throwable) {
+t = (Throwable) body;
+}
+}
+
+if (t != null) {
cxfExchange.getInMessage().put(FaultMode.class,
FaultMode.UNCHECKED_APPLICATION_FAULT);
if (t instanceof Fault) {
cxfExchange.getInMessage().put(FaultMode.class,
FaultMode.CHECKED_APPLICATION_FAULT);
throw (Fault)t;
-} else if (t != null) {
+} else {
// This is not a CXF Fault. Build the CXF Fault manually.
Fault fault = new Fault(t);
if (fault.getMessage() == null) {
diff --git
a/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
b/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
index 7bbed12..7c5833e 100644
---
a/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
+++
b/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
@@ -30,7 +30,7 @@ public class MyConfigurationParserTest extends TestCase {
MainConfigurationParser parser = new MainConfigurationParser();
List list =
parser.parseConfigurationSource(fileName);
assertNotNull(list);
-assertEquals(41, list.size());
+assertEquals(40, list.size());
assertEquals("name", list.get(0).getName());
assertEquals("java.lang.String", list.get(0).getJavaType());
[camel] 04/11: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13755 in repository https://gitbox.apache.org/repos/asf/camel.git commit f12d96110cb342a8e09173b46e9280e8a62cdb67 Author: Claus Ibsen AuthorDate: Sat Jul 20 14:05:05 2019 +0200 Regen --- examples/README.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/README.adoc b/examples/README.adoc index 15a2bfe..c5ea763 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -11,7 +11,7 @@ View the individual example READMEs for details. ### Examples // examples: START -Number of Examples: 113 (0 deprecated) +Number of Examples: 114 (0 deprecated) [width="100%",cols="4,2,4",options="header"] |=== @@ -183,6 +183,8 @@ Number of Examples: 113 (0 deprecated) | link:camel-example-kafka/README.adoc[Kafka] (camel-example-kafka) | Messaging | An example for Kafka +| link:camel-example-kafka-offsetrepository/README.adoc[Kafka Offsetrepository] (camel-example-kafka-offsetrepository) | Messaging | An example for Kafka offsetrepository + | link:camel-example-main-artemis/readme.adoc[Main Artemis] (camel-example-main-artemis) | Messaging | An example for showing standalone Camel with Artemis (autowiring JMS client via classpath scanning) | link:camel-example-netty-custom-correlation/readme.adoc[Netty Custom Correlation] (camel-example-netty-custom-correlation) | Messaging | An example for showing Camel Netty with custom codec and correlation id
[camel] 01/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2a5a161d22de831379bcbf0c2217e4f2754aeb57
Author: Claus Ibsen
AuthorDate: Fri Jul 19 09:52:27 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
.../spring/processor/SpringFaultRouteTest.java | 31
.../processor/SpringHandleFaultPerRouteTest.java | 29 ---
.../apache/camel/spring/processor/faultRoute.xml | 37 -
.../camel/spring/processor/handlefaultperroute.xml | 46 ---
.../src/main/java/org/apache/camel/Exchange.java | 2 -
.../src/main/java/org/apache/camel/Message.java| 2 +
.../org/apache/camel/RuntimeConfiguration.java | 14
.../camel/impl/engine/AbstractCamelContext.java| 25 --
.../camel/impl/engine/DefaultRouteContext.java | 13
.../apache/camel/processor/FinallyProcessor.java | 26 +--
.../camel/processor/OnCompletionProcessor.java | 12 ---
.../camel/processor/interceptor/HandleFault.java | 59 --
.../core/xml/AbstractCamelContextFactoryBean.java | 11 ---
.../apache/camel/model/ProcessorDefinition.java| 12 ---
.../org/apache/camel/model/RouteDefinition.java| 36 -
.../org/apache/camel/reifier/ProcessorReifier.java | 11 +--
.../org/apache/camel/reifier/RouteReifier.java | 16
.../apache/camel/reifier/SetFaultBodyReifier.java | 1 +
.../camel/builder/FluentProducerTemplateTest.java | 6 --
.../org/apache/camel/impl/DefaultExchangeTest.java | 18 -
.../camel/impl/DefaultProducerTemplateTest.java| 8 --
.../apache/camel/issues/OnCompletionIssueTest.java | 6 +-
.../processor/ExceptionHandlerStreamCacheTest.java | 20 +
.../FailOverLoadBalancerSetFaultTest.java | 2 -
.../FaultRetryRouteNewConfigurationTest.java | 43 --
.../camel/processor/FaultRetryRouteTest.java | 83
.../org/apache/camel/processor/FaultRouteTest.java | 91 --
.../camel/processor/HandleFaultPerRouteTest.java | 88 -
.../org/apache/camel/processor/PipelineTest.java | 17
.../camel/processor/TrySetFaultFinallyTest.java| 54 -
.../apache/camel/processor/TrySetFaultTest.java| 70 -
.../async/AsyncEndpointWithHandleFaultTest.java| 82 ---
.../camel/processor/enricher/FailureProcessor.java | 1 +
.../intercept/InterceptSendToFaultTest.java| 47 ---
.../camel/main/DefaultConfigurationConfigurer.java | 6 --
.../org/apache/camel/support/DefaultExchange.java | 2 -
.../camel/support/DefaultExchangeHolder.java | 14
.../org/apache/camel/support/MessageSupport.java | 1 -
38 files changed, 11 insertions(+), 1031 deletions(-)
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
deleted file mode 100644
index 8151914..000
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.spring.processor;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.processor.FaultRouteTest;
-
-import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
-
-/**
- * The spring context test for the FaultRoute
- */
-public class SpringFaultRouteTest extends FaultRouteTest {
-protected CamelContext createCamelContext() throws Exception {
-return createSpringCamelContext(this,
"org/apache/camel/spring/processor/faultRoute.xml");
-}
-}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringHandleFaultPerRouteTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringHandleFaultPerRouteTest.java
deleted file mode 100644
index
[camel] branch CAMEL-13755 created (now 161c464)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13755 in repository https://gitbox.apache.org/repos/asf/camel.git. at 161c464 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS This branch includes the following new commits: new 2a5a161d CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new 374fe43 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new e76b167 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new f12d961 Regen new 793a04b CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new 3760893 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new 91e25ea CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new a1cce331 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new 573c4a5 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new 4e170eb CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS new 161c464 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS The 11 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.
[camel] 06/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 376089324736a01a592d51a7770d0d7334f6d5b0
Author: Claus Ibsen
AuthorDate: Sat Jul 20 14:45:09 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
MIGRATION.md | 3 +
.../camel/attachment/DefaultAttachmentMessage.java | 10 --
.../camel/component/jetty/HttpReturnFaultTest.java | 58 --
.../camel/component/jetty/HttpRouteTest.java | 1 -
.../camel-jms/src/main/docs/jms-component.adoc | 6 +-
.../component/jms/EndpointMessageListener.java | 7 --
.../org/apache/camel/component/jms/JmsBinding.java | 9 +-
.../apache/camel/component/jms/JmsComponent.java | 18
.../camel/component/jms/JmsConfiguration.java | 23
.../apache/camel/component/jms/JmsConstants.java | 1 -
.../apache/camel/component/jms/JmsEndpoint.java| 10 --
.../org/apache/camel/component/jms/JmsMessage.java | 1 -
.../component/jms/reply/ReplyManagerSupport.java | 11 --
.../camel/component/jms/JmsTransferFaultTest.java | 90
.../SetFaultBodyAfterJmsRequestReplyIssueTest.java | 86 ---
.../apache/camel/component/mail/MailMessage.java | 1 -
.../camel/component/restlet/RestletFaultTest.java | 52 -
.../src/main/docs/spring-boot.adoc | 3 +-
.../src/main/java/org/apache/camel/Message.java| 16 ---
.../java/org/apache/camel/spi/Synchronization.java | 3 +-
.../camel/processor/OnCompletionProcessor.java | 1 -
.../org/apache/camel/processor/PipelineHelper.java | 14 ---
.../camel/processor/enricher/PollEnricherTest.java | 1 -
.../endpoint/dsl/JmsEndpointBuilderFactory.java| 118 -
.../org/apache/camel/support/DefaultExchange.java | 5 +-
.../org/apache/camel/support/DefaultMessage.java | 4 +-
.../org/apache/camel/support/ExchangeHelper.java | 20 +---
.../camel/support/builder/ExpressionBuilder.java | 35 --
.../jms/springboot/JmsComponentConfiguration.java | 39 ---
29 files changed, 11 insertions(+), 635 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index ea8a343..ba38cc6 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -140,6 +140,9 @@ To use this API you can get it via the `getMessage` method
on `Exchange`:
AttachmentMessage am = exchange.getMessage(AttachmentMessage.class);
am.addAttachment("myAtt", new DataHandler(...));
+### Fault API on Message
+
+The fault API has been removed from `org.apache.camel.Message` as it was only
used for SOAP-WS fault message. The `camel-cxf` and `camel-spring-ws`
components for SOAP-WS has been modified to support fault messages from their
components. The option `handleFault` has also been removed and you now need to
turn this on as endpoint or component option on `camel-cxf` or
`camel-spring-ws`.
### Mock component
diff --git
a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
index de8d625..fe87215 100644
---
a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
+++
b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
@@ -58,16 +58,6 @@ public final class DefaultAttachmentMessage implements
AttachmentMessage {
}
@Override
-public boolean isFault() {
-return delegate.isFault();
-}
-
-@Override
-public void setFault(boolean fault) {
-delegate.setFault(fault);
-}
-
-@Override
public Object getHeader(String name) {
return delegate.getHeader(name);
}
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java
deleted file mode 100644
index c59b4c0..000
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed
[camel] 07/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13755 in repository https://gitbox.apache.org/repos/asf/camel.git commit 91e25ea51113a0d659d8012a11507561c954297c Author: Claus Ibsen AuthorDate: Sun Jul 21 12:40:43 2019 +0200 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS --- .../src/main/docs/activemq-component.adoc | 9 +- .../camel-amqp/src/main/docs/amqp-component.adoc | 9 +- .../apache/camel/component/cxf/CxfConsumer.java| 7 +- .../camel/component/cxf/CxfConsumerFaultTest.java | 1 - .../cxf/CxfConsumerPayLoadFaultMessageTest.java| 1 - .../cxf/CxfConsumerPayLoadMarshalFaultTest.java| 1 - .../component/cxf/CxfCustomizedExceptionTest.java | 2 - .../cxf/CxfMessageStreamExceptionTest.java | 1 - .../cxf/CxfSpringCustomizedExceptionTest.java | 1 - .../component/cxf/jaxrs/CxfRsConsumerTest.java | 2 - .../apache/camel/non_wrapper/PersonProcessor.java | 3 - .../apache/camel/wsdl_first/PersonProcessor.java | 3 - .../camel-jms/src/main/docs/jms-component.adoc | 4 +- .../netty4/http/NettyHttpReturnFaultTest.java | 58 -- .../cinder/producer/SnapshotProducer.java | 4 +- .../openstack/cinder/producer/VolumeProducer.java | 4 +- .../common/AbstractOpenstackProducer.java | 5 +- .../openstack/common/OpenstackException.java | 26 + .../common/OpenstackOperationException.java| 43 .../component/openstack/glance/GlanceProducer.java | 2 +- .../keystone/producer/DomainProducer.java | 2 +- .../openstack/keystone/producer/GroupProducer.java | 6 +- .../keystone/producer/ProjectProducer.java | 2 +- .../keystone/producer/RegionProducer.java | 2 +- .../openstack/keystone/producer/UserProducer.java | 2 +- .../neutron/producer/NetworkProducer.java | 2 +- .../openstack/neutron/producer/PortProducer.java | 2 +- .../openstack/neutron/producer/RouterProducer.java | 2 +- .../openstack/neutron/producer/SubnetProducer.java | 2 +- .../openstack/nova/producer/FlavorsProducer.java | 2 +- .../openstack/nova/producer/KeypairProducer.java | 2 +- .../openstack/nova/producer/ServerProducer.java| 4 +- .../swift/producer/ContainerProducer.java | 13 ++- .../openstack/swift/producer/ObjectProducer.java | 7 +- .../openstack/cinder/VolumeProducerTest.java | 7 +- .../cinder/VolumeSnapshotProducerTest.java | 2 - .../openstack/keystone/DomainProducerTest.java | 5 +- .../openstack/keystone/GroupProducerTest.java | 5 +- .../openstack/keystone/ProjectProducerTest.java| 5 +- .../openstack/keystone/RegionProducerTest.java | 5 +- .../openstack/keystone/UserProducerTest.java | 5 +- .../openstack/neutron/NetworkProducerTest.java | 5 +- .../openstack/neutron/PortProducerTest.java| 5 +- .../openstack/neutron/RouterProducerTest.java | 5 +- .../openstack/neutron/SubnetProducerTest.java | 5 +- .../openstack/nova/FlavorProducerTest.java | 5 +- .../openstack/nova/ServerProducerTest.java | 5 +- .../openstack/swift/ContainerProducerTest.java | 9 +- .../openstack/swift/ObjectProducerTest.java| 8 +- .../component/restlet/DefaultRestletBinding.java | 18 ++-- .../apache/camel/component/sjms/SjmsMessage.java | 1 - .../sjms/tx/TransactedConsumerSupport.java | 2 +- .../sjms/tx/TransactedQueueProducerTest.java | 4 +- .../sjms/tx/TransactedTopicProducerTest.java | 2 +- .../integration/adapter/CamelTargetAdapter.java| 4 - core/camel-core/readme-eip.adoc| 5 +- .../endpoint/dsl/AMQPEndpointBuilderFactory.java | 118 .../dsl/ActiveMQEndpointBuilderFactory.java| 120 - .../springboot/ActiveMQComponentConfiguration.java | 19 .../springboot/AMQPComponentConfiguration.java | 19 .../camel/itest/greeter/JmsPrepareResponse.java| 4 +- 61 files changed, 149 insertions(+), 484 deletions(-) diff --git a/components/camel-activemq/src/main/docs/activemq-component.adoc b/components/camel-activemq/src/main/docs/activemq-component.adoc index 4faf25f..13784cb 100644 --- a/components/camel-activemq/src/main/docs/activemq-component.adoc +++ b/components/camel-activemq/src/main/docs/activemq-component.adoc @@ -44,7 +44,7 @@ activemq:foo === Component options // component options: START -The ActiveMQ component supports 86 options, which are listed below. +The ActiveMQ component supports 85 options, which are listed below. @@ -112,7 +112,6 @@ The ActiveMQ component supports 86 options, which are listed below. | *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should
[camel] 10/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4e170eb619ef5f5bc2e03606d529065bcc2a2692
Author: Claus Ibsen
AuthorDate: Sun Jul 21 19:35:25 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
components/camel-cxf/src/main/docs/cxf-component.adoc | 2 +-
.../src/main/java/org/apache/camel/component/milo/Messages.java| 1 -
.../src/main/java/org/apache/camel/support/DefaultMessage.java | 7 ---
docs/components/modules/ROOT/pages/cxf-component.adoc | 2 +-
.../src/main/resources/META-INF/spring-configuration-metadata.json | 7 ---
5 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc
b/components/camel-cxf/src/main/docs/cxf-component.adoc
index 38f3e9f..431bfb2 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -771,7 +771,7 @@ set the SOAP Fault message in the message body and set the
response
code in the message header.
Same for using POJO data format. You can set the SOAPFault on the out
-body and also indicate it's a fault by calling Message.setFault(true):
+body.
=== How to propagate a camel-cxf endpoint's request and response context
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/Messages.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/Messages.java
index db42455..12998ce 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/Messages.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/Messages.java
@@ -31,6 +31,5 @@ public final class Messages {
*/
public static void fillFromDataValue(final DataValue value, final
DefaultMessage result) {
result.setBody(value);
-result.setFault(value.getStatusCode().isBad());
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
index 181c750..403b214 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
@@ -48,13 +48,6 @@ public class DefaultMessage extends MessageSupport {
setCamelContext(camelContext);
}
-public boolean isFault() {
-return false;
-}
-
-public void setFault(boolean fault) {
-}
-
public Object getHeader(String name) {
if (hasHeaders()) {
return getHeaders().get(name);
diff --git a/docs/components/modules/ROOT/pages/cxf-component.adoc
b/docs/components/modules/ROOT/pages/cxf-component.adoc
index 38f3e9f..431bfb2 100644
--- a/docs/components/modules/ROOT/pages/cxf-component.adoc
+++ b/docs/components/modules/ROOT/pages/cxf-component.adoc
@@ -771,7 +771,7 @@ set the SOAP Fault message in the message body and set the
response
code in the message header.
Same for using POJO data format. You can set the SOAPFault on the out
-body and also indicate it's a fault by calling Message.setFault(true):
+body.
=== How to propagate a camel-cxf endpoint's request and response context
diff --git
a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
index e2830d0..8efef32 100644
---
a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
+++
b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -1661,13 +1661,6 @@
"defaultValue":"false"
},
{
- "name":"camel.component.jms.transfer-fault",
- "type":"java.lang.Boolean",
-
"sourceType":"org.apache.camel.component.jms.JmsComponent",
- "description":"If enabled and you are using Request
Reply messaging (InOut) and an Exchange failed with a SOAP fault (not
exception) on the consumer side, then the fault flag on
org.apache.camel.Message#isFault() will be send back in the response as a JMS
header with the key JmsConstants#JMS_TRANSFER_FAULT. If the client is Camel,
the returned fault flag will be set on the
org.apache.camel.Message#setFault(boolean). You may want to enable this when
using Camel components that support [...]
- "defaultValue":"false"
- },
- {
"name":"camel.component.jms.jms-operations",
[camel] 11/11: CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13755
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 161c46404b6e4d7a41046f47a5ab2accc9121b11
Author: Claus Ibsen
AuthorDate: Sun Jul 21 19:40:19 2019 +0200
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be
component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS
---
.../src/main/docs/eips/setFaultBody-eip.adoc | 39 --
docs/user-manual/modules/ROOT/nav.adoc | 1 -
.../modules/ROOT/pages/setFaultBody-eip.adoc | 39 --
.../trgt/classes/org/apache/camel/model/aop.json | 2 +-
.../test/resources/integration/camel-spring.xsd| 1 -
.../src/test/resources/json/aop.json | 2 +-
6 files changed, 2 insertions(+), 82 deletions(-)
diff --git a/core/camel-core/src/main/docs/eips/setFaultBody-eip.adoc
b/core/camel-core/src/main/docs/eips/setFaultBody-eip.adoc
deleted file mode 100644
index 095d9ed..000
--- a/core/camel-core/src/main/docs/eips/setFaultBody-eip.adoc
+++ /dev/null
@@ -1,39 +0,0 @@
-[[setFaultBody-eip]]
-== Set Fault Body EIP
-
-The SetFaultBody EIP allows you to set contents of a fault message's body.
-
-=== Options
-
-// eip options: START
-The Set Fault Body EIP has no options.
-// eip options: END
-
-=== Examples
-
-The following example shows how to use the SetFaultBody EIP
-
-[source,java]
-
-RouteBuilder builder = new RouteBuilder() {
-public void configure() {
-from("direct:a")
-.setFaultBody(constant("test"))
-.to("direct:b");
-}
-};
-
-
-
-And the same example using XML:
-
-[source,xml]
-
-http://camel.apache.org/schema/spring;>
-
-
-test
-
-
-
-
diff --git a/docs/user-manual/modules/ROOT/nav.adoc
b/docs/user-manual/modules/ROOT/nav.adoc
index cab60cb..a0ae105 100644
--- a/docs/user-manual/modules/ROOT/nav.adoc
+++ b/docs/user-manual/modules/ROOT/nav.adoc
@@ -100,7 +100,6 @@
** xref:script-eip.adoc[Script EIP]
** xref:serviceCall-eip.adoc[Service Call EIP]
** xref:setBody-eip.adoc[Set Body EIP]
- ** xref:setFaultBody-eip.adoc[Set Fault Body EIP]
** xref:setHeader-eip.adoc[Set Header EIP]
** xref:setOutHeader-eip.adoc[Set Out Header EIP (deprecated)]
** xref:setProperty-eip.adoc[Set Property EIP]
diff --git a/docs/user-manual/modules/ROOT/pages/setFaultBody-eip.adoc
b/docs/user-manual/modules/ROOT/pages/setFaultBody-eip.adoc
deleted file mode 100644
index 095d9ed..000
--- a/docs/user-manual/modules/ROOT/pages/setFaultBody-eip.adoc
+++ /dev/null
@@ -1,39 +0,0 @@
-[[setFaultBody-eip]]
-== Set Fault Body EIP
-
-The SetFaultBody EIP allows you to set contents of a fault message's body.
-
-=== Options
-
-// eip options: START
-The Set Fault Body EIP has no options.
-// eip options: END
-
-=== Examples
-
-The following example shows how to use the SetFaultBody EIP
-
-[source,java]
-
-RouteBuilder builder = new RouteBuilder() {
-public void configure() {
-from("direct:a")
-.setFaultBody(constant("test"))
-.to("direct:b");
-}
-};
-
-
-
-And the same example using XML:
-
-[source,xml]
-
-http://camel.apache.org/schema/spring;>
-
-
-test
-
-
-
-
diff --git
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/integration/camel-core-integration/trgt/classes/org/apache/camel/model/aop.json
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/integration/camel-core-integration/trgt/classes/org/apache/camel/model/aop.json
index 7f32f72..d39e766 100644
---
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/integration/camel-core-integration/trgt/classes/org/apache/camel/model/aop.json
+++
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/integration/camel-core-integration/trgt/classes/org/apache/camel/model/aop.json
@@ -13,7 +13,7 @@
"beforeUri": { "kind": "attribute", "required": "false", "type": "string",
"javaType": "java.lang.String", "deprecated": "false", "description":
"beforeUri documentation" },
"afterUri": { "kind": "attribute", "required": "false", "type": "string",
"javaType": "java.lang.String", "deprecated": "false", "description": "Endpoint
to call in AOP after. The difference between after and afterFinally is that
afterFinally is invoked from a finally block so it will always be invoked no
matter what eg also in case of an exception occur." },
"afterFinallyUri": { "kind": "attribute", "required": "false", "type":
"string", "javaType": "java.lang.String", "deprecated": "false", "description":
"Endpoint to call in AOP after finally. The difference between after and
afterFinally is that afterFinally is invoked from a finally block so it will
always be invoked no matter what eg also in case
[camel-quarkus] branch master updated: Move netty integration-tests out of core #32
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 01cbb6c Move netty integration-tests out of core #32
new bcd4441 Merge pull request #79 from lburgazzoli/github-32
01cbb6c is described below
commit 01cbb6cdda38eb29ffee1984b6d5586813e442bf
Author: lburgazzoli
AuthorDate: Sun Jul 21 17:38:22 2019 +0200
Move netty integration-tests out of core #32
---
integration-tests/core/pom.xml | 4 ---
.../java/io/quarkus/it/camel/core/CamelRoute.java | 3 --
.../java/io/quarkus/it/camel/core/CamelTest.java | 17 +++--
integration-tests/{core => netty4-http}/pom.xml| 19 --
.../io/quarkus/it/camel/nett4http/CamelRoute.java} | 42 ++
.../src/main/resources/application.properties | 36 +++
.../io/quarkus/it/camel/nett4http/CamelITCase.java | 23
.../io/quarkus/it/camel/nett4http}/CamelTest.java | 12 +--
integration-tests/pom.xml | 1 +
9 files changed, 90 insertions(+), 67 deletions(-)
diff --git a/integration-tests/core/pom.xml b/integration-tests/core/pom.xml
index ddad477..56e4c00 100644
--- a/integration-tests/core/pom.xml
+++ b/integration-tests/core/pom.xml
@@ -43,10 +43,6 @@
org.apache.camel.quarkus
-camel-quarkus-netty4-http
-
-
-org.apache.camel.quarkus
camel-quarkus-timer
diff --git
a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java
b/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java
index c6b8436..9ee0422 100644
---
a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java
+++
b/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java
@@ -57,9 +57,6 @@ public class CamelRoute extends RouteBuilder {
// log out
.to("log:out");
-from("netty4-http:http://0.0.0.0:8999/foo;)
-.transform().constant("Netty Hello World");
-
}
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
diff --git
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
b/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
index 7281cd1..d12b2ff 100644
---
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
+++
b/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
@@ -16,16 +16,12 @@
*/
package io.quarkus.it.camel.core;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-
-import java.net.URI;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
@QuarkusTest
public class CamelTest {
@@ -38,9 +34,4 @@ public class CamelTest {
public void testProperties() {
RestAssured.when().get("/test/property/camel.context.name").then().body(is("quarkus-camel-example"));
}
-
-@Test
-public void testNetty4Http() throws Exception {
-RestAssured.when().get(new
URI("http://localhost:8999/foo;)).then().body(is("Netty Hello World"));
-}
}
diff --git a/integration-tests/core/pom.xml
b/integration-tests/netty4-http/pom.xml
similarity index 91%
copy from integration-tests/core/pom.xml
copy to integration-tests/netty4-http/pom.xml
index ddad477..d99ede6 100644
--- a/integration-tests/core/pom.xml
+++ b/integration-tests/netty4-http/pom.xml
@@ -27,8 +27,8 @@
4.0.0
-camel-quarkus-integration-test-core
-Camel Quarkus :: Integration Tests :: Core
+camel-quarkus-integration-test-netty4-http
+Camel Quarkus :: Integration Tests :: Nett4 Http
The camel integration tests
@@ -39,23 +39,16 @@
org.apache.camel.quarkus
-camel-quarkus-log
-
-
-org.apache.camel.quarkus
camel-quarkus-netty4-http
-
-org.apache.camel.quarkus
-camel-quarkus-timer
-
+
io.quarkus
-quarkus-resteasy
-
+quarkus-undertow
+
io.quarkus
quarkus-junit5
diff --git
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
b/integration-tests/netty4-http/src/main/java/io/quarkus/it/camel/nett4http/CamelRoute.java
similarity index 50%
copy from
integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
copy to
[camel] branch master updated: fix typo
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e54df1a fix typo
new 8ca303a Merge pull request #3052 from davidkarlsen/fixtypo
e54df1a is described below
commit e54df1a558d64d85fd7062e806757432733bf788
Author: David J. M. Karlsen
AuthorDate: Sun Jul 21 12:19:18 2019 +0200
fix typo
Signed-off-by: David J. M. Karlsen
---
.../src/main/java/org/apache/camel/maven/ValidateMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 39e644d..f12ad75 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -385,7 +385,7 @@ public class ValidateMojo extends AbstractExecMojo {
getLog().warn(sb.toString());
} else if (showAll) {
StringBuilder sb = new StringBuilder();
-sb.append("Endpoint validation passsed at: ");
+sb.append("Endpoint validation passed at: ");
if (detail.getClassName() != null && detail.getLineNumber() !=
null) {
// this is from java code
sb.append(detail.getClassName());
[camel] branch master updated: "CAMEL-13454:camel-testcontainers - Should build if no docker forpulsar component"
This is an automated email from the ASF dual-hosted git repository.
ramu12 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e49145b "CAMEL-13454:camel-testcontainers - Should build if no docker
forpulsar component"
e49145b is described below
commit e49145b4a872ee799ebaa1e8241168c20e1ea594
Author: Kodanda Ramu Kakarla
AuthorDate: Sun Jul 21 11:29:43 2019 +0530
"CAMEL-13454:camel-testcontainers - Should build if no docker forpulsar
component"
---
components/camel-pulsar/pom.xml | 65 -
1 file changed, 65 deletions(-)
diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 2e0820f..41ace30 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -89,69 +89,4 @@
test
-
-
-
-pulsar-skip-tests
-
-true
-
-
-
-
-maven-surefire-plugin
-
-true
-
-
-
-
-
-
-
-
-pulsar-tests-docker-file
-
-
-/var/run/docker.sock
-
-
-
-
-
-maven-surefire-plugin
-
-${skipTests}
-
-
true
-
-
-
-
-
-
-
-
-
-pulsar-tests-docker-env
-
-
-env.DOCKER_HOST
-
-
-
-
-
-maven-surefire-plugin
-
-${skipTests}
-
-
true
-
-
-
-
-
-
-
