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 <claus.ib...@gmail.com> 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..0000000 --- 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] ----- -<camelContext xmlns="http://camel.apache.org/schema/spring"> - <route> - <from uri="direct:a"/> - <setFaultBody><constant>test</constant></setFaultBody> - <to uri="direct:b"/> - </route> -</camelContext> ----- 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..0000000 --- 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] ----- -<camelContext xmlns="http://camel.apache.org/schema/spring"> - <route> - <from uri="direct:a"/> - <setFaultBody><constant>test</constant></setFaultBody> - <to uri="direct:b"/> - </route> -</camelContext> ----- 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 of an exception occur." }, - "outputs": { "kind": "element", "required": "true", "type": "array", "javaType": "java.util.List<org.apache.camel.model.ProcessorDefinition<?>>", "oneOf": [ "aggregate", "aop", "bean", "choice", "convertBodyTo", "delay", "doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter", "idempotentConsumer", "inOnly", "inOut", "intercept", "interceptFrom", "interceptSendToEndpoint", "loadBalance", "log", "loop", "marshal", "multicast", "onCompletion", "onException", "otherwise", " [...] + "outputs": { "kind": "element", "required": "true", "type": "array", "javaType": "java.util.List<org.apache.camel.model.ProcessorDefinition<?>>", "oneOf": [ "aggregate", "aop", "bean", "choice", "convertBodyTo", "delay", "doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter", "idempotentConsumer", "inOnly", "inOut", "intercept", "interceptFrom", "interceptSendToEndpoint", "loadBalance", "log", "loop", "marshal", "multicast", "onCompletion", "onException", "otherwise", " [...] "id": { "kind": "attribute", "required": "false", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "description": "id documentation" }, "description": { "kind": "element", "required": "false", "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": "false", "description": "Sets the description of this node" } } diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/integration/camel-spring.xsd b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/integration/camel-spring.xsd index 64676c4..9e7b5a7 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/integration/camel-spring.xsd +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/integration/camel-spring.xsd @@ -85,7 +85,6 @@ <xs:element ref="tns:sample"/> <xs:element ref="tns:setBody"/> <xs:element ref="tns:setExchangePattern"/> - <xs:element ref="tns:setFaultBody"/> <xs:element ref="tns:setHeader"/> <xs:element ref="tns:setOutHeader"/> <xs:element ref="tns:setProperty"/> diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/json/aop.json b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/json/aop.json index 3d91228..fc57b73 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/json/aop.json +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/json/aop.json @@ -13,7 +13,7 @@ "beforeUri": { "kind": "attribute", "required": "false", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "description": "Endpoint to call in AOP before." }, "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 of an exception occur." }, - "outputs": { "kind": "element", "required": "true", "type": "array", "javaType": "java.util.List<org.apache.camel.model.ProcessorDefinition<?>>", "oneOf": [ "aggregate", "aop", "bean", "choice", "convertBodyTo", "delay", "doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter", "idempotentConsumer", "inOnly", "inOut", "intercept", "interceptFrom", "interceptSendToEndpoint", "loadBalance", "log", "loop", "marshal", "multicast", "onCompletion", "onException", "otherwise", " [...] + "outputs": { "kind": "element", "required": "true", "type": "array", "javaType": "java.util.List<org.apache.camel.model.ProcessorDefinition<?>>", "oneOf": [ "aggregate", "aop", "bean", "choice", "convertBodyTo", "delay", "doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter", "idempotentConsumer", "inOnly", "inOut", "intercept", "interceptFrom", "interceptSendToEndpoint", "loadBalance", "log", "loop", "marshal", "multicast", "onCompletion", "onException", "otherwise", " [...] "id": { "kind": "attribute", "required": "false", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "description": "Sets the id of this node" }, "description": { "kind": "element", "required": "false", "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": "false", "description": "Sets the description of this node" } }