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-spring-boot.git
commit b8c0e00847514febedd991b4a3f1459d37d37c19 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Wed Jan 4 14:34:01 2023 +0100 CAMEL-18496: remove deprecated component camel-cmis --- .../camel/springboot/catalog/components.properties | 3 +- .../camel/springboot/catalog/components/cmis.json | 63 ------- components-starter/camel-cmis-starter/pom.xml | 49 ----- .../camel-cmis-starter/src/main/docs/cmis.json | 56 ------ .../springboot/CMISComponentAutoConfiguration.java | 79 -------- .../springboot/CMISComponentConfiguration.java | 108 ----------- .../cmis/springboot/CMISComponentConverter.java | 65 ------- .../src/main/resources/META-INF/LICENSE.txt | 203 --------------------- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../src/main/resources/META-INF/spring.factories | 20 -- .../src/main/resources/META-INF/spring.provides | 17 -- components-starter/pom.xml | 1 - .../camel/itest/springboot/CamelCmisTest.java | 51 ------ tooling/camel-spring-boot-bom/pom.xml | 5 - tooling/camel-spring-boot-dependencies/pom.xml | 5 - 15 files changed, 1 insertion(+), 735 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties index 7748bebb876..d4290624406 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties @@ -53,7 +53,6 @@ chatscript chunk class cm-sms -cmis coap coap+tcp coaps @@ -349,4 +348,4 @@ xslt xslt-saxon zendesk zookeeper -zookeeper-master \ No newline at end of file +zookeeper-master diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cmis.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cmis.json deleted file mode 100644 index 3ea430069db..00000000000 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cmis.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "component": { - "kind": "component", - "name": "cmis", - "title": "CMIS", - "description": "Read and write data from to\/from a CMIS compliant content repositories.", - "deprecated": true, - "firstVersion": "2.11.0", - "label": "cms,database", - "javaType": "org.apache.camel.component.cmis.CMISComponent", - "supportLevel": "Stable", - "groupId": "org.apache.camel.springboot", - "artifactId": "camel-cmis-starter", - "version": "3.21.0-SNAPSHOT", - "scheme": "cmis", - "extendsScheme": "", - "syntax": "cmis:cmsUrl", - "async": false, - "api": false, - "consumerOnly": false, - "producerOnly": false, - "lenientProperties": false - }, - "componentProperties": { - "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...] - "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 [...] - "sessionFacadeFactory": { "kind": "property", "displayName": "Session Facade Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.cmis.CMISSessionFacadeFactory", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances" } - }, - "headers": { - "cmis:action": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.apache.camel.component.cmis.CamelCMISActions", "enum": [ "CREATE", "DELETE_DOCUMENT", "DELETE_FOLDER", "MOVE_DOCUMENT", "MOVE_FOLDER", "COPY_DOCUMENT", "COPY_FOLDER", "RENAME", "CHECK_IN", "CHECK_OUT", "CANCEL_CHECK_OUT", "GET_FOLDER", "LIST_FOLDER", "FIND_OBJECT_BY_ID", "FIND_OBJECT_BY_PATH", "CREATE_FOLDER_BY_PATH", "DOWNLOAD_DOCUMENT" ], "deprecated": [...] - "cmis:path": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If CamelCMISFolderPath is not set, will try to find out the path of the node from this cmis property and it is name", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#PATH" }, - "cmis:name": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If CamelCMISFolderPath is not set, will try to find out the path of the node from this cmis property and it is path", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#NAME" }, - "cmis:objectTypeId": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of the node", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#OBJECT_TYPE_ID" }, - "cmis:checkinComment": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The check-in comment for the document version", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CHECKIN_COMMENT" }, - "cmis:contentStreamMimeType": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The mimetype to set for a document", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CONTENT_STREAM_MIME_TYPE" }, - "CamelCMISFolderPath": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "\/", "description": "The current folder to use during the execution. If not specified will use the root folder", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CMIS_FOLDER_PATH" }, - "CamelCMISObjectId": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The id of the object", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CMIS_OBJECT_ID" }, - "CamelCMISDestinationFolderId": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The id of the destination folder", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CMIS_DESTIONATION_FOLDER_ID" }, - "CamelCMISSourceFolderId": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The id of the source folder", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CMIS_SOURCE_FOLDER_ID" }, - "CamelCMISResultCount": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Number of nodes returned from the query", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CAMEL_CMIS_RESULT_COUNT" }, - "CamelCMISRetrieveContent": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "In queryMode this header will force the producer to retrieve the content of document nodes.", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CAMEL_CMIS_RETRIEVE_CONTENT" }, - "CamelCMISReadSize": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Max number of nodes to read.", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#CAMEL_CMIS_READ_SIZE" }, - "CamelCMISAllVersions": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Apply only to this version (false) or all versions (true)", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#ALL_VERSIONS" }, - "cmis:versioningState": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The versioning state", "constantName": "org.apache.camel.component.cmis.CamelCMISConstants#VERSIONING_STATE" } - }, - "properties": { - "cmsUrl": { "kind": "path", "displayName": "Cms Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "URL to the cmis repository" }, - "pageSize": { "kind": "parameter", "displayName": "Page Size", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 100, "configurationClass": "org.apache.camel.component.cmis.CMISSessionFacade", "configurationField": "sessionFacade", "description": "Number of nodes to retrieve per page" }, - "readContent": { "kind": "parameter", "displayName": "Read Content", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.cmis.CMISSessionFacade", "configurationField": "sessionFacade", "description": "If set to true, the content of document node will be retrieved in addition to the properties" }, - "readCount": { "kind": "parameter", "displayName": "Read Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.cmis.CMISSessionFacade", "configurationField": "sessionFacade", "description": "Max number of nodes to read" }, - "repositoryId": { "kind": "parameter", "displayName": "Repository Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.cmis.CMISSessionFacade", "configurationField": "sessionFacade", "description": "The Id of the repository to use. If not specified the first available repository is used" }, - "query": { "kind": "parameter", "displayName": "Query", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.cmis.CMISSessionFacade", "configurationField": "sessionFacade", "description": "The cmis query to execute against the repository. If not specified, the consumer will retrieve every node from the content repository [...] - "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...] - "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...] - "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." }, - "queryMode": { "kind": "parameter", "displayName": "Query Mode", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If true, will execute the cmis query from the message body and return result, otherwise will create a node in the cmis repository" }, - "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "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 other [...] - "sessionFacadeFactory": { "kind": "parameter", "displayName": "Session Facade Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.cmis.CMISSessionFacadeFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances" }, - "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.cmis.CMISSessionFacade", "configurationField": "sessionFacade", "description": "Password for the cmis repository" }, - "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.cmis.CMISSessionFacade", "configurationField": "sessionFacade", "description": "Username for the cmis repository" } - } -} diff --git a/components-starter/camel-cmis-starter/pom.xml b/components-starter/camel-cmis-starter/pom.xml deleted file mode 100644 index 73b11de172f..00000000000 --- a/components-starter/camel-cmis-starter/pom.xml +++ /dev/null @@ -1,49 +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.springboot</groupId> - <artifactId>components-starter</artifactId> - <version>3.21.0-SNAPSHOT</version> - </parent> - <artifactId>camel-cmis-starter</artifactId> - <packaging>jar</packaging> - <name>Camel SB Starters :: CMIS</name> - <description>Spring-Boot Starter for Camel CMIS which is based on Apache Chemistry support</description> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-cmis</artifactId> - <version>${camel-version}</version> - </dependency> - <!--START OF GENERATED CODE--> - <dependency> - <groupId>org.apache.camel.springboot</groupId> - <artifactId>camel-core-starter</artifactId> - </dependency> - <!--END OF GENERATED CODE--> - </dependencies> -</project> diff --git a/components-starter/camel-cmis-starter/src/main/docs/cmis.json b/components-starter/camel-cmis-starter/src/main/docs/cmis.json deleted file mode 100644 index 4ede0a708bf..00000000000 --- a/components-starter/camel-cmis-starter/src/main/docs/cmis.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "groups": [ - { - "name": "camel.component.cmis", - "type": "org.apache.camel.component.cmis.springboot.CMISComponentConfiguration", - "sourceType": "org.apache.camel.component.cmis.springboot.CMISComponentConfiguration" - }, - { - "name": "camel.component.cmis.customizer", - "type": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties", - "sourceType": "org.apache.camel.component.cmis.springboot.CMISComponentConfiguration", - "sourceMethod": "getCustomizer()" - } - ], - "properties": [ - { - "name": "camel.component.cmis.autowired-enabled", - "type": "java.lang.Boolean", - "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.", - "sourceType": "org.apache.camel.component.cmis.springboot.CMISComponentConfiguration", - "defaultValue": true - }, - { - "name": "camel.component.cmis.bridge-error-handler", - "type": "java.lang.Boolean", - "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.", - "sourceType": "org.apache.camel.component.cmis.springboot.CMISComponentConfiguration", - "defaultValue": false - }, - { - "name": "camel.component.cmis.customizer.enabled", - "type": "java.lang.Boolean", - "sourceType": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties" - }, - { - "name": "camel.component.cmis.enabled", - "type": "java.lang.Boolean", - "description": "Whether to enable auto configuration of the cmis component. This is enabled by default.", - "sourceType": "org.apache.camel.component.cmis.springboot.CMISComponentConfiguration" - }, - { - "name": "camel.component.cmis.lazy-start-producer", - "type": "java.lang.Boolean", - "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 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 [...] - "sourceType": "org.apache.camel.component.cmis.springboot.CMISComponentConfiguration", - "defaultValue": false - }, - { - "name": "camel.component.cmis.session-facade-factory", - "type": "org.apache.camel.component.cmis.CMISSessionFacadeFactory", - "description": "To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances. The option is a org.apache.camel.component.cmis.CMISSessionFacadeFactory type.", - "sourceType": "org.apache.camel.component.cmis.springboot.CMISComponentConfiguration" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentAutoConfiguration.java b/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentAutoConfiguration.java deleted file mode 100644 index 8bd611f8071..00000000000 --- a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentAutoConfiguration.java +++ /dev/null @@ -1,79 +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.cmis.springboot; - -import javax.annotation.Generated; -import org.apache.camel.CamelContext; -import org.apache.camel.Component; -import org.apache.camel.component.cmis.CMISComponent; -import org.apache.camel.spi.ComponentCustomizer; -import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.spring.boot.ComponentConfigurationProperties; -import org.apache.camel.spring.boot.util.CamelPropertiesHelper; -import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; -import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties; -import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Conditional; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Lazy; - -/** - * Generated by camel-package-maven-plugin - do not edit this file! - */ -@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo") -@Configuration(proxyBeanMethods = false) -@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class) -@EnableConfigurationProperties({ComponentConfigurationProperties.class,CMISComponentConfiguration.class}) -@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cmis"}) -@AutoConfigureAfter({CamelAutoConfiguration.class, CMISComponentConverter.class}) -public class CMISComponentAutoConfiguration { - - @Autowired - private ApplicationContext applicationContext; - private final CamelContext camelContext; - @Autowired - private CMISComponentConfiguration configuration; - - public CMISComponentAutoConfiguration( - org.apache.camel.CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Lazy - @Bean - public ComponentCustomizer configureCMISComponent() { - return new ComponentCustomizer() { - @Override - public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(camelContext, configuration, target); - } - @Override - public boolean isEnabled(String name, Component target) { - return HierarchicalPropertiesEvaluator.evaluate( - applicationContext, - "camel.component.customizer", - "camel.component.cmis.customizer") - && target instanceof CMISComponent; - } - }; - } -} \ No newline at end of file diff --git a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConfiguration.java b/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConfiguration.java deleted file mode 100644 index c9e9439c9a8..00000000000 --- a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConfiguration.java +++ /dev/null @@ -1,108 +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.cmis.springboot; - -import javax.annotation.Generated; -import org.apache.camel.component.cmis.CMISSessionFacadeFactory; -import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * Read and write data from to/from a CMIS compliant content repositories. - * - * Generated by camel-package-maven-plugin - do not edit this file! - */ -@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo") -@ConfigurationProperties(prefix = "camel.component.cmis") -public class CMISComponentConfiguration - extends - ComponentConfigurationPropertiesCommon { - - /** - * Whether to enable auto configuration of the cmis component. This is - * enabled by default. - */ - private Boolean enabled; - /** - * Allows for bridging the consumer to the Camel routing Error Handler, - * which mean any exceptions occurred while the consumer is trying to pickup - * incoming messages, or the likes, will now be processed as a message and - * handled by the routing Error Handler. By default the consumer will use - * the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that - * will be logged at WARN or ERROR level and ignored. - */ - private Boolean bridgeErrorHandler = false; - /** - * 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. - */ - private Boolean lazyStartProducer = false; - /** - * 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. - */ - private Boolean autowiredEnabled = true; - /** - * To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade - * instances. The option is a - * org.apache.camel.component.cmis.CMISSessionFacadeFactory type. - */ - private CMISSessionFacadeFactory sessionFacadeFactory; - - public Boolean getBridgeErrorHandler() { - return bridgeErrorHandler; - } - - public void setBridgeErrorHandler(Boolean bridgeErrorHandler) { - this.bridgeErrorHandler = bridgeErrorHandler; - } - - public Boolean getLazyStartProducer() { - return lazyStartProducer; - } - - public void setLazyStartProducer(Boolean lazyStartProducer) { - this.lazyStartProducer = lazyStartProducer; - } - - public Boolean getAutowiredEnabled() { - return autowiredEnabled; - } - - public void setAutowiredEnabled(Boolean autowiredEnabled) { - this.autowiredEnabled = autowiredEnabled; - } - - public CMISSessionFacadeFactory getSessionFacadeFactory() { - return sessionFacadeFactory; - } - - public void setSessionFacadeFactory( - CMISSessionFacadeFactory sessionFacadeFactory) { - this.sessionFacadeFactory = sessionFacadeFactory; - } -} \ No newline at end of file diff --git a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConverter.java b/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConverter.java deleted file mode 100644 index 581bc33ae99..00000000000 --- a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConverter.java +++ /dev/null @@ -1,65 +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.cmis.springboot; - -import java.util.LinkedHashSet; -import java.util.Set; -import javax.annotation.Generated; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.convert.TypeDescriptor; -import org.springframework.core.convert.converter.GenericConverter; -import org.springframework.stereotype.Component; - -/** - * Generated by camel-package-maven-plugin - do not edit this file! - */ -@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo") -@Configuration(proxyBeanMethods = false) -@ConfigurationPropertiesBinding -@Component -public class CMISComponentConverter implements GenericConverter { - - @Autowired - private ApplicationContext applicationContext; - - public Set<ConvertiblePair> getConvertibleTypes() { - Set<ConvertiblePair> answer = new LinkedHashSet<>(); - answer.add(new ConvertiblePair(String.class, org.apache.camel.component.cmis.CMISSessionFacadeFactory.class)); - return answer; - } - - public Object convert( - Object source, - TypeDescriptor sourceType, - TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.cmis.CMISSessionFacadeFactory": return applicationContext.getBean(ref, org.apache.camel.component.cmis.CMISSessionFacadeFactory.class); - } - return null; - } -} \ No newline at end of file diff --git a/components-starter/camel-cmis-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-cmis-starter/src/main/resources/META-INF/LICENSE.txt deleted file mode 100644 index 6b0b1270ff0..00000000000 --- a/components-starter/camel-cmis-starter/src/main/resources/META-INF/LICENSE.txt +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. - diff --git a/components-starter/camel-cmis-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-cmis-starter/src/main/resources/META-INF/NOTICE.txt deleted file mode 100644 index 2e215bf2e6b..00000000000 --- a/components-starter/camel-cmis-starter/src/main/resources/META-INF/NOTICE.txt +++ /dev/null @@ -1,11 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to the section 4 d of == - == the Apache License, Version 2.0, == - == in this case for the Apache Camel distribution. == - ========================================================================= - - This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). - - Please read the different LICENSE files present in the licenses directory of - this distribution. diff --git a/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index f33553aa3a6..00000000000 --- a/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,20 +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. -## --------------------------------------------------------------------------- -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.apache.camel.component.cmis.springboot.CMISComponentAutoConfiguration,\ -org.apache.camel.component.cmis.springboot.CMISComponentConverter - diff --git a/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.provides b/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.provides deleted file mode 100644 index 5bfd0072e8f..00000000000 --- a/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1,17 +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. -## --------------------------------------------------------------------------- -provides: camel-cmis diff --git a/components-starter/pom.xml b/components-starter/pom.xml index 8a51912d1df..b5347ab711f 100644 --- a/components-starter/pom.xml +++ b/components-starter/pom.xml @@ -168,7 +168,6 @@ <module>camel-chunk-starter</module> <module>camel-cloudevents-starter</module> <module>camel-cm-sms-starter</module> - <module>camel-cmis-starter</module> <module>camel-coap-starter</module> <module>camel-cometd-starter</module> <module>camel-console-starter</module> diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCmisTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCmisTest.java deleted file mode 100644 index fcd6feb8d77..00000000000 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCmisTest.java +++ /dev/null @@ -1,51 +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.itest.springboot; - -import org.apache.camel.itest.springboot.util.ArquillianPackager; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit5.ArquillianExtension; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - - -@ExtendWith(ArquillianExtension.class) -public class CamelCmisTest extends AbstractSpringBootTestSupport { - - @Deployment - public static Archive<?> createSpringBootPackage() throws Exception { - ITestConfig config = createTestConfig(); - //ArquillianPackager.copyResource(config.getModulesPath() + config.getModuleName() + "/target/dependency/", "chemistry-opencmis-server-inmemory-.*\\.war", "target/dependency/"); - - return ArquillianPackager.springBootPackage(config); - } - - public static ITestConfig createTestConfig() { - return new ITestConfigBuilder() - .module(inferModuleName(CamelCmisTest.class)) - .build(); - } - - @Test - public void componentTests() throws Exception { - this.runComponentTest(config); - this.runModuleUnitTestsIfEnabled(config); - } - - -} diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml index a17154b4283..b95295832ae 100644 --- a/tooling/camel-spring-boot-bom/pom.xml +++ b/tooling/camel-spring-boot-bom/pom.xml @@ -333,11 +333,6 @@ <artifactId>camel-cm-sms-starter</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.springboot</groupId> - <artifactId>camel-cmis-starter</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-coap-starter</artifactId> diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 8537ac32f0a..243e8a409fa 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -546,11 +546,6 @@ <artifactId>camel-cm-sms-starter</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.springboot</groupId> - <artifactId>camel-cmis-starter</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-coap-starter</artifactId>
