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 af10819178b Regen for commit 9bd7acd73f5ae0acfac4763570b4a5c252e989e3
af10819178b is described below
commit af10819178ba58abb89f6a00abfb16a5dd901862
Author: davsclaus <[email protected]>
AuthorDate: Tue Dec 27 12:08:19 2022 +0000
Regen for commit 9bd7acd73f5ae0acfac4763570b4a5c252e989e3
Signed-off-by: GitHub <[email protected]>
---
.../org/apache/camel/catalog/dataformats/jaxb.json | 1 +
.../org/apache/camel/catalog/models/jaxb.json | 1 +
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 15 +++++++++++++++
.../apache/camel/model/dataformat/JaxbDataFormat.java | 18 ++++++++----------
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
index 6dcde9e7a79..f605f340501 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
@@ -35,6 +35,7 @@
"noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No
Namespace Schema Location", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "To define the location of the
namespaceless schema" },
"jaxbProviderProperties": { "kind": "attribute", "displayName": "Jaxb
Provider Properties", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Refers to a custom java.util.Map to lookup in
the registry containing custom JAXB provider properties to be used with the
JAXB marshaller." },
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type
Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the data format should set the Content-Type header with
the type from the data format. For example application\/xml for data formats
marshalling to XML, or application\/json for data formats marshalling to JSON"
},
+ "accessExternalSchemaProtocols": { "kind": "attribute", "displayName":
"Access External Schema Protocols", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false", "description":
"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 o [...]
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
index 8452f637a27..fff71749476 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
@@ -32,6 +32,7 @@
"noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No
Namespace Schema Location", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "To define the location of the
namespaceless schema" },
"jaxbProviderProperties": { "kind": "attribute", "displayName": "Jaxb
Provider Properties", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Refers to a custom java.util.Map to lookup in
the registry containing custom JAXB provider properties to be used with the
JAXB marshaller." },
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type
Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the data format should set the Content-Type header with
the type from the data format. For example application\/xml for data formats
marshalling to XML, or application\/json for data formats marshalling to JSON"
},
+ "accessExternalSchemaProtocols": { "kind": "attribute", "displayName":
"Access External Schema Protocols", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false", "description":
"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 o [...]
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
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 d378cbb1ad0..70ecb406339 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
@@ -11221,6 +11221,21 @@ 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>
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
index bfa137cafeb..ce6e60823a0 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
@@ -358,12 +358,11 @@ public class JaxbDataFormat extends DataFormatDefinition
implements ContentTypeH
/**
* 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.
+ * 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.
+ * 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.
*/
public void setAccessExternalSchemaProtocols(String
accessExternalSchemaProtocols) {
this.accessExternalSchemaProtocols = accessExternalSchemaProtocols;
@@ -647,12 +646,11 @@ public class JaxbDataFormat extends DataFormatDefinition
implements ContentTypeH
/**
* 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.
+ * 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.
+ * 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.
*/
public Builder accessExternalSchemaProtocols(String
accessExternalSchemaProtocols) {
this.accessExternalSchemaProtocols = accessExternalSchemaProtocols;