This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 6d5d87bef51460e8ac7f8c267355ab4ee5e898ef Author: Claus Ibsen <[email protected]> AuthorDate: Sun Jan 29 16:00:24 2023 +0100 camel-websocket was removed in v4 --- components-starter/camel-websocket-starter/pom.xml | 49 ---- .../src/main/docs/websocket.json | 133 ---------- .../WebsocketComponentAutoConfiguration.java | 78 ------ .../WebsocketComponentConfiguration.java | 271 --------------------- .../springboot/WebsocketComponentConverter.java | 66 ----- .../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 - tooling/camel-spring-boot-bom/pom.xml | 5 - tooling/camel-spring-boot-dependencies/pom.xml | 5 - 12 files changed, 859 deletions(-) diff --git a/components-starter/camel-websocket-starter/pom.xml b/components-starter/camel-websocket-starter/pom.xml deleted file mode 100644 index f6212bc8c95..00000000000 --- a/components-starter/camel-websocket-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>4.0.0-SNAPSHOT</version> - </parent> - <artifactId>camel-websocket-starter</artifactId> - <packaging>jar</packaging> - <name>Camel SB Starters :: WebSocket</name> - <description>Spring-Boot Starter for Camel WebSocket</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-websocket</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-websocket-starter/src/main/docs/websocket.json b/components-starter/camel-websocket-starter/src/main/docs/websocket.json deleted file mode 100644 index 247d3dcc820..00000000000 --- a/components-starter/camel-websocket-starter/src/main/docs/websocket.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "groups": [ - { - "name": "camel.component.websocket", - "type": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.customizer", - "type": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration", - "sourceMethod": "getCustomizer()" - } - ], - "properties": [ - { - "name": "camel.component.websocket.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.websocket.springboot.WebsocketComponentConfiguration", - "defaultValue": true - }, - { - "name": "camel.component.websocket.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.websocket.springboot.WebsocketComponentConfiguration", - "defaultValue": false - }, - { - "name": "camel.component.websocket.customizer.enabled", - "type": "java.lang.Boolean", - "sourceType": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties" - }, - { - "name": "camel.component.websocket.enable-jmx", - "type": "java.lang.Boolean", - "description": "If this option is true, Jetty JMX support will be enabled for this endpoint. See Jetty JMX support for more details.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration", - "defaultValue": false - }, - { - "name": "camel.component.websocket.enabled", - "type": "java.lang.Boolean", - "description": "Whether to enable auto configuration of the websocket component. This is enabled by default.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.host", - "type": "java.lang.String", - "description": "The hostname. The default value is 0.0.0.0", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration", - "defaultValue": "0.0.0.0" - }, - { - "name": "camel.component.websocket.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.websocket.springboot.WebsocketComponentConfiguration", - "defaultValue": false - }, - { - "name": "camel.component.websocket.max-threads", - "type": "java.lang.Integer", - "description": "To set a value for maximum number of threads in server thread pool. MaxThreads\/minThreads or threadPool fields are required due to switch to Jetty9. The default values for maxThreads is 1 2 noCores.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.min-threads", - "type": "java.lang.Integer", - "description": "To set a value for minimum number of threads in server thread pool. MaxThreads\/minThreads or threadPool fields are required due to switch to Jetty9. The default values for minThreads is 1.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.port", - "type": "java.lang.Integer", - "description": "The port number. The default value is 9292", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration", - "defaultValue": 9292 - }, - { - "name": "camel.component.websocket.ssl-context-parameters", - "type": "org.apache.camel.support.jsse.SSLContextParameters", - "description": "To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.ssl-key-password", - "type": "java.lang.String", - "description": "The password for the keystore when using SSL.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.ssl-keystore", - "type": "java.lang.String", - "description": "The path to the keystore.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.ssl-password", - "type": "java.lang.String", - "description": "The password when using SSL.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.static-resources", - "type": "java.lang.String", - "description": "Set a resource path for static resources (such as .html files etc). The resources can be loaded from classpath, if you prefix with classpath:, otherwise the resources is loaded from file system or from JAR files. For example to load from root classpath use classpath:., or classpath:WEB-INF\/static If not configured (eg null) then no static resource is in use.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.subprotocol", - "type": "java.lang.String", - "description": "This is a comma-separated list of subprotocols that are supported by the application. The list is in priority order. The first subprotocol on this list that is proposed by the client is the one that will be accepted. If no subprotocol on this list is proposed by the client, then the websocket connection is refused. The special value 'any' means that any subprotocol is acceptable. 'any' can be used on its own, or as a failsafe at the end of a list of more specific pr [...] - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration", - "defaultValue": "any" - }, - { - "name": "camel.component.websocket.thread-pool", - "type": "org.eclipse.jetty.util.thread.ThreadPool", - "description": "To use a custom thread pool for the server. MaxThreads\/minThreads or threadPool fields are required due to switch to Jetty9. The option is a org.eclipse.jetty.util.thread.ThreadPool type.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration" - }, - { - "name": "camel.component.websocket.use-global-ssl-context-parameters", - "type": "java.lang.Boolean", - "description": "Enable usage of global SSL context parameters.", - "sourceType": "org.apache.camel.component.websocket.springboot.WebsocketComponentConfiguration", - "defaultValue": false - } - ], - "hints": [] -} \ No newline at end of file diff --git a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java deleted file mode 100644 index a192f9a4af8..00000000000 --- a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java +++ /dev/null @@ -1,78 +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.websocket.springboot; - -import javax.annotation.Generated; -import org.apache.camel.CamelContext; -import org.apache.camel.Component; -import org.apache.camel.component.websocket.WebsocketComponent; -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! - */ -@Configuration(proxyBeanMethods = false) -@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class) -@EnableConfigurationProperties({ComponentConfigurationProperties.class,WebsocketComponentConfiguration.class}) -@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.websocket"}) -@AutoConfigureAfter({CamelAutoConfiguration.class, WebsocketComponentConverter.class}) -public class WebsocketComponentAutoConfiguration { - - @Autowired - private ApplicationContext applicationContext; - private final CamelContext camelContext; - @Autowired - private WebsocketComponentConfiguration configuration; - - public WebsocketComponentAutoConfiguration( - org.apache.camel.CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Lazy - @Bean - public ComponentCustomizer configureWebsocketComponent() { - 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.websocket.customizer") - && target instanceof WebsocketComponent; - } - }; - } -} \ No newline at end of file diff --git a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java deleted file mode 100644 index 537b4810de5..00000000000 --- a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java +++ /dev/null @@ -1,271 +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.websocket.springboot; - -import javax.annotation.Generated; -import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; -import org.apache.camel.support.jsse.SSLContextParameters; -import org.eclipse.jetty.util.thread.ThreadPool; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * Expose websocket endpoints using Jetty. - * - * Generated by camel-package-maven-plugin - do not edit this file! - */ -@ConfigurationProperties(prefix = "camel.component.websocket") -public class WebsocketComponentConfiguration - extends - ComponentConfigurationPropertiesCommon { - - /** - * Whether to enable auto configuration of the websocket component. This is - * enabled by default. - */ - private Boolean enabled; - /** - * The hostname. The default value is 0.0.0.0 - */ - private String host = "0.0.0.0"; - /** - * The port number. The default value is 9292 - */ - private Integer port = 9292; - /** - * 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; - /** - * Set a resource path for static resources (such as .html files etc). The - * resources can be loaded from classpath, if you prefix with classpath:, - * otherwise the resources is loaded from file system or from JAR files. For - * example to load from root classpath use classpath:., or - * classpath:WEB-INF/static If not configured (eg null) then no static - * resource is in use. - */ - private String staticResources; - /** - * 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; - /** - * If this option is true, Jetty JMX support will be enabled for this - * endpoint. See Jetty JMX support for more details. - */ - private Boolean enableJmx = false; - /** - * To set a value for maximum number of threads in server thread pool. - * MaxThreads/minThreads or threadPool fields are required due to switch to - * Jetty9. The default values for maxThreads is 1 2 noCores. - */ - private Integer maxThreads; - /** - * To set a value for minimum number of threads in server thread pool. - * MaxThreads/minThreads or threadPool fields are required due to switch to - * Jetty9. The default values for minThreads is 1. - */ - private Integer minThreads; - /** - * This is a comma-separated list of subprotocols that are supported by the - * application. The list is in priority order. The first subprotocol on this - * list that is proposed by the client is the one that will be accepted. If - * no subprotocol on this list is proposed by the client, then the websocket - * connection is refused. The special value 'any' means that any subprotocol - * is acceptable. 'any' can be used on its own, or as a failsafe at the end - * of a list of more specific protocols. 'any' will also match the case - * where no subprotocol is proposed by the client. - */ - private String subprotocol = "any"; - /** - * To use a custom thread pool for the server. MaxThreads/minThreads or - * threadPool fields are required due to switch to Jetty9. The option is a - * org.eclipse.jetty.util.thread.ThreadPool type. - */ - private ThreadPool threadPool; - /** - * To configure security using SSLContextParameters. The option is a - * org.apache.camel.support.jsse.SSLContextParameters type. - */ - private SSLContextParameters sslContextParameters; - /** - * The password for the keystore when using SSL. - */ - private String sslKeyPassword; - /** - * The path to the keystore. - */ - private String sslKeystore; - /** - * The password when using SSL. - */ - private String sslPassword; - /** - * Enable usage of global SSL context parameters. - */ - private Boolean useGlobalSslContextParameters = false; - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public Integer getPort() { - return port; - } - - public void setPort(Integer port) { - this.port = port; - } - - public Boolean getBridgeErrorHandler() { - return bridgeErrorHandler; - } - - public void setBridgeErrorHandler(Boolean bridgeErrorHandler) { - this.bridgeErrorHandler = bridgeErrorHandler; - } - - public String getStaticResources() { - return staticResources; - } - - public void setStaticResources(String staticResources) { - this.staticResources = staticResources; - } - - 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 Boolean getEnableJmx() { - return enableJmx; - } - - public void setEnableJmx(Boolean enableJmx) { - this.enableJmx = enableJmx; - } - - public Integer getMaxThreads() { - return maxThreads; - } - - public void setMaxThreads(Integer maxThreads) { - this.maxThreads = maxThreads; - } - - public Integer getMinThreads() { - return minThreads; - } - - public void setMinThreads(Integer minThreads) { - this.minThreads = minThreads; - } - - public String getSubprotocol() { - return subprotocol; - } - - public void setSubprotocol(String subprotocol) { - this.subprotocol = subprotocol; - } - - public ThreadPool getThreadPool() { - return threadPool; - } - - public void setThreadPool(ThreadPool threadPool) { - this.threadPool = threadPool; - } - - public SSLContextParameters getSslContextParameters() { - return sslContextParameters; - } - - public void setSslContextParameters( - SSLContextParameters sslContextParameters) { - this.sslContextParameters = sslContextParameters; - } - - public String getSslKeyPassword() { - return sslKeyPassword; - } - - public void setSslKeyPassword(String sslKeyPassword) { - this.sslKeyPassword = sslKeyPassword; - } - - public String getSslKeystore() { - return sslKeystore; - } - - public void setSslKeystore(String sslKeystore) { - this.sslKeystore = sslKeystore; - } - - public String getSslPassword() { - return sslPassword; - } - - public void setSslPassword(String sslPassword) { - this.sslPassword = sslPassword; - } - - public Boolean getUseGlobalSslContextParameters() { - return useGlobalSslContextParameters; - } - - public void setUseGlobalSslContextParameters( - Boolean useGlobalSslContextParameters) { - this.useGlobalSslContextParameters = useGlobalSslContextParameters; - } -} \ No newline at end of file diff --git a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConverter.java b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConverter.java deleted file mode 100644 index bcfd5cbf3b6..00000000000 --- a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConverter.java +++ /dev/null @@ -1,66 +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.websocket.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! - */ -@Configuration(proxyBeanMethods = false) -@ConfigurationPropertiesBinding -@Component -public class WebsocketComponentConverter implements GenericConverter { - - @Autowired - private ApplicationContext applicationContext; - - public Set<ConvertiblePair> getConvertibleTypes() { - Set<ConvertiblePair> answer = new LinkedHashSet<>(); - answer.add(new ConvertiblePair(String.class, org.eclipse.jetty.util.thread.ThreadPool.class)); - answer.add(new ConvertiblePair(String.class, org.apache.camel.support.jsse.SSLContextParameters.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.eclipse.jetty.util.thread.ThreadPool": return applicationContext.getBean(ref, org.eclipse.jetty.util.thread.ThreadPool.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; - } -} \ No newline at end of file diff --git a/components-starter/camel-websocket-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-websocket-starter/src/main/resources/META-INF/LICENSE.txt deleted file mode 100644 index 6b0b1270ff0..00000000000 --- a/components-starter/camel-websocket-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-websocket-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-websocket-starter/src/main/resources/META-INF/NOTICE.txt deleted file mode 100644 index 2e215bf2e6b..00000000000 --- a/components-starter/camel-websocket-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-websocket-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-websocket-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ff613e8a09a..00000000000 --- a/components-starter/camel-websocket-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.websocket.springboot.WebsocketComponentAutoConfiguration,\ -org.apache.camel.component.websocket.springboot.WebsocketComponentConverter - diff --git a/components-starter/camel-websocket-starter/src/main/resources/META-INF/spring.provides b/components-starter/camel-websocket-starter/src/main/resources/META-INF/spring.provides deleted file mode 100644 index de6d2162d44..00000000000 --- a/components-starter/camel-websocket-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-websocket diff --git a/components-starter/pom.xml b/components-starter/pom.xml index 84a37a8939d..2b3bd2176c1 100644 --- a/components-starter/pom.xml +++ b/components-starter/pom.xml @@ -412,7 +412,6 @@ <module>camel-weather-starter</module> <module>camel-web3j-starter</module> <module>camel-webhook-starter</module> - <module>camel-websocket-starter</module> <module>camel-weka-starter</module> <module>camel-wordpress-starter</module> <module>camel-workday-starter</module> diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml index ba6da6b4dac..db0abd4d4cf 100644 --- a/tooling/camel-spring-boot-bom/pom.xml +++ b/tooling/camel-spring-boot-bom/pom.xml @@ -1618,11 +1618,6 @@ <artifactId>camel-webhook-starter</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.springboot</groupId> - <artifactId>camel-websocket-starter</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-weka-starter</artifactId> diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 85967c3dd92..039665b3b8b 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -1842,11 +1842,6 @@ <artifactId>camel-webhook-starter</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.springboot</groupId> - <artifactId>camel-websocket-starter</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-weka-starter</artifactId>
