This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 50281fd015c Regen for commit 7af3fa63f58d67079b2975917b092e532c2b98bc 50281fd015c is described below commit 50281fd015cba0c1cc534646fe7c0940629cd1af Author: davsclaus <davscl...@users.noreply.github.com> AuthorDate: Fri May 19 17:00:58 2023 +0000 Regen for commit 7af3fa63f58d67079b2975917b092e532c2b98bc Signed-off-by: GitHub <nore...@github.com> --- .../apache/camel/catalog/schemas/camel-spring.xsd | 189 +-------------------- .../component/jms/JmsTransferExceptionTest.java | 3 - 2 files changed, 6 insertions(+), 186 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 93db93707ca..f83dc3a1640 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -111,17 +111,6 @@ BeanPostProcessor to post process beans. </xs:annotation> </xs:element> - <xs:element name="beans" type="tns:beansDefinition"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -A groupping POJO (and related XML root element) that's historically associated -with entire application (or its distinguished fragment). This class is not meant -to be used with Camel Java DSL, but it's needed to generate XML Schema and MX -parser methods. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="bearerToken" type="tns:bearerTokenDefinition"> <xs:annotation> <xs:documentation xml:lang="en"> @@ -163,14 +152,6 @@ Deprecated: null </xs:annotation> </xs:element> - <xs:element name="camel" type="tns:applicationDefinition"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -If beans reminds Spring application too much, we can use camel. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="camelContext" type="tns:camelContextFactoryBean"> <xs:annotation> <xs:documentation xml:lang="en"> @@ -5737,74 +5718,6 @@ Default value: 60 </xs:documentation> </xs:annotation> </xs:attribute> - - <xs:attribute name="bulkheadEnabled" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Whether bulkhead is enabled or not on the circuit breaker. Default is false. -Default value: false - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="bulkheadMaxConcurrentCalls" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Configures the max amount of concurrent calls the bulkhead will support. Default -value: 25 - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="bulkheadMaxWaitDuration" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Configures a maximum amount of time which the calling thread will wait to enter -the bulkhead. If bulkhead has space available, entry is guaranteed and -immediate. If bulkhead is full, calling threads will contest for space, if it -becomes available. maxWaitDuration can be set to 0. Note: for threads running on -an event-loop or equivalent (rx computation pool, etc), setting maxWaitDuration -to 0 is highly recommended. Blocking an event-loop thread will most likely have -a negative effect on application throughput. Default value: 0 - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="timeoutEnabled" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Whether timeout is enabled or not on the circuit breaker. Default is false. -Default value: false - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="timeoutExecutorService" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -References to a custom thread pool to use when timeout is enabled (uses -ForkJoinPool#commonPool() by default). - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="timeoutDuration" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Configures the thread execution timeout. Default value is 1 second. Default -value: 1000 - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="timeoutCancelRunningFuture" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Configures whether cancel is called on the running future. Defaults to true. -Default value: true - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> </xs:extension> @@ -11370,19 +11283,6 @@ true </xs:documentation> </xs:annotation> </xs:attribute> - - <xs:attribute name="accessExternalSchemaProtocols" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Only in use if schema validation has been enabled. Restrict access to the -protocols specified for external reference set by the schemaLocation attribute, -Import and Include element. Examples of protocols are file, http, jar:file. -false or none to deny all access to external references; a specific protocol, -such as file, to give permission to only the protocol; the keyword all to grant -permission to all protocols. Default value: false - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> </xs:extension> @@ -11671,15 +11571,6 @@ true </xs:documentation> </xs:annotation> </xs:attribute> - - <xs:attribute name="dateFormatPattern" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -To configure the date format while marshall or unmarshall Date fields in JSON -using Gson. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> </xs:extension> @@ -20227,23 +20118,7 @@ org.apache.camel.language.simple.SimpleLanguage expression. <xs:extension base="tns:serviceCallConfiguration"> - <xs:sequence/> - - </xs:extension> - - </xs:complexContent> - - </xs:complexType> - - <xs:complexType name="consulServiceCallServiceDiscoveryConfiguration"> - - <xs:complexContent> - - <xs:extension base="tns:serviceCallServiceDiscoveryConfiguration"> - - <xs:sequence/> - - <xs:attribute name="url" type="xs:string"> + <xs:attribute name="component" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -21156,14 +21031,6 @@ configuration, so these custom functions can be used in xquery expressions. </xs:attribute> <xs:attribute name="serviceDiscoveryRef" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Sets a reference to a custom ServiceDiscovery to use. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="serviceFilterRef" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -21173,7 +21040,7 @@ The name of the header or query parameter to be used. </xs:annotation> </xs:attribute> - <xs:attribute name="serviceChooserRef" type="xs:string"> + <xs:attribute name="serviceFilterRef" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -21183,7 +21050,7 @@ To use header as the location of the API key. Default value: false </xs:annotation> </xs:attribute> - <xs:attribute name="loadBalancerRef" type="xs:string"> + <xs:attribute name="serviceChooserRef" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -21506,30 +21373,8 @@ Default value: false </xs:documentation> </xs:annotation> </xs:attribute> - - </xs:extension> - - </xs:simpleContent> - - </xs:complexType> - - <xs:complexType name="javaScriptExpression"> - - <xs:simpleContent> - - <xs:extension base="tns:typedExpressionDefinition"/> - - </xs:simpleContent> - - </xs:complexType> - - <xs:complexType name="joorExpression"> - - <xs:simpleContent> - - <xs:extension base="tns:typedExpressionDefinition"> - <xs:attribute name="preCompile" type="xs:string"> + <xs:attribute name="type" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -21542,7 +21387,7 @@ input to be an array type. </xs:annotation> </xs:attribute> - <xs:attribute name="singleQuotes" type="xs:string"> + <xs:attribute name="outType" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -21554,30 +21399,8 @@ input to be an array type. </xs:documentation> </xs:annotation> </xs:attribute> - - </xs:extension> - - </xs:simpleContent> - - </xs:complexType> - - <xs:complexType name="jqExpression"> - - <xs:simpleContent> - - <xs:extension base="tns:singleInputTypedExpressionDefinition"/> - - </xs:simpleContent> - - </xs:complexType> - - <xs:complexType name="jsonPathExpression"> - - <xs:simpleContent> - - <xs:extension base="tns:singleInputTypedExpressionDefinition"> - <xs:attribute name="suppressExceptions" type="xs:string"> + <xs:attribute name="singleQuotes" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java index e5a0c108f28..21d141c645e 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java @@ -16,10 +16,7 @@ */ package org.apache.camel.component.jms; -import org.apache.camel.CamelContext; -import org.apache.camel.ConsumerTemplate; import org.apache.camel.LoggingLevel; -import org.apache.camel.ProducerTemplate; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.CamelLogger;