You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/10/11 13:22:38 UTC
[camel-website] branch main updated: Fix schema for Spring for 4.1.0 (#1074)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-website.git
The following commit(s) were added to refs/heads/main by this push:
new a199dc2c Fix schema for Spring for 4.1.0 (#1074)
a199dc2c is described below
commit a199dc2cc5c94af7c3c3e7fec59ecd1ff640e25e
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Wed Oct 11 15:22:32 2023 +0200
Fix schema for Spring for 4.1.0 (#1074)
Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
.../camel-spring-4.1.0.xsd} | 0
static/schema/spring/camel-spring.xsd | 133 +++++++++++++--------
2 files changed, 81 insertions(+), 52 deletions(-)
diff --git a/static/schema/spring-xml/camel-spring-xml-4.1.0.xsd b/static/schema/spring/camel-spring-4.1.0.xsd
similarity index 100%
rename from static/schema/spring-xml/camel-spring-xml-4.1.0.xsd
rename to static/schema/spring/camel-spring-4.1.0.xsd
diff --git a/static/schema/spring/camel-spring.xsd b/static/schema/spring/camel-spring.xsd
index bb6822e4..f24dfd10 100644
--- a/static/schema/spring/camel-spring.xsd
+++ b/static/schema/spring/camel-spring.xsd
@@ -3945,19 +3945,17 @@ Bean name.
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-What type to use for creating the bean. Can be one of: #class,#type,bean,groovy,joor,language,mvel,ognl. #class or #type
-then the bean is created via the fully qualified classname, such as #class:com.foo.MyBean The others are scripting
-languages that gives more power to create the bean with an inlined code in the script section, such as using groovy.
+What type to use for creating the bean (FQN classname). Can be prefixed with: #class or #type #class or #type then the
+bean is created via the fully qualified classname, such as #class:com.foo.MyBean.
]]>
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="beanType" type="xs:string">
+ <xs:attribute name="scriptLanguage" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-To set the type (fully qualified class name) of the returned bean created by the script. Knowing the type of the bean
-can be needed when dependency injection by type is in use, or when looking in registry via class type.
+The script language to use when using inlined script for creating the bean, such as groovy, java, javascript etc.
]]>
</xs:documentation>
</xs:annotation>
@@ -5241,33 +5239,6 @@ detect the exception, and rollback. Default value: true
<xs:sequence>
<xs:element minOccurs="0" ref="tns:redeliveryPolicy"/>
</xs:sequence>
- <xs:attribute name="loggerRef" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en">
-<![CDATA[
-References to a logger to use as logger for the error handler.
-]]>
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="level" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en">
-<![CDATA[
-Logging level to use when using the logging error handler type. Default value: ERROR
-]]>
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="logName" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en">
-<![CDATA[
-Name of the logger to use for the logging error handler.
-]]>
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="useOriginalMessage" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
@@ -5328,6 +5299,42 @@ some EIP patterns such as splitter, multicast, will create a new unit of work bo
sub-route (eg the splitted message); however these EIPs have an option named shareUnitOfWork which allows to combine
with the parent unit of work in regard to error handling and therefore use the parent original message. By default this
feature is off. Default value: false
+]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="redeliveryPolicyRef" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+<![CDATA[
+Sets a reference to a RedeliveryPolicy to be used for redelivery settings.
+]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="loggerRef" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+<![CDATA[
+References to a logger to use as logger for the error handler.
+]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="level" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+<![CDATA[
+Logging level to use by error handler. Default value: ERROR
+]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="logName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+<![CDATA[
+Name of the logger to use by the error handler.
]]>
</xs:documentation>
</xs:annotation>
@@ -5368,15 +5375,6 @@ letter channel. This allows for example to enrich the message before sending to
<xs:documentation xml:lang="en">
<![CDATA[
Sets a retry while predicate. Will continue retrying until the predicate evaluates to false.
-]]>
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="redeliveryPolicyRef" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en">
-<![CDATA[
-Sets a reference to a RedeliveryPolicy to be used for redelivery settings.
]]>
</xs:documentation>
</xs:annotation>
@@ -9345,8 +9343,8 @@ that there is no header. The default value is false. Default value: false
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Whether or not the header must be read in the first line of the test document The default value is false. Default value:
-false
+Whether or not the header must be read in the first line of the test document. The default value is false. Default
+value: false
]]>
</xs:documentation>
</xs:annotation>
@@ -9373,7 +9371,7 @@ The String representation of an empty value.
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-The line separator of the files The default value is to use the JVM platform line separator.
+The line separator of the files. The default value is to use the JVM platform line separator.
]]>
</xs:documentation>
</xs:annotation>
@@ -9382,7 +9380,7 @@ The line separator of the files The default value is to use the JVM platform lin
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-The normalized line separator of the files The default value is a new line character. Default value: \n
+The normalized line separator of the files. The default value is a new line character.
]]>
</xs:documentation>
</xs:annotation>
@@ -9401,7 +9399,7 @@ The comment symbol. The default value is #. Default value: #
<xs:documentation xml:lang="en">
<![CDATA[
Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at
-one. The default value is false. Default value: false
+once. The default value is false. Default value: false
]]>
</xs:documentation>
</xs:annotation>
@@ -11598,9 +11596,13 @@ should be included or not.
</xs:complexContent>
</xs:complexType>
<xs:complexType name="routeConfigurationsDefinition">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:routeConfiguration"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="tns:optionalIdentifiedDefinition">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:routeConfiguration"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="routeContextRefDefinition">
<xs:sequence/>
@@ -13579,6 +13581,7 @@ org.apache.camel.builder.RouteBuilder.
</xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="bean" type="tns:registryBeanDefinition"/>
<xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="skip"/>
+ <xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="skip"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:restConfiguration"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:rest"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:routeConfiguration"/>
@@ -13593,10 +13596,27 @@ org.apache.camel.builder.RouteBuilder.
</xs:complexType>
<xs:complexType name="registryBeanDefinition">
<xs:sequence>
+ <xs:element minOccurs="0" name="constructors" type="tns:beanConstructorsDefinition"/>
<xs:element minOccurs="0" name="properties" type="tns:beanPropertiesDefinition"/>
+ <xs:element minOccurs="0" name="script" type="xs:string"/>
</xs:sequence>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ <xs:attribute name="initMethod" type="xs:string"/>
+ <xs:attribute name="destroyMethod" type="xs:string"/>
+ <xs:attribute name="factoryMethod" type="xs:string"/>
+ <xs:attribute name="factoryBean" type="xs:string"/>
+ <xs:attribute name="scriptLanguage" type="xs:string"/>
+ </xs:complexType>
+ <xs:complexType name="beanConstructorsDefinition">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="constructor" type="tns:beanConstructorDefinition"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="beanConstructorDefinition">
+ <xs:sequence/>
+ <xs:attribute name="index" type="xs:int"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
</xs:complexType>
<xs:complexType name="restConfigurationDefinition">
<xs:sequence>
@@ -15767,6 +15787,15 @@ request. When using prototype scope, then the bean will be looked up or created
this is delegated to the bean registry such as Spring or CDI (if in use), which depends on their configuration can act
as either singleton or prototype scope. So when using prototype scope then this depends on the bean registry
implementation. Default value: Singleton
+]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="validate" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+<![CDATA[
+Whether to validate the bean has the configured method. Default value: true
]]>
</xs:documentation>
</xs:annotation>