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 a98bea9 CAMEL-15043: Fixed camel-archetype-api-component
a98bea9 is described below
commit a98bea9e0988a1e0f27e81d4eb633a5b3e7bed73
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun May 24 20:58:38 2020 +0200
CAMEL-15043: Fixed camel-archetype-api-component
---
.../META-INF/maven/archetype-metadata.xml | 7 ++---
.../__artifactId__-component/pom.xml | 33 +++-------------------
.../src/main/java/__name__Component.java | 4 +--
.../src/main/java/__name__Configuration.java | 3 --
.../src/main/java/__name__Consumer.java | 3 --
.../src/main/java/__name__Endpoint.java | 6 ++--
.../src/main/java/__name__Producer.java | 3 --
.../services/org/apache/camel/component/__scheme__ | 17 -----------
.../src/main/resources/archetype-resources/pom.xml | 4 +--
9 files changed, 12 insertions(+), 68 deletions(-)
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
b/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index 8bded3c..87ff671 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++
b/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -36,9 +36,6 @@
<requiredProperty key="maven-resources-plugin-version">
<defaultValue>${maven-resources-plugin-version}</defaultValue>
</requiredProperty>
- <requiredProperty key="camel-bundle-plugin-version">
- <defaultValue>${camel-bundle-plugin-version}</defaultValue>
- </requiredProperty>
<requiredProperty key="maven-javadoc-plugin-version">
<defaultValue>${maven-javadoc-plugin-version}</defaultValue>
</requiredProperty>
@@ -48,8 +45,8 @@
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
- <requiredProperty key="log4j-version">
- <defaultValue>${log4j-version}</defaultValue>
+ <requiredProperty key="log4j2-version">
+ <defaultValue>${log4j2-version}</defaultValue>
</requiredProperty>
</requiredProperties>
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index f6716bd..f23f070 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -58,11 +58,12 @@
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
-
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
@@ -181,7 +182,7 @@
</executions>
</plugin>
- <!-- generate components meta-data -->
+ <!-- generate camel meta-data -->
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
@@ -192,7 +193,7 @@
<goals>
<goal>generate-component</goal>
</goals>
- <phase>generate-resources</phase>
+ <phase>process-classes</phase>
</execution>
</executions>
</plugin>
@@ -228,32 +229,6 @@
</executions>
</plugin>
- <!-- OSGi support (remove if not using OSGi) -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${camelVersion}</version>
- <configuration>
- <instructions>
- <Bundle-Name>Camel Component for ${componentName}</Bundle-Name>
- <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName>
-
<Export-Service>org.apache.camel.spi.ComponentResolver;component=${schemeName}</Export-Service>
-
<Export-Package>${componentPackage};version=${project.version}</Export-Package>
- <Import-Package>
- ${componentPackage}.api;version=${project.version},
- ${componentPackage};version=${project.version},
- org.apache.camel.*;version=${camelVersion}
- </Import-Package>
- <Private-Package>${outPackage}</Private-Package>
- <Implementation-Title>Apache Camel</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
-
<Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_failok>false</_failok>
- </instructions>
- </configuration>
- </plugin>
-
</plugins>
<pluginManagement>
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Component.java
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Component.java
index c788889..b4914fb 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Component.java
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Component.java
@@ -23,9 +23,7 @@ import
org.apache.camel.support.component.AbstractApiComponent;
import ${package}.internal.${name}ApiCollection;
import ${package}.internal.${name}ApiName;
-/**
- * Represents the component that manages {@link ${name}Endpoint}.
- */
+@org.apache.camel.spi.annotations.Component("${scheme}")
public class ${name}Component extends AbstractApiComponent<${name}ApiName,
${name}Configuration, ${name}ApiCollection> {
public ${name}Component() {
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Configuration.java
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Configuration.java
index ce8e9c4..ba168ea 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Configuration.java
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Configuration.java
@@ -18,9 +18,6 @@ package ${package};
import org.apache.camel.spi.UriParams;
-/**
- * Component configuration for ${name} component.
- */
@UriParams
public class ${name}Configuration {
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Consumer.java
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Consumer.java
index dd3e7d0..1550953 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Consumer.java
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Consumer.java
@@ -21,9 +21,6 @@ import org.apache.camel.support.component.AbstractApiConsumer;
import ${package}.internal.${name}ApiName;
-/**
- * The ${name} consumer.
- */
public class ${name}Consumer extends AbstractApiConsumer<${name}ApiName,
${name}Configuration> {
public ${name}Consumer(${name}Endpoint endpoint, Processor processor) {
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Endpoint.java
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Endpoint.java
index 3d92277..fb5946f 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Endpoint.java
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Endpoint.java
@@ -36,7 +36,9 @@ import ${package}.internal.${name}Constants;
import ${package}.internal.${name}PropertiesHelper;
/**
- * Represents a ${name} endpoint.
+ * ${name} component which does bla bla.
+ *
+ * TODO: Update one line description above what the component does.
*/
@UriEndpoint(firstVersion = "${version}", scheme = "${scheme}", title =
"${name}", syntax="${scheme}:name",
consumerClass = ${name}Consumer.class, label = "custom")
@@ -51,7 +53,6 @@ public class ${name}Endpoint extends
AbstractApiEndpoint<${name}ApiName, ${name}
public ${name}Endpoint(String uri, ${name}Component component,
${name}ApiName apiName, String methodName,
${name}Configuration endpointConfiguration) {
super(uri, component, apiName, methodName,
${name}ApiCollection.getCollection().getHelper(apiName), endpointConfiguration);
-
}
public Producer createProducer() throws Exception {
@@ -109,5 +110,4 @@ public class ${name}Endpoint extends
AbstractApiEndpoint<${name}ApiName, ${name}
return name;
}
-
}
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Producer.java
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Producer.java
index 5bcfc5d..5462ef3 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Producer.java
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Producer.java
@@ -21,9 +21,6 @@ import org.apache.camel.support.component.AbstractApiProducer;
import ${package}.internal.${name}ApiName;
import ${package}.internal.${name}PropertiesHelper;
-/**
- * The ${name} producer.
- */
public class ${name}Producer extends AbstractApiProducer<${name}ApiName,
${name}Configuration> {
public ${name}Producer(${name}Endpoint endpoint) {
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/resources/META-INF/services/org/apache/camel/component/__scheme__
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/resources/META-INF/services/org/apache/camel/component/__scheme__
deleted file mode 100644
index ff171b5..0000000
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/resources/META-INF/services/org/apache/camel/component/__scheme__
+++ /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.
-## ------------------------------------------------------------------------
-class=${package}.${name}Component
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
index 4ae3e67..324bb6a 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
@@ -41,8 +41,8 @@
<!-- Camel BOM -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${camelVersion}</version>
+ <artifactId>camel-bom</artifactId>
+ <version>${camel-version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
