You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/04/04 14:55:55 UTC
[camel] branch main updated: CAMEL-17879: remove deprecated component camel-msv
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 ee0394ceede CAMEL-17879: remove deprecated component camel-msv
ee0394ceede is described below
commit ee0394ceeded0af6e4d7d342b9916eb8464a97f8
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 4 14:55:14 2022 +0200
CAMEL-17879: remove deprecated component camel-msv
---
bom/camel-bom/pom.xml | 5 -
camel-dependencies/pom.xml | 3 -
catalog/camel-allcomponents/pom.xml | 4 -
.../org/apache/camel/catalog/components.properties | 1 -
.../org/apache/camel/catalog/components/msv.json | 43 ------
components/camel-msv/pom.xml | 71 ----------
.../validator/msv/MsvComponentConfigurer.java | 49 -------
.../validator/msv/MsvEndpointConfigurer.java | 21 ---
.../validator/msv/MsvEndpointUriFactory.java | 78 -----------
.../services/org/apache/camel/component.properties | 7 -
.../services/org/apache/camel/component/msv | 2 -
.../org/apache/camel/configurer/msv-component | 2 -
.../org/apache/camel/configurer/msv-endpoint | 2 -
.../org/apache/camel/urifactory/msv-endpoint | 2 -
.../apache/camel/component/validator/msv/msv.json | 43 ------
.../camel-msv/src/main/docs/msv-component.adoc | 78 -----------
.../component/validator/msv/MsvComponent.java | 60 --------
.../camel/component/validator/msv/MsvEndpoint.java | 55 --------
.../component/validator/msv/RelaxNGRouteTest.java | 54 --------
.../services/org/apache/camel/component/rng | 18 ---
.../camel-msv/src/test/resources/log4j2.properties | 34 -----
.../camel/component/validator/msv/camelContext.xml | 47 -------
.../camel/component/validator/msv/schema.rng | 24 ----
.../src/main/docs/validator-component.adoc | 9 +-
components/pom.xml | 1 -
.../org/apache/camel/main/components.properties | 1 -
.../components/modules/ROOT/examples/json/msv.json | 1 -
docs/components/modules/ROOT/nav.adoc | 1 -
.../modules/ROOT/pages/msv-component.adoc | 1 -
.../component/ComponentsBuilderFactory.java | 14 --
.../component/dsl/MsvComponentBuilderFactory.java | 153 ---------------------
.../src/generated/resources/metadata.json | 22 ---
parent/pom.xml | 8 --
33 files changed, 1 insertion(+), 913 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index d99ffb281a7..6f5e4195a0d 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1458,11 +1458,6 @@
<artifactId>camel-mongodb-gridfs</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-msv</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mustache</artifactId>
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 15adb330e7f..70610c5ec0c 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -273,8 +273,6 @@
<influx-java-driver-version>2.22</influx-java-driver-version>
<irclib-version>1.10</irclib-version>
<ironmq-version>3.0.5</ironmq-version>
- <isorelax-jaxp-bridge-version>1.1</isorelax-jaxp-bridge-version>
- <isorelax-version>20090621</isorelax-version>
<ivy-version>2.5.0</ivy-version>
<jackrabbit-version>2.21.10</jackrabbit-version>
<jackson-version>1.9.12</jackson-version>
@@ -415,7 +413,6 @@
<mockwebserver-version>0.1.8</mockwebserver-version>
<mongo-hadoop-version>1.5.0</mongo-hadoop-version>
<mongo-java-driver-version>4.5.0</mongo-java-driver-version>
- <msv-version>2013.6.1</msv-version>
<mustache-java-version>0.9.10</mustache-java-version>
<mvel-version>2.4.14.Final</mvel-version>
<mybatis-version>3.5.9</mybatis-version>
diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml
index 21bcd31e384..2feaae3c851 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -965,10 +965,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-mongodb</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-msv</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mustache</artifactId>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index a56d86d2c67..7453436ccf3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -223,7 +223,6 @@ mllp
mock
mongodb
mongodb-gridfs
-msv
mustache
mvel
mybatis
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/msv.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/msv.json
deleted file mode 100644
index 9758c0c2c2a..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/msv.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "component": {
- "kind": "component",
- "name": "msv",
- "title": "MSV",
- "description": "Validate XML payloads using Multi-Schema Validator (MSV).",
- "deprecated": true,
- "firstVersion": "1.1.0",
- "label": "validation",
- "javaType": "org.apache.camel.component.validator.msv.MsvComponent",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel",
- "artifactId": "camel-msv",
- "version": "3.17.0-SNAPSHOT",
- "scheme": "msv",
- "extendsScheme": "",
- "syntax": "msv:resourceUri",
- "async": false,
- "api": false,
- "consumerOnly": false,
- "producerOnly": true,
- "lenientProperties": false
- },
- "componentProperties": {
- "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
- "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
- "resourceResolverFactory": { "kind": "property", "displayName": "Resource Resolver Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.validator.ValidatorResourceResolverFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom LSResourceResolver which depends on a dynamic endpoint resource URI" },
- "schemaFactory": { "kind": "property", "displayName": "Schema Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.xml.validation.SchemaFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use the javax.xml.validation.SchemaFactory." }
- },
- "properties": {
- "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "URL to a local resource on the classpath, or a reference to lookup a bean in the Registry, or a full URL to a remote resource or resource on the file system which contains the XSD to validate against." },
- "failOnNullBody": { "kind": "parameter", "displayName": "Fail On Null Body", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to fail if no body exists." },
- "failOnNullHeader": { "kind": "parameter", "displayName": "Fail On Null Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to fail if no header exists when validating against a header." },
- "headerName": { "kind": "parameter", "displayName": "Header Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against a header instead of the message body." },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
- "errorHandler": { "kind": "parameter", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.support.processor.validation.ValidatorErrorHandler", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception." },
- "resourceResolver": { "kind": "parameter", "displayName": "Resource Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.w3c.dom.ls.LSResourceResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom LSResourceResolver. Do not use together with resourceResolverFactory" },
- "resourceResolverFactory": { "kind": "parameter", "displayName": "Resource Resolver Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.validator.ValidatorResourceResolverFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom LSResourceResolver which depends on a dynamic endpoint resource URI. The default resource resolver factory resturns a resource resolver whic [...]
- "schemaFactory": { "kind": "parameter", "displayName": "Schema Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.xml.validation.SchemaFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom javax.xml.validation.SchemaFactory" },
- "schemaLanguage": { "kind": "parameter", "displayName": "Schema Language", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "http:\/\/www.w3.org\/2001\/XMLSchema", "description": "Configures the W3C XML Schema Namespace URI." },
- "useSharedSchema": { "kind": "parameter", "displayName": "Use Shared Schema", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the Schema instance should be shared or not. This option is introduced to work around a JDK 1.6.x bug. Xerces should not have this issue." }
- }
-}
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
deleted file mode 100644
index 913f8afa5f2..00000000000
--- a/components/camel-msv/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>3.17.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-msv</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: MSV (deprecated)</name>
- <description>Camel MSV support</description>
-
- <properties>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jopendocument</groupId>
- <artifactId>isorelax-jaxp-bridge-ILM</artifactId>
- <version>${isorelax-jaxp-bridge-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind.jaxb</groupId>
- <artifactId>isorelax</artifactId>
- <version>${isorelax-version}</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.msv</groupId>
- <artifactId>msv-core</artifactId>
- <version>${msv-version}</version>
- </dependency>
-
-
- <!-- test dependencies -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvComponentConfigurer.java b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvComponentConfigurer.java
deleted file mode 100644
index dff8190ca0d..00000000000
--- a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvComponentConfigurer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.validator.msv;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.component.validator.ValidatorComponentConfigurer;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class MsvComponentConfigurer extends ValidatorComponentConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
- @Override
- public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- MsvComponent target = (MsvComponent) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "schemafactory":
- case "schemaFactory": target.setSchemaFactory(property(camelContext, javax.xml.validation.SchemaFactory.class, value)); return true;
- default: return super.configure(camelContext, obj, name, value, ignoreCase);
- }
- }
-
- @Override
- public Class<?> getOptionType(String name, boolean ignoreCase) {
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "schemafactory":
- case "schemaFactory": return javax.xml.validation.SchemaFactory.class;
- default: return super.getOptionType(name, ignoreCase);
- }
- }
-
- @Override
- public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- MsvComponent target = (MsvComponent) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "schemafactory":
- case "schemaFactory": return target.getSchemaFactory();
- default: return super.getOptionValue(obj, name, ignoreCase);
- }
- }
-}
-
diff --git a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointConfigurer.java b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointConfigurer.java
deleted file mode 100644
index 4ba63663890..00000000000
--- a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointConfigurer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.validator.msv;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.component.validator.ValidatorEndpointConfigurer;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class MsvEndpointConfigurer extends ValidatorEndpointConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-}
-
diff --git a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriFactory.java b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriFactory.java
deleted file mode 100644
index e3ee54ca16b..00000000000
--- a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.validator.msv;
-
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.camel.spi.EndpointUriFactory;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class MsvEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
-
- private static final String BASE = ":resourceUri";
-
- private static final Set<String> PROPERTY_NAMES;
- private static final Set<String> SECRET_PROPERTY_NAMES;
- private static final Set<String> MULTI_VALUE_PREFIXES;
- static {
- Set<String> props = new HashSet<>(11);
- props.add("errorHandler");
- props.add("failOnNullBody");
- props.add("failOnNullHeader");
- props.add("headerName");
- props.add("lazyStartProducer");
- props.add("resourceResolver");
- props.add("resourceResolverFactory");
- props.add("resourceUri");
- props.add("schemaFactory");
- props.add("schemaLanguage");
- props.add("useSharedSchema");
- PROPERTY_NAMES = Collections.unmodifiableSet(props);
- SECRET_PROPERTY_NAMES = Collections.emptySet();
- MULTI_VALUE_PREFIXES = Collections.emptySet();
- }
-
- @Override
- public boolean isEnabled(String scheme) {
- return "msv".equals(scheme);
- }
-
- @Override
- public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
- String syntax = scheme + BASE;
- String uri = syntax;
-
- Map<String, Object> copy = new HashMap<>(properties);
-
- uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
- uri = buildQueryParameters(uri, copy, encode);
- return uri;
- }
-
- @Override
- public Set<String> propertyNames() {
- return PROPERTY_NAMES;
- }
-
- @Override
- public Set<String> secretPropertyNames() {
- return SECRET_PROPERTY_NAMES;
- }
-
- @Override
- public Set<String> multiValuePrefixes() {
- return MULTI_VALUE_PREFIXES;
- }
-
- @Override
- public boolean isLenientProperties() {
- return false;
- }
-}
-
diff --git a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/component.properties
deleted file mode 100644
index e5e6d8721bc..00000000000
--- a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-components=msv
-groupId=org.apache.camel
-artifactId=camel-msv
-version=3.17.0-SNAPSHOT
-projectName=Camel :: MSV (deprecated)
-projectDescription=Camel MSV support
diff --git a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/component/msv b/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/component/msv
deleted file mode 100644
index 4430e02fca4..00000000000
--- a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/component/msv
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.validator.msv.MsvComponent
diff --git a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/configurer/msv-component b/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/configurer/msv-component
deleted file mode 100644
index 14514703019..00000000000
--- a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/configurer/msv-component
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.validator.msv.MsvComponentConfigurer
diff --git a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/configurer/msv-endpoint b/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/configurer/msv-endpoint
deleted file mode 100644
index e99de5419b7..00000000000
--- a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/configurer/msv-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.validator.msv.MsvEndpointConfigurer
diff --git a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/urifactory/msv-endpoint b/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/urifactory/msv-endpoint
deleted file mode 100644
index c32111f4623..00000000000
--- a/components/camel-msv/src/generated/resources/META-INF/services/org/apache/camel/urifactory/msv-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.validator.msv.MsvEndpointUriFactory
diff --git a/components/camel-msv/src/generated/resources/org/apache/camel/component/validator/msv/msv.json b/components/camel-msv/src/generated/resources/org/apache/camel/component/validator/msv/msv.json
deleted file mode 100644
index 9758c0c2c2a..00000000000
--- a/components/camel-msv/src/generated/resources/org/apache/camel/component/validator/msv/msv.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "component": {
- "kind": "component",
- "name": "msv",
- "title": "MSV",
- "description": "Validate XML payloads using Multi-Schema Validator (MSV).",
- "deprecated": true,
- "firstVersion": "1.1.0",
- "label": "validation",
- "javaType": "org.apache.camel.component.validator.msv.MsvComponent",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel",
- "artifactId": "camel-msv",
- "version": "3.17.0-SNAPSHOT",
- "scheme": "msv",
- "extendsScheme": "",
- "syntax": "msv:resourceUri",
- "async": false,
- "api": false,
- "consumerOnly": false,
- "producerOnly": true,
- "lenientProperties": false
- },
- "componentProperties": {
- "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
- "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
- "resourceResolverFactory": { "kind": "property", "displayName": "Resource Resolver Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.validator.ValidatorResourceResolverFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom LSResourceResolver which depends on a dynamic endpoint resource URI" },
- "schemaFactory": { "kind": "property", "displayName": "Schema Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.xml.validation.SchemaFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use the javax.xml.validation.SchemaFactory." }
- },
- "properties": {
- "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "URL to a local resource on the classpath, or a reference to lookup a bean in the Registry, or a full URL to a remote resource or resource on the file system which contains the XSD to validate against." },
- "failOnNullBody": { "kind": "parameter", "displayName": "Fail On Null Body", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to fail if no body exists." },
- "failOnNullHeader": { "kind": "parameter", "displayName": "Fail On Null Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to fail if no header exists when validating against a header." },
- "headerName": { "kind": "parameter", "displayName": "Header Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against a header instead of the message body." },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
- "errorHandler": { "kind": "parameter", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.support.processor.validation.ValidatorErrorHandler", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception." },
- "resourceResolver": { "kind": "parameter", "displayName": "Resource Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.w3c.dom.ls.LSResourceResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom LSResourceResolver. Do not use together with resourceResolverFactory" },
- "resourceResolverFactory": { "kind": "parameter", "displayName": "Resource Resolver Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.validator.ValidatorResourceResolverFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom LSResourceResolver which depends on a dynamic endpoint resource URI. The default resource resolver factory resturns a resource resolver whic [...]
- "schemaFactory": { "kind": "parameter", "displayName": "Schema Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.xml.validation.SchemaFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom javax.xml.validation.SchemaFactory" },
- "schemaLanguage": { "kind": "parameter", "displayName": "Schema Language", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "http:\/\/www.w3.org\/2001\/XMLSchema", "description": "Configures the W3C XML Schema Namespace URI." },
- "useSharedSchema": { "kind": "parameter", "displayName": "Use Shared Schema", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the Schema instance should be shared or not. This option is introduced to work around a JDK 1.6.x bug. Xerces should not have this issue." }
- }
-}
diff --git a/components/camel-msv/src/main/docs/msv-component.adoc b/components/camel-msv/src/main/docs/msv-component.adoc
deleted file mode 100644
index 7f47fc77646..00000000000
--- a/components/camel-msv/src/main/docs/msv-component.adoc
+++ /dev/null
@@ -1,78 +0,0 @@
-= MSV Component (deprecated)
-:doctitle: MSV
-:shortname: msv
-:artifactid: camel-msv
-:description: Validate XML payloads using Multi-Schema Validator (MSV).
-:since: 1.1
-:supportlevel: Stable-deprecated
-:deprecated: *deprecated*
-:component-header: Only producer is supported
-//Manually maintained attributes
-:camel-spring-boot-name: msv
-
-*Since Camel {since}*
-
-*{component-header}*
-
-The MSV component performs XML validation of the message body using the
-https://msv.dev.java.net/[MSV Library] and any of the supported XML
-schema languages, such as http://www.w3.org/XML/Schema[XML Schema] or
-http://relaxng.org/[RelaxNG XML Syntax].
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-msv</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-== URI format
-
----------------------------------------
-msv:someLocalOrRemoteResource[?options]
----------------------------------------
-
-Where *someLocalOrRemoteResource* is some URL to a local resource on the
-classpath or a full URL to a remote resource or resource on the file
-system. For example
-
-------------------------------
-msv:org/foo/bar.rng
-msv:file:../foo/bar.rng
-msv:http://acme.com/cheese.rng
-------------------------------
-
-
-// component-configure options: START
-
-// component-configure options: END
-
-// component options: START
-include::partial$component-configure-options.adoc[]
-include::partial$component-endpoint-options.adoc[]
-// component options: END
-
-// endpoint options: START
-
-// endpoint options: END
-
-
-== Example
-
-The following
-https://github.com/apache/camel/blob/main/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/camelContext.xml[example]
-shows how to configure a route from endpoint *direct:start* which then
-goes to one of two endpoints, either *mock:valid* or *mock:invalid*
-based on whether or not the XML matches the given
-http://relaxng.org/[RelaxNG XML Schema] (which is supplied on the
-classpath).
-
-
-
-include::spring-boot:partial$starter.adoc[]
diff --git a/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/MsvComponent.java b/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/MsvComponent.java
deleted file mode 100644
index 566eeee6731..00000000000
--- a/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/MsvComponent.java
+++ /dev/null
@@ -1,60 +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.component.validator.msv;
-
-import java.util.Map;
-
-import javax.xml.validation.SchemaFactory;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.component.validator.ValidatorComponent;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
-
-/**
- * The <a href="http://camel.apache.org/msv.html">MSV Component</a> uses the <a href="https://msv.dev.java.net/">MSV
- * library</a> to perform XML validation using pluggable XML schema languages.
- *
- */
-@Component("msv")
-public class MsvComponent extends ValidatorComponent {
- @Metadata(label = "advanced")
- private SchemaFactory schemaFactory;
-
- public MsvComponent() {
- }
-
- @Override
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- MsvEndpoint endpoint = new MsvEndpoint(uri, this, remaining);
- endpoint.setSchemaFactory(getSchemaFactory());
- setProperties(endpoint, parameters);
- return endpoint;
- }
-
- public SchemaFactory getSchemaFactory() {
- return schemaFactory;
- }
-
- /**
- * To use the {@link javax.xml.validation.SchemaFactory}.
- */
- public void setSchemaFactory(SchemaFactory schemaFactory) {
- this.schemaFactory = schemaFactory;
- }
-
-}
diff --git a/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/MsvEndpoint.java b/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/MsvEndpoint.java
deleted file mode 100644
index e21c2034b13..00000000000
--- a/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/MsvEndpoint.java
+++ /dev/null
@@ -1,55 +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.component.validator.msv;
-
-import javax.xml.XMLConstants;
-
-import org.apache.camel.Category;
-import org.apache.camel.Component;
-import org.apache.camel.component.validator.ValidatorEndpoint;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.support.processor.validation.ValidatingProcessor;
-import org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl;
-
-/**
- * Validate XML payloads using Multi-Schema Validator (MSV).
- */
-@UriEndpoint(firstVersion = "1.1.0", scheme = "msv", title = "MSV", syntax = "msv:resourceUri", producerOnly = true,
- category = { Category.VALIDATION })
-public class MsvEndpoint extends ValidatorEndpoint {
-
- public MsvEndpoint(String endpointUri, Component component, String resourceUri) {
- super(endpointUri, component, resourceUri);
- }
-
- @Override
- protected void configureValidator(ValidatingProcessor validator) throws Exception {
- super.configureValidator(validator);
- validator.setSchemaLanguage(XMLConstants.RELAXNG_NS_URI);
- }
-
- @Override
- protected void doInit() throws Exception {
- super.doInit();
-
- // use relax schema factory by default
- if (getSchemaFactory() == null) {
- setSchemaFactory(new RELAXNGSchemaFactoryImpl());
- }
- }
-
-}
diff --git a/components/camel-msv/src/test/java/org/apache/camel/component/validator/msv/RelaxNGRouteTest.java b/components/camel-msv/src/test/java/org/apache/camel/component/validator/msv/RelaxNGRouteTest.java
deleted file mode 100644
index 859255fc2f3..00000000000
--- a/components/camel-msv/src/test/java/org/apache/camel/component/validator/msv/RelaxNGRouteTest.java
+++ /dev/null
@@ -1,54 +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.component.validator.msv;
-
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class RelaxNGRouteTest extends CamelSpringTestSupport {
-
- @Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/validator/msv/camelContext.xml");
- }
-
- @Test
- public void testValidMessage() throws Exception {
- getMockEndpoint("mock:valid").expectedMessageCount(1);
- getMockEndpoint("mock:invalid").expectedMessageCount(0);
- getMockEndpoint("mock:finally").expectedMessageCount(1);
-
- template.sendBody("direct:start",
- "<mail xmlns='http://foo.com/bar'><subject>Hey</subject><body>Hello world!</body></mail>");
-
- assertMockEndpointsSatisfied();
- }
-
- @Test
- public void testInvalidMessage() throws Exception {
- getMockEndpoint("mock:valid").expectedMessageCount(0);
- getMockEndpoint("mock:invalid").expectedMessageCount(1);
- getMockEndpoint("mock:finally").expectedMessageCount(1);
-
- template.sendBody("direct:start",
- "<mail xmlns='http://foo.com/bar'><body>Hello world!</body></mail>");
-
- assertMockEndpointsSatisfied();
- }
-
-}
diff --git a/components/camel-msv/src/test/resources/META-INF/services/org/apache/camel/component/rng b/components/camel-msv/src/test/resources/META-INF/services/org/apache/camel/component/rng
deleted file mode 100644
index 06a6d69d905..00000000000
--- a/components/camel-msv/src/test/resources/META-INF/services/org/apache/camel/component/rng
+++ /dev/null
@@ -1,18 +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.
-#
-
-class=org.apache.camel.component.validator.msv.RelaxNGComponent
\ No newline at end of file
diff --git a/components/camel-msv/src/test/resources/log4j2.properties b/components/camel-msv/src/test/resources/log4j2.properties
deleted file mode 100644
index f9bceebbfbf..00000000000
--- a/components/camel-msv/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,34 +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.
-## ---------------------------------------------------------------------------
-
-appender.file.type = File
-appender.file.name = file
-appender.file.fileName = target/camel-msv-test.log
-appender.file.layout.type = PatternLayout
-appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-appender.stdout.type = Console
-appender.stdout.name = stdout
-appender.stdout.layout.type = PatternLayout
-appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-logger.DefaultPackageScanClassResolver.name = org.apache.camel.impl.engine.DefaultPackageScanClassResolver
-logger.DefaultPackageScanClassResolver.level = WARN
-logger.converter.name = org.apache.camel.impl.converter
-logger.converter.level = WARN
-logger.management.name = org.apache.camel.management
-logger.management.level = WARN
-rootLogger.level = INFO
-rootLogger.appenderRef.file.ref = file
diff --git a/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/camelContext.xml b/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/camelContext.xml
deleted file mode 100644
index 0c2a22cf278..00000000000
--- a/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/camelContext.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <!-- START SNIPPET: example -->
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
- <doTry>
- <to uri="msv:org/apache/camel/component/validator/msv/schema.rng"/>
- <to uri="mock:valid"/>
-
- <doCatch>
- <exception>org.apache.camel.ValidationException</exception>
- <to uri="mock:invalid"/>
- </doCatch>
- <doFinally>
- <to uri="mock:finally"/>
- </doFinally>
- </doTry>
- </route>
- </camelContext>
- <!-- END SNIPPET: example -->
-
-</beans>
diff --git a/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/schema.rng b/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/schema.rng
deleted file mode 100644
index 0b0639d753c..00000000000
--- a/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/schema.rng
+++ /dev/null
@@ -1,24 +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.
--->
-<element xmlns="http://relaxng.org/ns/structure/1.0" ns="http://foo.com/bar" name="mail">
- <element name="subject">
- <text/>
- </element>
- <element name="body">
- <text/>
- </element>
-</element>
diff --git a/components/camel-validator/src/main/docs/validator-component.adoc b/components/camel-validator/src/main/docs/validator-component.adoc
index 0d945ddd9b5..2a83a6e0473 100644
--- a/components/camel-validator/src/main/docs/validator-component.adoc
+++ b/components/camel-validator/src/main/docs/validator-component.adoc
@@ -17,10 +17,7 @@
The Validation component performs XML validation of the message body
using the JAXP Validation API and based on any of the supported XML
schema languages, which defaults to http://www.w3.org/XML/Schema[XML
-Schema]
-
-The xref:msv-component.adoc[MSV] component also supports
-http://relaxng.org/[RelaxNG XML Syntax].
+Schema].
== URI format
@@ -32,15 +29,11 @@ Where *someLocalOrRemoteResource* is some URL to a local resource on the
classpath or a full URL to a remote resource or resource on the file
system which contains the XSD to validate against. For example:
-* `msv:org/foo/bar.xsd`
-* `msv:file:../foo/bar.xsd`
-* `msv:http://acme.com/cheese.xsd`
* `validator:com/mypackage/myschema.xsd`
The Validation component is provided directly in the camel-core.
-
// component-configure options: START
// component-configure options: END
diff --git a/components/pom.xml b/components/pom.xml
index ae19404a49d..af23078f666 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -229,7 +229,6 @@
<module>camel-mllp</module>
<module>camel-mongodb-gridfs</module>
<module>camel-mongodb</module>
- <module>camel-msv</module>
<module>camel-mustache</module>
<module>camel-mvel</module>
<module>camel-mybatis</module>
diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
index a56d86d2c67..7453436ccf3 100644
--- a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
+++ b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
@@ -223,7 +223,6 @@ mllp
mock
mongodb
mongodb-gridfs
-msv
mustache
mvel
mybatis
diff --git a/docs/components/modules/ROOT/examples/json/msv.json b/docs/components/modules/ROOT/examples/json/msv.json
deleted file mode 120000
index fa276d7a682..00000000000
--- a/docs/components/modules/ROOT/examples/json/msv.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-msv/src/generated/resources/org/apache/camel/component/validator/msv/msv.json
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index b75b283cbc4..a3d1ecb9bd5 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -229,7 +229,6 @@
** xref:mock-component.adoc[Mock]
** xref:mongodb-component.adoc[MongoDB]
** xref:mongodb-gridfs-component.adoc[MongoDB GridFS]
-** xref:msv-component.adoc[MSV]
** xref:mustache-component.adoc[Mustache]
** xref:mvel-component.adoc[MVEL]
** xref:mybatis-component.adoc[MyBatis]
diff --git a/docs/components/modules/ROOT/pages/msv-component.adoc b/docs/components/modules/ROOT/pages/msv-component.adoc
deleted file mode 120000
index 5860bc20f04..00000000000
--- a/docs/components/modules/ROOT/pages/msv-component.adoc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../components/camel-msv/src/main/docs/msv-component.adoc
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 2b02818cf61..90716029171 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -3041,20 +3041,6 @@ public interface ComponentsBuilderFactory {
static org.apache.camel.builder.component.dsl.MongodbGridfsComponentBuilderFactory.MongodbGridfsComponentBuilder mongodbGridfs() {
return org.apache.camel.builder.component.dsl.MongodbGridfsComponentBuilderFactory.mongodbGridfs();
}
- /**
- * MSV (camel-msv)
- * Validate XML payloads using Multi-Schema Validator (MSV).
- *
- * Category: validation
- * Since: 1.1
- * Maven coordinates: org.apache.camel:camel-msv
- *
- * @return the dsl builder
- */
- @Deprecated
- static org.apache.camel.builder.component.dsl.MsvComponentBuilderFactory.MsvComponentBuilder msv() {
- return org.apache.camel.builder.component.dsl.MsvComponentBuilderFactory.msv();
- }
/**
* Mustache (camel-mustache)
* Transform messages using a Mustache template.
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MsvComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MsvComponentBuilderFactory.java
deleted file mode 100644
index 5de507faf8c..00000000000
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MsvComponentBuilderFactory.java
+++ /dev/null
@@ -1,153 +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.builder.component.dsl;
-
-import javax.annotation.Generated;
-import org.apache.camel.Component;
-import org.apache.camel.builder.component.AbstractComponentBuilder;
-import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.validator.msv.MsvComponent;
-
-/**
- * Validate XML payloads using Multi-Schema Validator (MSV).
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
-public interface MsvComponentBuilderFactory {
-
- /**
- * MSV (camel-msv)
- * Validate XML payloads using Multi-Schema Validator (MSV).
- *
- * Category: validation
- * Since: 1.1
- * Maven coordinates: org.apache.camel:camel-msv
- *
- * @return the dsl builder
- */
- @Deprecated
- static MsvComponentBuilder msv() {
- return new MsvComponentBuilderImpl();
- }
-
- /**
- * Builder for the MSV component.
- */
- interface MsvComponentBuilder extends ComponentBuilder<MsvComponent> {
- /**
- * Whether the producer should be started lazy (on the first message).
- * By starting lazy you can use this to allow CamelContext and routes to
- * startup in situations where a producer may otherwise fail during
- * starting and cause the route to fail being started. By deferring this
- * startup to be lazy then the startup failure can be handled during
- * routing messages via Camel's routing error handlers. Beware that when
- * the first message is processed then creating and starting the
- * producer may take a little time and prolong the total processing time
- * of the processing.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: producer
- *
- * @param lazyStartProducer the value to set
- * @return the dsl builder
- */
- default MsvComponentBuilder lazyStartProducer(boolean lazyStartProducer) {
- doSetProperty("lazyStartProducer", lazyStartProducer);
- return this;
- }
- /**
- * Whether autowiring is enabled. This is used for automatic autowiring
- * options (the option must be marked as autowired) by looking up in the
- * registry to find if there is a single instance of matching type,
- * which then gets configured on the component. This can be used for
- * automatic configuring JDBC data sources, JMS connection factories,
- * AWS Clients, etc.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: true
- * Group: advanced
- *
- * @param autowiredEnabled the value to set
- * @return the dsl builder
- */
- default MsvComponentBuilder autowiredEnabled(boolean autowiredEnabled) {
- doSetProperty("autowiredEnabled", autowiredEnabled);
- return this;
- }
- /**
- * To use a custom LSResourceResolver which depends on a dynamic
- * endpoint resource URI.
- *
- * The option is a:
- * <code>org.apache.camel.component.validator.ValidatorResourceResolverFactory</code> type.
- *
- * Group: advanced
- *
- * @param resourceResolverFactory the value to set
- * @return the dsl builder
- */
- default MsvComponentBuilder resourceResolverFactory(
- org.apache.camel.component.validator.ValidatorResourceResolverFactory resourceResolverFactory) {
- doSetProperty("resourceResolverFactory", resourceResolverFactory);
- return this;
- }
- /**
- * To use the javax.xml.validation.SchemaFactory.
- *
- * The option is a:
- * <code>javax.xml.validation.SchemaFactory</code> type.
- *
- * Group: advanced
- *
- * @param schemaFactory the value to set
- * @return the dsl builder
- */
- default MsvComponentBuilder schemaFactory(
- javax.xml.validation.SchemaFactory schemaFactory) {
- doSetProperty("schemaFactory", schemaFactory);
- return this;
- }
- }
-
- class MsvComponentBuilderImpl
- extends
- AbstractComponentBuilder<MsvComponent>
- implements
- MsvComponentBuilder {
- @Override
- protected MsvComponent buildConcreteComponent() {
- return new MsvComponent();
- }
- @Override
- protected boolean setPropertyOnComponent(
- Component component,
- String name,
- Object value) {
- switch (name) {
- case "lazyStartProducer": ((MsvComponent) component).setLazyStartProducer((boolean) value); return true;
- case "autowiredEnabled": ((MsvComponent) component).setAutowiredEnabled((boolean) value); return true;
- case "resourceResolverFactory": ((MsvComponent) component).setResourceResolverFactory((org.apache.camel.component.validator.ValidatorResourceResolverFactory) value); return true;
- case "schemaFactory": ((MsvComponent) component).setSchemaFactory((javax.xml.validation.SchemaFactory) value); return true;
- default: return false;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index 267225c175a..341b6b31bad 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -4987,28 +4987,6 @@
"producerOnly": false,
"lenientProperties": false
},
- "MsvComponentBuilderFactory": {
- "kind": "component",
- "name": "msv",
- "title": "MSV",
- "description": "Validate XML payloads using Multi-Schema Validator (MSV).",
- "deprecated": true,
- "firstVersion": "1.1.0",
- "label": "validation",
- "javaType": "org.apache.camel.component.validator.msv.MsvComponent",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel",
- "artifactId": "camel-msv",
- "version": "3.17.0-SNAPSHOT",
- "scheme": "msv",
- "extendsScheme": "",
- "syntax": "msv:resourceUri",
- "async": false,
- "api": false,
- "consumerOnly": false,
- "producerOnly": true,
- "lenientProperties": false
- },
"MustacheComponentBuilderFactory": {
"kind": "component",
"name": "mustache",
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b76265243c..0d4d895f76c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -254,8 +254,6 @@
<influx-guava-version>20.0</influx-guava-version>
<irclib-version>1.10</irclib-version>
<ironmq-version>3.0.5</ironmq-version>
- <isorelax-version>20090621</isorelax-version>
- <isorelax-jaxp-bridge-version>1.1</isorelax-jaxp-bridge-version>
<ivy-version>2.5.0</ivy-version>
<jackson-version>1.9.12</jackson-version>
<jackson2-version>2.13.2</jackson2-version>
@@ -402,7 +400,6 @@
<mockito-version>3.12.4</mockito-version>
<mongo-java-driver-version>4.5.0</mongo-java-driver-version>
<mongo-hadoop-version>1.5.0</mongo-hadoop-version>
- <msv-version>2013.6.1</msv-version>
<mustache-java-version>0.9.10</mustache-java-version>
<mvel-version>2.4.14.Final</mvel-version>
<mybatis-version>3.5.9</mybatis-version>
@@ -2004,11 +2001,6 @@
<artifactId>camel-mongodb</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-msv</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mustache</artifactId>