This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new cffe3d0 Add camel-elytron to catalog and assembly
cffe3d0 is described below
commit cffe3d077020cafee4ae39935c3e4c189a6976b8
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Dec 9 10:30:25 2020 +0100
Add camel-elytron to catalog and assembly
---
apache-camel/src/main/descriptors/common-bin.xml | 1 +
.../org/apache/camel/catalog/docs.properties | 2 +-
.../org/apache/camel/catalog/docs/elytron.adoc | 31 ++++++++++----------
.../org/apache/camel/catalog/others.properties | 1 +
.../org/apache/camel/catalog/others/elytron.json | 15 ++++++++++
components/camel-elytron/pom.xml | 22 ++++-----------
.../services/org/apache/camel/other.properties | 7 +++++
.../src/generated/resources/elytron.json | 15 ++++++++++
.../camel-elytron/src/main/docs/elytron.adoc | 33 +++++++++++-----------
core/camel-allcomponents/pom.xml | 4 +++
docs/components/modules/ROOT/nav.adoc | 1 -
docs/components/modules/others/nav.adoc | 1 +
.../components/modules/others/pages/elytron.adoc | 33 ++++++++++++----------
13 files changed, 100 insertions(+), 66 deletions(-)
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 7538309..06c360d 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -171,6 +171,7 @@
<include>org.apache.camel:camel-ehcache</include>
<include>org.apache.camel:camel-elasticsearch-rest</include>
<include>org.apache.camel:camel-elsql</include>
+ <include>org.apache.camel:camel-elytron</include>
<include>org.apache.camel:camel-etcd</include>
<include>org.apache.camel:camel-etcd3</include>
<include>org.apache.camel:camel-exec</include>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
index e20a650..05de5ca 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
@@ -152,7 +152,7 @@ dynamicRouter-eip
ehcache-component
elasticsearch-rest-component
elsql-component
-elytron-component
+elytron
enrich-eip
enterprise-integration-patterns
etcd-keys-component
diff --git a/components/camel-elytron/src/main/docs/elytron-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elytron.adoc
similarity index 68%
rename from components/camel-elytron/src/main/docs/elytron-component.adoc
rename to
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elytron.adoc
index a1be496..263e581 100644
--- a/components/camel-elytron/src/main/docs/elytron-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elytron.adoc
@@ -1,14 +1,14 @@
-[[elytron-component]]
-= Undertow Elytron Security Provider
-//by hand
-:since: 3.2
+[[elytron-other]]
+= Elytron Component
+:docTitle: Elytron
+:artifactId: camel-elytron
+:description: Elytron Security Provider for camel-undertow
+:since: 3.1
+:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/elytron.adoc[opts=optional]
*Since Camel {since}*
-*Replaces component camel-elytron*
-
-*OSGi is not supported*
-
The Elytron Security Provider provides Elytron security over camel-undertow
component.
It enables camel-undertow component use Elytron security capabilities.
To force camel-undertow to use elytron security provider, add elytron security
provider library
@@ -17,19 +17,21 @@ parameter into camel-undertow component or provide both
`securityConfiguration`
into camel-undertow component.
Configuration has to provide all 3 security attributes:
-[width="100%"]
+
+[width="100%",cols="2,5,^3",options="header"]
|===
| Name | Description | Type
| *domainBuilder* | Builder for security domain. | SecurityDomain.Builder
| *mechanismName* | MechanismName should be selected with regard to default
securityRealm. For
-example: to use bearer_token security, mechanism name has to be "BEARER_TOKEN"
and realm has to be
-TokenSecurityReal | String
-| *elytronProvider* | Instance of WildFlyElytronBaseProvider ith respect of
mechanismName | WildFlyElytronBaseProvider
+example to use bearer_token security, mechanism name has to be `BEARER_TOKEN`
and realm has to be `TokenSecurityReal` | String
+| *elytronProvider* | Instance of WildFlyElytronBaseProvider with respect of
mechanismName | WildFlyElytronBaseProvider
|===
-Each exchange created by Undertow endpoint with Elytron security contains
header 'securityIdentity'
+Each exchange created by Undertow endpoint with Elytron security contains
header `securityIdentity`
with current Elytron's security identity as value.
-('org.wildfly.security.auth.server.SecurityIdentity') or is FORBIDDEN (status
code 403)
+(`org.wildfly.security.auth.server.SecurityIdentity`) or is FORBIDDEN (status
code 403)
+
+NOTE: OSGi is not supported
Maven users will need to add the following dependency to their `pom.xml`
for this component:
@@ -49,4 +51,3 @@ for this component:
This seurity provider contains only basic Elytron dependencies (without any
transitive dependency
from org.wildfly.security:wildfly-elytron).
Ignored libraries should be added among application's dependencies for their
usage.
-
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 1ebe455..e3e9ff2 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -3,6 +3,7 @@ aws-xray
cdi
csimple-joor
cxf-transport
+elytron
etcd3
headersmap
hystrix
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/elytron.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/elytron.json
new file mode 100644
index 0000000..153fb25
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/elytron.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "elytron",
+ "title": "Elytron",
+ "description": "Elytron Security Provider for camel-undertow",
+ "deprecated": false,
+ "firstVersion": "3.1.0",
+ "label": "security",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-elytron",
+ "version": "3.7.0-SNAPSHOT"
+ }
+}
diff --git a/components/camel-elytron/pom.xml b/components/camel-elytron/pom.xml
index 577be3e..bc438b8 100644
--- a/components/camel-elytron/pom.xml
+++ b/components/camel-elytron/pom.xml
@@ -28,10 +28,14 @@
<artifactId>camel-elytron</artifactId>
<packaging>jar</packaging>
-
<name>Camel :: Elytron</name>
<description>Elytron Security Provider for camel-undertow</description>
+ <properties>
+ <label>security</label>
+ <firstVersion>3.1.0</firstVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -155,20 +159,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
</project>
diff --git
a/components/camel-elytron/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/components/camel-elytron/src/generated/resources/META-INF/services/org/apache/camel/other.properties
new file mode 100644
index 0000000..fbf8662
--- /dev/null
+++
b/components/camel-elytron/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+name=elytron
+groupId=org.apache.camel
+artifactId=camel-elytron
+version=3.7.0-SNAPSHOT
+projectName=Camel :: Elytron
+projectDescription=Elytron Security Provider for camel-undertow
diff --git a/components/camel-elytron/src/generated/resources/elytron.json
b/components/camel-elytron/src/generated/resources/elytron.json
new file mode 100644
index 0000000..153fb25
--- /dev/null
+++ b/components/camel-elytron/src/generated/resources/elytron.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "elytron",
+ "title": "Elytron",
+ "description": "Elytron Security Provider for camel-undertow",
+ "deprecated": false,
+ "firstVersion": "3.1.0",
+ "label": "security",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-elytron",
+ "version": "3.7.0-SNAPSHOT"
+ }
+}
diff --git a/docs/components/modules/ROOT/pages/elytron-component.adoc
b/components/camel-elytron/src/main/docs/elytron.adoc
similarity index 68%
rename from docs/components/modules/ROOT/pages/elytron-component.adoc
rename to components/camel-elytron/src/main/docs/elytron.adoc
index d700170..263e581 100644
--- a/docs/components/modules/ROOT/pages/elytron-component.adoc
+++ b/components/camel-elytron/src/main/docs/elytron.adoc
@@ -1,16 +1,14 @@
-[[elytron-component]]
-= Undertow Elytron Security Provider
-//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-elytron/src/main/docs/elytron-component.adoc
-//by hand
-:since: 3.2
+[[elytron-other]]
+= Elytron Component
+:docTitle: Elytron
+:artifactId: camel-elytron
+:description: Elytron Security Provider for camel-undertow
+:since: 3.1
+:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/elytron.adoc[opts=optional]
*Since Camel {since}*
-*Replaces component camel-elytron*
-
-*OSGi is not supported*
-
The Elytron Security Provider provides Elytron security over camel-undertow
component.
It enables camel-undertow component use Elytron security capabilities.
To force camel-undertow to use elytron security provider, add elytron security
provider library
@@ -19,19 +17,21 @@ parameter into camel-undertow component or provide both
`securityConfiguration`
into camel-undertow component.
Configuration has to provide all 3 security attributes:
-[width="100%"]
+
+[width="100%",cols="2,5,^3",options="header"]
|===
| Name | Description | Type
| *domainBuilder* | Builder for security domain. | SecurityDomain.Builder
| *mechanismName* | MechanismName should be selected with regard to default
securityRealm. For
-example: to use bearer_token security, mechanism name has to be "BEARER_TOKEN"
and realm has to be
-TokenSecurityReal | String
-| *elytronProvider* | Instance of WildFlyElytronBaseProvider ith respect of
mechanismName | WildFlyElytronBaseProvider
+example to use bearer_token security, mechanism name has to be `BEARER_TOKEN`
and realm has to be `TokenSecurityReal` | String
+| *elytronProvider* | Instance of WildFlyElytronBaseProvider with respect of
mechanismName | WildFlyElytronBaseProvider
|===
-Each exchange created by Undertow endpoint with Elytron security contains
header 'securityIdentity'
+Each exchange created by Undertow endpoint with Elytron security contains
header `securityIdentity`
with current Elytron's security identity as value.
-('org.wildfly.security.auth.server.SecurityIdentity') or is FORBIDDEN (status
code 403)
+(`org.wildfly.security.auth.server.SecurityIdentity`) or is FORBIDDEN (status
code 403)
+
+NOTE: OSGi is not supported
Maven users will need to add the following dependency to their `pom.xml`
for this component:
@@ -51,4 +51,3 @@ for this component:
This seurity provider contains only basic Elytron dependencies (without any
transitive dependency
from org.wildfly.security:wildfly-elytron).
Ignored libraries should be added among application's dependencies for their
usage.
-
diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml
index 374be7c..a27da0d 100644
--- a/core/camel-allcomponents/pom.xml
+++ b/core/camel-allcomponents/pom.xml
@@ -500,6 +500,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-elytron</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-etcd3</artifactId>
</dependency>
<dependency>
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index 406ed2b..2656e0a 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -332,7 +332,6 @@
** xref:twitter-search-component.adoc[Twitter Search]
** xref:twitter-timeline-component.adoc[Twitter Timeline]
** xref:undertow-component.adoc[Undertow]
-** xref:elytron-component.adoc[Undertow Elytron Security Provider]
** xref:validator-component.adoc[Validator]
** xref:velocity-component.adoc[Velocity]
** xref:vertx-component.adoc[Vert.x]
diff --git a/docs/components/modules/others/nav.adoc
b/docs/components/modules/others/nav.adoc
index 7050750..ce9dd69 100644
--- a/docs/components/modules/others/nav.adoc
+++ b/docs/components/modules/others/nav.adoc
@@ -7,6 +7,7 @@
** xref:cdi.adoc[CDI]
** xref:csimple-joor.adoc[CSimple jOOR]
** xref:cxf-transport.adoc[CXF Transport]
+** xref:elytron.adoc[Elytron]
** xref:etcd3.adoc[Etcd3]
** xref:headersmap.adoc[Headersmap]
** xref:hystrix.adoc[Hystrix]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elytron-component.adoc
b/docs/components/modules/others/pages/elytron.adoc
similarity index 64%
rename from
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elytron-component.adoc
rename to docs/components/modules/others/pages/elytron.adoc
index a1be496..228b1bc 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elytron-component.adoc
+++ b/docs/components/modules/others/pages/elytron.adoc
@@ -1,14 +1,16 @@
-[[elytron-component]]
-= Undertow Elytron Security Provider
-//by hand
-:since: 3.2
+[[elytron-other]]
+= Elytron Component
+//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
+:page-source: components/camel-elytron/src/main/docs/elytron.adoc
+:docTitle: Elytron
+:artifactId: camel-elytron
+:description: Elytron Security Provider for camel-undertow
+:since: 3.1
+:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/elytron.adoc[opts=optional]
*Since Camel {since}*
-*Replaces component camel-elytron*
-
-*OSGi is not supported*
-
The Elytron Security Provider provides Elytron security over camel-undertow
component.
It enables camel-undertow component use Elytron security capabilities.
To force camel-undertow to use elytron security provider, add elytron security
provider library
@@ -17,19 +19,21 @@ parameter into camel-undertow component or provide both
`securityConfiguration`
into camel-undertow component.
Configuration has to provide all 3 security attributes:
-[width="100%"]
+
+[width="100%",cols="2,5,^3",options="header"]
|===
| Name | Description | Type
| *domainBuilder* | Builder for security domain. | SecurityDomain.Builder
| *mechanismName* | MechanismName should be selected with regard to default
securityRealm. For
-example: to use bearer_token security, mechanism name has to be "BEARER_TOKEN"
and realm has to be
-TokenSecurityReal | String
-| *elytronProvider* | Instance of WildFlyElytronBaseProvider ith respect of
mechanismName | WildFlyElytronBaseProvider
+example to use bearer_token security, mechanism name has to be `BEARER_TOKEN`
and realm has to be `TokenSecurityReal` | String
+| *elytronProvider* | Instance of WildFlyElytronBaseProvider with respect of
mechanismName | WildFlyElytronBaseProvider
|===
-Each exchange created by Undertow endpoint with Elytron security contains
header 'securityIdentity'
+Each exchange created by Undertow endpoint with Elytron security contains
header `securityIdentity`
with current Elytron's security identity as value.
-('org.wildfly.security.auth.server.SecurityIdentity') or is FORBIDDEN (status
code 403)
+(`org.wildfly.security.auth.server.SecurityIdentity`) or is FORBIDDEN (status
code 403)
+
+NOTE: OSGi is not supported
Maven users will need to add the following dependency to their `pom.xml`
for this component:
@@ -49,4 +53,3 @@ for this component:
This seurity provider contains only basic Elytron dependencies (without any
transitive dependency
from org.wildfly.security:wildfly-elytron).
Ignored libraries should be added among application's dependencies for their
usage.
-
