[camel] branch master updated: Move the generated configurer into the o.a.c.main package

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet 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 a8a13e2  Move the generated configurer into the o.a.c.main package
a8a13e2 is described below

commit a8a13e257bba1a9d1782728ab25dd9c8cdedfa4a
Author: gnodet <gno...@gmail.com>
AuthorDate: Wed Mar 25 15:55:49 2020 +0100

    Move the generated configurer into the o.a.c.main package
---
 .../camel/{ => main}/ExtendedCamelContextConfigurer.java      |  2 +-
 .../services/org/apache/camel/configurer/ExtendedCamelContext |  2 +-
 .../org/apache/camel/maven/packaging/MainConfigurerMojo.java  | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/core/camel-main/src/generated/java/org/apache/camel/ExtendedCamelContextConfigurer.java
 
b/core/camel-main/src/generated/java/org/apache/camel/main/ExtendedCamelContextConfigurer.java
similarity index 99%
rename from 
core/camel-main/src/generated/java/org/apache/camel/ExtendedCamelContextConfigurer.java
rename to 
core/camel-main/src/generated/java/org/apache/camel/main/ExtendedCamelContextConfigurer.java
index 77383e9..9ecf0a3 100644
--- 
a/core/camel-main/src/generated/java/org/apache/camel/ExtendedCamelContextConfigurer.java
+++ 
b/core/camel-main/src/generated/java/org/apache/camel/main/ExtendedCamelContextConfigurer.java
@@ -1,5 +1,5 @@
 /* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel;
+package org.apache.camel.main;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
diff --git 
a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext
 
b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext
index 4d22c93..dcc120a 100644
--- 
a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext
+++ 
b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.ExtendedCamelContextConfigurer
+class=org.apache.camel.main.ExtendedCamelContextConfigurer
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MainConfigurerMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MainConfigurerMojo.java
index 42cfc82..434d627 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MainConfigurerMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MainConfigurerMojo.java
@@ -120,7 +120,7 @@ public class MainConfigurerMojo extends 
AbstractGeneratorMojo {
     }
 
     private void generateConfigurer(String name, List<Option> options) throws 
IOException {
-        String pn = name.substring(0, name.lastIndexOf('.'));
+        String pn = "org.apache.camel.main";
         String cn = name.substring(name.lastIndexOf('.') + 1) + "Configurer";
         String en = name;
         String pfqn = name;
@@ -138,12 +138,13 @@ public class MainConfigurerMojo extends 
AbstractGeneratorMojo {
         }
     }
 
-    private void generateMetaInfConfigurer(String fqn) {
-        String name = fqn.substring(fqn.lastIndexOf('.') + 1);
+    private void generateMetaInfConfigurer(String name) {
+        String pn = "org.apache.camel.main";
+        String en = name.substring(name.lastIndexOf('.') + 1);
         try (Writer w = new StringWriter()) {
             w.append("# " + GENERATED_MSG + "\n");
-            w.append("class=").append(fqn).append("Configurer").append("\n");
-            updateResource(resourcesOutputDir.toPath(), 
"META-INF/services/org/apache/camel/configurer/" + name, w.toString());
+            
w.append("class=").append(pn).append(".").append(en).append("Configurer").append("\n");
+            updateResource(resourcesOutputDir.toPath(), 
"META-INF/services/org/apache/camel/configurer/" + en, w.toString());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }