You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/26 14:42:21 UTC
[camel] branch master updated (312d281 -> 428dd25)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 312d281 CAMEL-14795: camel-mail - allow dynamic setting of token in order to be able to (#3683)
new 9140deb CAMEL-14175 - Removed Camel-Paxlogging now in camel-karaf (camel-karaf migration)
new 428dd25 CAMEL-14175 - Removed Camel-Paxlogging now in camel-karaf (camel-karaf migration) - docs
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-camel/src/main/descriptors/common-bin.xml | 1 -
bom/camel-bom/pom.xml | 5 -
components/camel-paxlogging/pom.xml | 75 ------
.../paxlogging/PaxLoggingComponentConfigurer.java | 55 -----
.../paxlogging/PaxLoggingEndpointConfigurer.java | 63 ------
.../services/org/apache/camel/component.properties | 7 -
.../services/org/apache/camel/component/paxlogging | 2 -
.../apache/camel/configurer/paxlogging-component | 2 -
.../apache/camel/configurer/paxlogging-endpoint | 2 -
.../camel/component/paxlogging/paxlogging.json | 34 ---
.../src/main/docs/paxlogging-component.adoc | 113 ----------
.../component/paxlogging/PaxLoggingComponent.java | 59 -----
.../component/paxlogging/PaxLoggingConsumer.java | 104 ---------
.../component/paxlogging/PaxLoggingEndpoint.java | 75 ------
components/pom.xml | 1 -
core/camel-allcomponents/pom.xml | 4 -
.../component/ComponentsBuilderFactory.java | 12 -
.../dsl/PaxloggingComponentBuilderFactory.java | 122 ----------
.../src/generated/resources/metadata.json | 20 --
.../builder/endpoint/EndpointBuilderFactory.java | 1 -
.../camel/builder/endpoint/EndpointBuilders.java | 1 -
.../dsl/PaxLoggingEndpointBuilderFactory.java | 251 ---------------------
docs/components/modules/ROOT/nav.adoc | 1 -
docs/components/modules/ROOT/pages/index.adoc | 2 -
.../modules/ROOT/pages/paxlogging-component.adoc | 114 ----------
docs/user-manual/modules/ROOT/pages/index.adoc | 1 -
parent/pom.xml | 5 -
27 files changed, 1132 deletions(-)
delete mode 100644 components/camel-paxlogging/pom.xml
delete mode 100644 components/camel-paxlogging/src/generated/java/org/apache/camel/component/paxlogging/PaxLoggingComponentConfigurer.java
delete mode 100644 components/camel-paxlogging/src/generated/java/org/apache/camel/component/paxlogging/PaxLoggingEndpointConfigurer.java
delete mode 100644 components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component.properties
delete mode 100644 components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component/paxlogging
delete mode 100644 components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/configurer/paxlogging-component
delete mode 100644 components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/configurer/paxlogging-endpoint
delete mode 100644 components/camel-paxlogging/src/generated/resources/org/apache/camel/component/paxlogging/paxlogging.json
delete mode 100644 components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
delete mode 100644 components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java
delete mode 100644 components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
delete mode 100644 components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
delete mode 100644 core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PaxloggingComponentBuilderFactory.java
delete mode 100644 core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
delete mode 100644 docs/components/modules/ROOT/pages/paxlogging-component.adoc
[camel] 02/02: CAMEL-14175 - Removed Camel-Paxlogging now in
camel-karaf (camel-karaf migration) - docs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 428dd255544c3907b5bd958fbf4ef3ca2ac7e5e7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 26 15:37:05 2020 +0100
CAMEL-14175 - Removed Camel-Paxlogging now in camel-karaf (camel-karaf migration) - docs
---
.../component/ComponentsBuilderFactory.java | 12 ---
.../src/generated/resources/metadata.json | 20 ----
.../builder/endpoint/EndpointBuilderFactory.java | 1 -
.../camel/builder/endpoint/EndpointBuilders.java | 1 -
docs/components/modules/ROOT/nav.adoc | 1 -
docs/components/modules/ROOT/pages/index.adoc | 2 -
.../modules/ROOT/pages/paxlogging-component.adoc | 114 ---------------------
docs/user-manual/modules/ROOT/pages/index.adoc | 1 -
8 files changed, 152 deletions(-)
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 8cfd0d4..8b63717 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -2965,18 +2965,6 @@ public interface ComponentsBuilderFactory {
return org.apache.camel.builder.component.dsl.PahoComponentBuilderFactory.paho();
}
/**
- * OSGi PAX Logging (camel-paxlogging)
- * The paxlogging component can be used in an OSGi environment to receive
- * PaxLogging events and process them.
- *
- * Category: monitoring
- * Since: 2.6
- * Maven coordinates: org.apache.camel:camel-paxlogging
- */
- static org.apache.camel.builder.component.dsl.PaxloggingComponentBuilderFactory.PaxloggingComponentBuilder paxlogging() {
- return org.apache.camel.builder.component.dsl.PaxloggingComponentBuilderFactory.paxlogging();
- }
- /**
* PDF (camel-pdf)
* The pdf components provides the ability to create, modify or extract
* content from PDF documents.
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index af8d730..ab19641 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -5039,26 +5039,6 @@
"artifactId": "camel-paho",
"version": "3.2.0-SNAPSHOT"
},
- "PaxloggingComponentBuilderFactory": {
- "kind": "component",
- "scheme": "paxlogging",
- "extendsScheme": "",
- "syntax": "paxlogging:appender",
- "title": "OSGi PAX Logging",
- "description": "The paxlogging component can be used in an OSGi environment to receive PaxLogging events and process them.",
- "label": "monitoring",
- "deprecated": false,
- "deprecationNote": "monitoring",
- "async": false,
- "consumerOnly": true,
- "producerOnly": false,
- "lenientProperties": false,
- "javaType": "org.apache.camel.component.paxlogging.PaxLoggingComponent",
- "firstVersion": "2.6.0",
- "groupId": "org.apache.camel",
- "artifactId": "camel-paxlogging",
- "version": "3.2.0-SNAPSHOT"
- },
"PdfComponentBuilderFactory": {
"kind": "component",
"scheme": "pdf",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index 9927db2..9c0c062 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -260,7 +260,6 @@ public interface EndpointBuilderFactory
org.apache.camel.builder.endpoint.dsl.OpenshiftBuildsEndpointBuilderFactory.OpenshiftBuildsBuilders,
org.apache.camel.builder.endpoint.dsl.OptaPlannerEndpointBuilderFactory.OptaPlannerBuilders,
org.apache.camel.builder.endpoint.dsl.PahoEndpointBuilderFactory.PahoBuilders,
- org.apache.camel.builder.endpoint.dsl.PaxLoggingEndpointBuilderFactory.PaxLoggingBuilders,
org.apache.camel.builder.endpoint.dsl.PdfEndpointBuilderFactory.PdfBuilders,
org.apache.camel.builder.endpoint.dsl.PgEventEndpointBuilderFactory.PgEventBuilders,
org.apache.camel.builder.endpoint.dsl.PgReplicationSlotEndpointBuilderFactory.PgReplicationSlotBuilders,
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index bac0929..fa406d7 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -257,7 +257,6 @@ public interface EndpointBuilders
org.apache.camel.builder.endpoint.dsl.OpenshiftBuildsEndpointBuilderFactory,
org.apache.camel.builder.endpoint.dsl.OptaPlannerEndpointBuilderFactory,
org.apache.camel.builder.endpoint.dsl.PahoEndpointBuilderFactory,
- org.apache.camel.builder.endpoint.dsl.PaxLoggingEndpointBuilderFactory,
org.apache.camel.builder.endpoint.dsl.PdfEndpointBuilderFactory,
org.apache.camel.builder.endpoint.dsl.PgEventEndpointBuilderFactory,
org.apache.camel.builder.endpoint.dsl.PgReplicationSlotEndpointBuilderFactory,
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index c56b23c..6c22598 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -268,7 +268,6 @@
** xref:optaplanner-component.adoc[OptaPlanner Component]
** xref:osgi-activator.adoc[OSGi Camel Routes Activator]
** xref:eventadmin-component.adoc[OSGi EventAdmin Component]
-** xref:paxlogging-component.adoc[OSGi PAX Logging Component]
** xref:paho-component.adoc[Paho Component]
** xref:pdf-component.adoc[PDF Component]
** xref:platform-http-component.adoc[Platform HTTP Component]
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index 22fb0a6..1430c41 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -503,8 +503,6 @@ Number of Components: 331 in 264 JAR artifacts (1 deprecated)
| xref:eventadmin-component.adoc[OSGi EventAdmin] (camel-eventadmin) | 2.6 | The eventadmin component can be used in an OSGi environment to receive OSGi EventAdmin events and process them.
-| xref:paxlogging-component.adoc[OSGi PAX Logging] (camel-paxlogging) | 2.6 | The paxlogging component can be used in an OSGi environment to receive PaxLogging events and process them.
-
| xref:paho-component.adoc[Paho] (camel-paho) | 2.16 | Component for communicating with MQTT message brokers using Eclipse Paho MQTT Client.
| xref:pdf-component.adoc[PDF] (camel-pdf) | 2.16 | The pdf components provides the ability to create, modify or extract content from PDF documents.
diff --git a/docs/components/modules/ROOT/pages/paxlogging-component.adoc b/docs/components/modules/ROOT/pages/paxlogging-component.adoc
deleted file mode 100644
index f469cd9..0000000
--- a/docs/components/modules/ROOT/pages/paxlogging-component.adoc
+++ /dev/null
@@ -1,114 +0,0 @@
-[[paxlogging-component]]
-= OSGi PAX Logging Component
-:page-source: components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
-
-*Since Camel 2.6*
-
-// HEADER START
-*Only consumer is supported*
-// HEADER END
-
-The PAX Logging component can be used in an OSGi environment to receive
-http://wiki.ops4j.org/display/paxlogging/Pax+Logging[PaxLogging] events
-and process them.
-
-== Dependencies
-
-Maven users need to add the following dependency to their `pom.xml`
-
-[source,xml]
--------------------------------------------
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-paxlogging</artifactId>
- <version>${camel-version}</version>
-</dependency>
--------------------------------------------
-
-where `${camel-version`} must be replaced by the actual version of Camel.
-
-== URI format
-
-[source,xml]
------------------------------
-paxlogging:appender[?options]
------------------------------
-
-where `appender` is the name of the pax appender that need to be
-configured in the PaxLogging service configuration.
-
-== URI options
-
-
-
-// component options: START
-The OSGi PAX Logging component supports 3 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *bridgeErrorHandler* (consumer) | 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. | false | boolean
-| *bundleContext* (consumer) | The OSGi BundleContext is automatic injected by Camel | | BundleContext
-| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-|===
-// component options: END
-
-
-
-
-// endpoint options: START
-The OSGi PAX Logging endpoint is configured using URI syntax:
-
-----
-paxlogging:appender
-----
-
-with the following path and query parameters:
-
-=== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *appender* | *Required* Appender is the name of the pax appender that need to be configured in the PaxLogging service configuration. | | String
-|===
-
-
-=== Query Parameters (5 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *bridgeErrorHandler* (consumer) | 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. | false | boolean
-| *exceptionHandler* (consumer) | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
-| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. The value can be one of: InOnly, InOut, InOptionalOut | | ExchangePattern
-| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-|===
-// endpoint options: END
-
-
-== Message body
-
-The `in` message body will be set to the received PaxLoggingEvent.
-
-== Example usage
-
-[source,xml]
-----------------------------------
-<route>
- <from uri="paxlogging:camel"/>
- <to uri="stream:out"/>
-</route>
-----------------------------------
-
-Configuration:
-
-[source,java]
-----------------------------------------------------------
-log4j.rootLogger=INFO, out, osgi:VmLogAppender, osgi:camel
-----------------------------------------------------------
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index 5b741cf..61acc5d 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -359,7 +359,6 @@ camel routes without them knowing
** xref:components::openstack-swift-component.adoc[OpenStack Swift]
** xref:components::optaplanner-component.adoc[OptaPlanner]
** xref:components::eventadmin-component.adoc[OSGi EventAdmin]
-** xref:components::paxlogging-component.adoc[OSGi PAX Logging]
** xref:components::paho-component.adoc[Paho]
** xref:components::pdf-component.adoc[PDF]
** xref:components::pgevent-component.adoc[PostgresSQL Event]
[camel] 01/02: CAMEL-14175 - Removed Camel-Paxlogging now in
camel-karaf (camel-karaf migration)
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9140deb76dfc0a7fae39492e4171552a4eb15926
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 26 15:01:25 2020 +0100
CAMEL-14175 - Removed Camel-Paxlogging now in camel-karaf (camel-karaf migration)
---
apache-camel/src/main/descriptors/common-bin.xml | 1 -
bom/camel-bom/pom.xml | 5 -
components/camel-paxlogging/pom.xml | 75 ------
.../paxlogging/PaxLoggingComponentConfigurer.java | 55 -----
.../paxlogging/PaxLoggingEndpointConfigurer.java | 63 ------
.../services/org/apache/camel/component.properties | 7 -
.../services/org/apache/camel/component/paxlogging | 2 -
.../apache/camel/configurer/paxlogging-component | 2 -
.../apache/camel/configurer/paxlogging-endpoint | 2 -
.../camel/component/paxlogging/paxlogging.json | 34 ---
.../src/main/docs/paxlogging-component.adoc | 113 ----------
.../component/paxlogging/PaxLoggingComponent.java | 59 -----
.../component/paxlogging/PaxLoggingConsumer.java | 104 ---------
.../component/paxlogging/PaxLoggingEndpoint.java | 75 ------
components/pom.xml | 1 -
core/camel-allcomponents/pom.xml | 4 -
.../dsl/PaxloggingComponentBuilderFactory.java | 122 ----------
.../dsl/PaxLoggingEndpointBuilderFactory.java | 251 ---------------------
parent/pom.xml | 5 -
19 files changed, 980 deletions(-)
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 1c3aaba0..8ef6424 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -282,7 +282,6 @@
<include>org.apache.camel:camel-optaplanner</include>
<include>org.apache.camel:camel-osgi-activator</include>
<include>org.apache.camel:camel-paho</include>
- <include>org.apache.camel:camel-paxlogging</include>
<include>org.apache.camel:camel-pdf</include>
<include>org.apache.camel:camel-pg-replication-slot</include>
<include>org.apache.camel:camel-pgevent</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index aef7328..0f0f63d 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1345,11 +1345,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-paxlogging</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-pdf</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml
deleted file mode 100644
index 5a1f06f..0000000
--- a/components/camel-paxlogging/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-paxlogging</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: Pax Logging</name>
- <description>Camel OSGi PaxLogging support</description>
-
- <properties>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <version>${pax-logging-version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
- <version>${pax-logging-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/components/camel-paxlogging/src/generated/java/org/apache/camel/component/paxlogging/PaxLoggingComponentConfigurer.java b/components/camel-paxlogging/src/generated/java/org/apache/camel/component/paxlogging/PaxLoggingComponentConfigurer.java
deleted file mode 100644
index bb7d7ea..0000000
--- a/components/camel-paxlogging/src/generated/java/org/apache/camel/component/paxlogging/PaxLoggingComponentConfigurer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.paxlogging;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class PaxLoggingComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
- @Override
- public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- PaxLoggingComponent target = (PaxLoggingComponent) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "basicpropertybinding":
- case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
- case "bridgeerrorhandler":
- case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
- case "bundlecontext":
- case "bundleContext": target.setBundleContext(property(camelContext, org.osgi.framework.BundleContext.class, value)); return true;
- default: return false;
- }
- }
-
- @Override
- public Map<String, Object> getAllOptions(Object target) {
- Map<String, Object> answer = new CaseInsensitiveMap();
- answer.put("basicPropertyBinding", boolean.class);
- answer.put("bridgeErrorHandler", boolean.class);
- answer.put("bundleContext", org.osgi.framework.BundleContext.class);
- return answer;
- }
-
- @Override
- public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- PaxLoggingComponent target = (PaxLoggingComponent) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "basicpropertybinding":
- case "basicPropertyBinding": return target.isBasicPropertyBinding();
- case "bridgeerrorhandler":
- case "bridgeErrorHandler": return target.isBridgeErrorHandler();
- case "bundlecontext":
- case "bundleContext": return target.getBundleContext();
- default: return null;
- }
- }
-}
-
diff --git a/components/camel-paxlogging/src/generated/java/org/apache/camel/component/paxlogging/PaxLoggingEndpointConfigurer.java b/components/camel-paxlogging/src/generated/java/org/apache/camel/component/paxlogging/PaxLoggingEndpointConfigurer.java
deleted file mode 100644
index 39a651c..0000000
--- a/components/camel-paxlogging/src/generated/java/org/apache/camel/component/paxlogging/PaxLoggingEndpointConfigurer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.paxlogging;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class PaxLoggingEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
- @Override
- public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- PaxLoggingEndpoint target = (PaxLoggingEndpoint) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "basicpropertybinding":
- case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
- case "bridgeerrorhandler":
- case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
- case "exceptionhandler":
- case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
- case "exchangepattern":
- case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
- case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
- default: return false;
- }
- }
-
- @Override
- public Map<String, Object> getAllOptions(Object target) {
- Map<String, Object> answer = new CaseInsensitiveMap();
- answer.put("basicPropertyBinding", boolean.class);
- answer.put("bridgeErrorHandler", boolean.class);
- answer.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
- answer.put("exchangePattern", org.apache.camel.ExchangePattern.class);
- answer.put("synchronous", boolean.class);
- return answer;
- }
-
- @Override
- public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- PaxLoggingEndpoint target = (PaxLoggingEndpoint) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "basicpropertybinding":
- case "basicPropertyBinding": return target.isBasicPropertyBinding();
- case "bridgeerrorhandler":
- case "bridgeErrorHandler": return target.isBridgeErrorHandler();
- case "exceptionhandler":
- case "exceptionHandler": return target.getExceptionHandler();
- case "exchangepattern":
- case "exchangePattern": return target.getExchangePattern();
- case "synchronous": return target.isSynchronous();
- default: return null;
- }
- }
-}
-
diff --git a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component.properties
deleted file mode 100644
index 86311c8..0000000
--- a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-components=paxlogging
-groupId=org.apache.camel
-artifactId=camel-paxlogging
-version=3.2.0-SNAPSHOT
-projectName=Camel :: Pax Logging
-projectDescription=Camel OSGi PaxLogging support
diff --git a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component/paxlogging b/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component/paxlogging
deleted file mode 100644
index 801af80..0000000
--- a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component/paxlogging
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.paxlogging.PaxLoggingComponent
diff --git a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/configurer/paxlogging-component b/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/configurer/paxlogging-component
deleted file mode 100644
index ee14d36..0000000
--- a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/configurer/paxlogging-component
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.paxlogging.PaxLoggingComponentConfigurer
diff --git a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/configurer/paxlogging-endpoint b/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/configurer/paxlogging-endpoint
deleted file mode 100644
index d3c948f..0000000
--- a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/configurer/paxlogging-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.paxlogging.PaxLoggingEndpointConfigurer
diff --git a/components/camel-paxlogging/src/generated/resources/org/apache/camel/component/paxlogging/paxlogging.json b/components/camel-paxlogging/src/generated/resources/org/apache/camel/component/paxlogging/paxlogging.json
deleted file mode 100644
index 7f61f17..0000000
--- a/components/camel-paxlogging/src/generated/resources/org/apache/camel/component/paxlogging/paxlogging.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "component": {
- "kind": "component",
- "scheme": "paxlogging",
- "extendsScheme": "",
- "syntax": "paxlogging:appender",
- "title": "OSGi PAX Logging",
- "description": "The paxlogging component can be used in an OSGi environment to receive PaxLogging events and process them.",
- "label": "monitoring",
- "deprecated": false,
- "async": false,
- "consumerOnly": true,
- "producerOnly": false,
- "lenientProperties": false,
- "javaType": "org.apache.camel.component.paxlogging.PaxLoggingComponent",
- "firstVersion": "2.6.0",
- "groupId": "org.apache.camel",
- "artifactId": "camel-paxlogging",
- "version": "3.2.0-SNAPSHOT"
- },
- "componentProperties": {
- "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 message and handled by [...]
- "bundleContext": { "kind": "property", "displayName": "Bundle Context", "group": "consumer", "required": false, "type": "object", "javaType": "org.osgi.framework.BundleContext", "deprecated": false, "secret": false, "description": "The OSGi BundleContext is automatic injected by Camel" },
- "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }
- },
- "properties": {
- "appender": { "kind": "path", "displayName": "Appender", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "Appender is the name of the pax appender that need to be configured in the PaxLogging service configuration." },
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 message and handled b [...]
- "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, "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 consumer will deal with [...]
- "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, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
- "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
- "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
- }
-}
diff --git a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc b/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
deleted file mode 100644
index f6b46e2..0000000
--- a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
+++ /dev/null
@@ -1,113 +0,0 @@
-[[paxlogging-component]]
-= OSGi PAX Logging Component
-
-*Since Camel 2.6*
-
-// HEADER START
-*Only consumer is supported*
-// HEADER END
-
-The PAX Logging component can be used in an OSGi environment to receive
-http://wiki.ops4j.org/display/paxlogging/Pax+Logging[PaxLogging] events
-and process them.
-
-== Dependencies
-
-Maven users need to add the following dependency to their `pom.xml`
-
-[source,xml]
--------------------------------------------
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-paxlogging</artifactId>
- <version>${camel-version}</version>
-</dependency>
--------------------------------------------
-
-where `${camel-version`} must be replaced by the actual version of Camel.
-
-== URI format
-
-[source,xml]
------------------------------
-paxlogging:appender[?options]
------------------------------
-
-where `appender` is the name of the pax appender that need to be
-configured in the PaxLogging service configuration.
-
-== URI options
-
-
-
-// component options: START
-The OSGi PAX Logging component supports 3 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *bridgeErrorHandler* (consumer) | 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. | false | boolean
-| *bundleContext* (consumer) | The OSGi BundleContext is automatic injected by Camel | | BundleContext
-| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-|===
-// component options: END
-
-
-
-
-// endpoint options: START
-The OSGi PAX Logging endpoint is configured using URI syntax:
-
-----
-paxlogging:appender
-----
-
-with the following path and query parameters:
-
-=== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *appender* | *Required* Appender is the name of the pax appender that need to be configured in the PaxLogging service configuration. | | String
-|===
-
-
-=== Query Parameters (5 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *bridgeErrorHandler* (consumer) | 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. | false | boolean
-| *exceptionHandler* (consumer) | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
-| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. The value can be one of: InOnly, InOut, InOptionalOut | | ExchangePattern
-| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-|===
-// endpoint options: END
-
-
-== Message body
-
-The `in` message body will be set to the received PaxLoggingEvent.
-
-== Example usage
-
-[source,xml]
-----------------------------------
-<route>
- <from uri="paxlogging:camel"/>
- <to uri="stream:out"/>
-</route>
-----------------------------------
-
-Configuration:
-
-[source,java]
-----------------------------------------------------------
-log4j.rootLogger=INFO, out, osgi:VmLogAppender, osgi:camel
-----------------------------------------------------------
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java
deleted file mode 100644
index c1428e1..0000000
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java
+++ /dev/null
@@ -1,59 +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.paxlogging;
-
-import java.util.Map;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.util.ObjectHelper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The OSGi pax-logging component allows receiving log events from OPS4j PaxLogging
- * and send them to Camel routes.
- */
-@Component("paxlogging")
-public class PaxLoggingComponent extends DefaultComponent {
-
- private BundleContext bundleContext;
-
- public BundleContext getBundleContext() {
- return bundleContext;
- }
-
- /**
- * The OSGi BundleContext is automatic injected by Camel
- */
- public void setBundleContext(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
- @Override
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- PaxLoggingEndpoint endpoint = new PaxLoggingEndpoint(uri, this, remaining);
- setProperties(endpoint, parameters);
- return endpoint;
- }
-
- @Override
- protected void doStart() throws Exception {
- super.doStart();
- ObjectHelper.notNull(bundleContext, "BundleContext", this);
- }
-}
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
deleted file mode 100644
index 72aafa5..0000000
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
+++ /dev/null
@@ -1,104 +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.paxlogging;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.concurrent.ExecutorService;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.support.DefaultConsumer;
-import org.ops4j.pax.logging.spi.PaxAppender;
-import org.ops4j.pax.logging.spi.PaxLoggingEvent;
-import org.osgi.framework.ServiceRegistration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Paxlogging consumer.
- * This camel consumer will register a paxlogging appender and will
- * receive all logging events and send them into the route.
- * To avoid generating new logging events from sending the message,
- * an MDC attribute is set in the sending thread, and all log events
- * from this thread are ignored.
- * Camel exchanges are actually sent from a specific thread to make
- * sure the log events are cleanly separated.
- */
-public class PaxLoggingConsumer extends DefaultConsumer implements PaxAppender {
-
- private static final Logger LOG = LoggerFactory.getLogger(PaxLoggingConsumer.class);
-
- private final PaxLoggingEndpoint endpoint;
- private ExecutorService executor;
- private ServiceRegistration registration;
-
- public PaxLoggingConsumer(PaxLoggingEndpoint endpoint, Processor processor) {
- super(endpoint, processor);
- this.endpoint = endpoint;
- }
-
- @Override
- public void doAppend(final PaxLoggingEvent paxLoggingEvent) {
- // in order to "force" the copy of properties (especially the MDC ones) in the local thread
- paxLoggingEvent.getProperties();
- sendExchange(paxLoggingEvent);
- }
-
- protected void sendExchange(final PaxLoggingEvent paxLoggingEvent) {
- Exchange exchange = endpoint.createExchange();
- // TODO: populate exchange headers
- exchange.getIn().setBody(paxLoggingEvent);
-
- if (LOG.isTraceEnabled()) {
- LOG.trace("PaxLogging {} is firing", endpoint.getAppender());
- }
- try {
- getProcessor().process(exchange);
- } catch (Exception e) {
- exchange.setException(e);
- }
- // log exception if an exception occurred and was not handled
- if (exchange.getException() != null) {
- getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
- }
- }
-
- @Override
- protected void doStart() throws Exception {
- super.doStart();
-
- // start the executor before the registration
- executor = endpoint.getCamelContext().getExecutorServiceManager().newSingleThreadExecutor(this, "PaxLoggingEventTask");
-
- Dictionary<String, String> props = new Hashtable<>();
- props.put("org.ops4j.pax.logging.appender.name", endpoint.getAppender());
- registration = endpoint.getComponent().getBundleContext().registerService(PaxAppender.class.getName(), this, props);
- }
-
- @Override
- protected void doStop() throws Exception {
- if (registration != null) {
- registration.unregister();
- }
- if (executor != null) {
- endpoint.getCamelContext().getExecutorServiceManager().shutdownNow(executor);
- executor = null;
- }
- super.doStop();
- }
-}
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
deleted file mode 100644
index e731361..0000000
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
+++ /dev/null
@@ -1,75 +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.paxlogging;
-
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriPath;
-import org.apache.camel.support.DefaultEndpoint;
-
-/**
- * The paxlogging component can be used in an OSGi environment to receive PaxLogging events and process them.
- */
-@UriEndpoint(firstVersion = "2.6.0", scheme = "paxlogging", title = "OSGi PAX Logging", syntax = "paxlogging:appender",
- consumerOnly = true, label = "monitoring")
-public class PaxLoggingEndpoint extends DefaultEndpoint {
-
- @UriPath @Metadata(required = true)
- private final String appender;
-
- public PaxLoggingEndpoint(String uri, PaxLoggingComponent component, String appender) {
- super(uri, component);
- this.appender = appender;
- }
-
- /**
- * Appender is the name of the pax appender that need to be configured in the PaxLogging service configuration.
- */
- public String getAppender() {
- return appender;
- }
-
- /**
- * @deprecated use {@link #getAppender()}
- */
- @Deprecated
- public String getName() {
- return getAppender();
- }
-
- @Override
- public PaxLoggingComponent getComponent() {
- return (PaxLoggingComponent) super.getComponent();
- }
-
- @Override
- public Producer createProducer() throws Exception {
- throw new RuntimeCamelException("Cannot produce to a PaxLoggingEndpoint: " + getEndpointUri());
- }
-
- @Override
- public Consumer createConsumer(Processor processor) throws Exception {
- PaxLoggingConsumer answer = new PaxLoggingConsumer(this, processor);
- configureConsumer(answer);
- return answer;
- }
-
-}
diff --git a/components/pom.xml b/components/pom.xml
index b61b480..aaa1f6a 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -290,7 +290,6 @@
<module>camel-optaplanner</module>
<module>camel-osgi-activator</module>
<module>camel-paho</module>
- <module>camel-paxlogging</module>
<module>camel-pdf</module>
<module>camel-pg-replication-slot</module>
<module>camel-pgevent</module>
diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml
index 88ef050..f21e9c0 100644
--- a/core/camel-allcomponents/pom.xml
+++ b/core/camel-allcomponents/pom.xml
@@ -868,10 +868,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-paxlogging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-pdf</artifactId>
</dependency>
<dependency>
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PaxloggingComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PaxloggingComponentBuilderFactory.java
deleted file mode 100644
index 752f73b..0000000
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PaxloggingComponentBuilderFactory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.builder.component.dsl;
-
-import javax.annotation.Generated;
-import org.apache.camel.Component;
-import org.apache.camel.builder.component.AbstractComponentBuilder;
-import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.paxlogging.PaxLoggingComponent;
-
-/**
- * The paxlogging component can be used in an OSGi environment to receive
- * PaxLogging events and process them.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
-public interface PaxloggingComponentBuilderFactory {
-
- /**
- * OSGi PAX Logging (camel-paxlogging)
- * The paxlogging component can be used in an OSGi environment to receive
- * PaxLogging events and process them.
- *
- * Category: monitoring
- * Since: 2.6
- * Maven coordinates: org.apache.camel:camel-paxlogging
- */
- static PaxloggingComponentBuilder paxlogging() {
- return new PaxloggingComponentBuilderImpl();
- }
-
- /**
- * Builder for the OSGi PAX Logging component.
- */
- interface PaxloggingComponentBuilder
- extends
- ComponentBuilder<PaxLoggingComponent> {
- /**
- * 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.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: consumer
- */
- default PaxloggingComponentBuilder bridgeErrorHandler(
- boolean bridgeErrorHandler) {
- doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
- return this;
- }
- /**
- * The OSGi BundleContext is automatic injected by Camel.
- *
- * The option is a: <code>org.osgi.framework.BundleContext</code> type.
- *
- * Group: consumer
- */
- default PaxloggingComponentBuilder bundleContext(
- org.osgi.framework.BundleContext bundleContext) {
- doSetProperty("bundleContext", bundleContext);
- return this;
- }
- /**
- * Whether the component should use basic property binding (Camel 2.x)
- * or the newer property binding with additional capabilities.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: advanced
- */
- default PaxloggingComponentBuilder basicPropertyBinding(
- boolean basicPropertyBinding) {
- doSetProperty("basicPropertyBinding", basicPropertyBinding);
- return this;
- }
- }
-
- class PaxloggingComponentBuilderImpl
- extends
- AbstractComponentBuilder<PaxLoggingComponent>
- implements
- PaxloggingComponentBuilder {
- @Override
- protected PaxLoggingComponent buildConcreteComponent() {
- return new PaxLoggingComponent();
- }
- @Override
- protected boolean setPropertyOnComponent(
- Component component,
- String name,
- Object value) {
- switch (name) {
- case "bridgeErrorHandler": ((PaxLoggingComponent) component).setBridgeErrorHandler((boolean) value); return true;
- case "bundleContext": ((PaxLoggingComponent) component).setBundleContext((org.osgi.framework.BundleContext) value); return true;
- case "basicPropertyBinding": ((PaxLoggingComponent) component).setBasicPropertyBinding((boolean) value); return true;
- default: return false;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
deleted file mode 100644
index cadf270..0000000
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.builder.endpoint.dsl;
-
-import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
-import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-
-/**
- * The paxlogging component can be used in an OSGi environment to receive
- * PaxLogging events and process them.
- *
- * Generated by camel build tools - do NOT edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface PaxLoggingEndpointBuilderFactory {
-
-
- /**
- * Builder for endpoint for the OSGi PAX Logging component.
- */
- public interface PaxLoggingEndpointBuilder
- extends
- EndpointConsumerBuilder {
- default AdvancedPaxLoggingEndpointBuilder advanced() {
- return (AdvancedPaxLoggingEndpointBuilder) this;
- }
- /**
- * 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.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: consumer
- */
- default PaxLoggingEndpointBuilder bridgeErrorHandler(
- boolean bridgeErrorHandler) {
- doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
- return this;
- }
- /**
- * 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.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Default: false
- * Group: consumer
- */
- default PaxLoggingEndpointBuilder bridgeErrorHandler(
- String bridgeErrorHandler) {
- doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
- return this;
- }
- }
-
- /**
- * Advanced builder for endpoint for the OSGi PAX Logging component.
- */
- public interface AdvancedPaxLoggingEndpointBuilder
- extends
- EndpointConsumerBuilder {
- default PaxLoggingEndpointBuilder basic() {
- return (PaxLoggingEndpointBuilder) this;
- }
- /**
- * 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 consumer will deal with exceptions, that will be
- * logged at WARN or ERROR level and ignored.
- *
- * The option is a: <code>org.apache.camel.spi.ExceptionHandler</code>
- * type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedPaxLoggingEndpointBuilder exceptionHandler(
- ExceptionHandler exceptionHandler) {
- doSetProperty("exceptionHandler", exceptionHandler);
- return this;
- }
- /**
- * 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 consumer will deal with exceptions, that will be
- * logged at WARN or ERROR level and ignored.
- *
- * The option will be converted to a
- * <code>org.apache.camel.spi.ExceptionHandler</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedPaxLoggingEndpointBuilder exceptionHandler(
- String exceptionHandler) {
- doSetProperty("exceptionHandler", exceptionHandler);
- return this;
- }
- /**
- * Sets the exchange pattern when the consumer creates an exchange.
- *
- * The option is a: <code>org.apache.camel.ExchangePattern</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedPaxLoggingEndpointBuilder exchangePattern(
- ExchangePattern exchangePattern) {
- doSetProperty("exchangePattern", exchangePattern);
- return this;
- }
- /**
- * Sets the exchange pattern when the consumer creates an exchange.
- *
- * The option will be converted to a
- * <code>org.apache.camel.ExchangePattern</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedPaxLoggingEndpointBuilder exchangePattern(
- String exchangePattern) {
- doSetProperty("exchangePattern", exchangePattern);
- return this;
- }
- /**
- * Whether the endpoint should use basic property binding (Camel 2.x) or
- * the newer property binding with additional capabilities.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: advanced
- */
- default AdvancedPaxLoggingEndpointBuilder basicPropertyBinding(
- boolean basicPropertyBinding) {
- doSetProperty("basicPropertyBinding", basicPropertyBinding);
- return this;
- }
- /**
- * Whether the endpoint should use basic property binding (Camel 2.x) or
- * the newer property binding with additional capabilities.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Default: false
- * Group: advanced
- */
- default AdvancedPaxLoggingEndpointBuilder basicPropertyBinding(
- String basicPropertyBinding) {
- doSetProperty("basicPropertyBinding", basicPropertyBinding);
- return this;
- }
- /**
- * Sets whether synchronous processing should be strictly used, or Camel
- * is allowed to use asynchronous processing (if supported).
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: advanced
- */
- default AdvancedPaxLoggingEndpointBuilder synchronous(
- boolean synchronous) {
- doSetProperty("synchronous", synchronous);
- return this;
- }
- /**
- * Sets whether synchronous processing should be strictly used, or Camel
- * is allowed to use asynchronous processing (if supported).
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Default: false
- * Group: advanced
- */
- default AdvancedPaxLoggingEndpointBuilder synchronous(String synchronous) {
- doSetProperty("synchronous", synchronous);
- return this;
- }
- }
-
- public interface PaxLoggingBuilders {
- /**
- * OSGi PAX Logging (camel-paxlogging)
- * The paxlogging component can be used in an OSGi environment to
- * receive PaxLogging events and process them.
- *
- * Category: monitoring
- * Since: 2.6
- * Maven coordinates: org.apache.camel:camel-paxlogging
- *
- * Syntax: <code>paxlogging:appender</code>
- *
- * Path parameter: appender (required)
- * Appender is the name of the pax appender that need to be configured
- * in the PaxLogging service configuration.
- */
- default PaxLoggingEndpointBuilder paxlogging(String path) {
- return PaxLoggingEndpointBuilderFactory.paxlogging(path);
- }
- }
- /**
- * OSGi PAX Logging (camel-paxlogging)
- * The paxlogging component can be used in an OSGi environment to receive
- * PaxLogging events and process them.
- *
- * Category: monitoring
- * Since: 2.6
- * Maven coordinates: org.apache.camel:camel-paxlogging
- *
- * Syntax: <code>paxlogging:appender</code>
- *
- * Path parameter: appender (required)
- * Appender is the name of the pax appender that need to be configured in
- * the PaxLogging service configuration.
- */
- static PaxLoggingEndpointBuilder paxlogging(String path) {
- class PaxLoggingEndpointBuilderImpl extends AbstractEndpointBuilder implements PaxLoggingEndpointBuilder, AdvancedPaxLoggingEndpointBuilder {
- public PaxLoggingEndpointBuilderImpl(String path) {
- super("paxlogging", path);
- }
- }
- return new PaxLoggingEndpointBuilderImpl(path);
- }
-}
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index e58a757..a0642ff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2062,11 +2062,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-paxlogging</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-pdf</artifactId>
<version>${project.version}</version>
</dependency>