You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/04/28 09:07:12 UTC

[camel] branch main updated: Rename camel-fatjar-main to camel-uberjar-main

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

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new fa562e19000 Rename camel-fatjar-main to camel-uberjar-main
fa562e19000 is described below

commit fa562e19000bbfdd6573d48feecfd3757366910c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 28 11:06:57 2022 +0200

    Rename camel-fatjar-main to camel-uberjar-main
---
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java   | 2 +-
 .../main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java   | 4 ++--
 .../src/main/java/org/apache/camel/main/uberjar/UberJarMain.java      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index cb14a3fc774..ff8391d700a 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -211,7 +211,7 @@ class Run implements Callable<Integer> {
         writeSettings("camel.main.tracing", trace ? "true" : "false");
         main.addInitialProperty("camel.main.modeline", modeline ? "true" : "false");
         writeSettings("camel.main.modeline", modeline ? "true" : "false");
-        // allow java-dsl to compile to .class which we need in fat-jar mode
+        // allow java-dsl to compile to .class which we need in uber-jar mode
         main.addInitialProperty("camel.main.routesCompileDirectory", WORK_DIR);
         writeSettings("camel.main.routesCompileDirectory", WORK_DIR);
 
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
index 7fdafcd0402..d2adb539c4c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
@@ -155,12 +155,12 @@ class UberJar implements Callable<Integer> {
         // the settings file itself
         File target = new File("target/camel-app/classes", Run.RUN_SETTINGS_FILE);
 
-        // need to adjust file: scheme to classpath as the files are now embedded in the fat-jar directly
+        // need to adjust file: scheme to classpath as the files are now embedded in the uber-jar directly
         List<String> lines = Files.readAllLines(settings.toPath());
         FileOutputStream fos = new FileOutputStream(target, false);
         for (String line : lines) {
             if (line.startsWith("camel.main.routesCompileDirectory")) {
-                continue; // skip as fat-jar should not compile to disk
+                continue; // skip as uber-jar should not compile to disk
             }
             for (String k : SETTINGS_PROP_SOURCE_KEYS) {
                 line = fileToClasspath(line, k);
diff --git a/dsl/camel-uberjar-main/src/main/java/org/apache/camel/main/uberjar/UberJarMain.java b/dsl/camel-uberjar-main/src/main/java/org/apache/camel/main/uberjar/UberJarMain.java
index 86cb0af7a3e..817ae4f97b8 100644
--- a/dsl/camel-uberjar-main/src/main/java/org/apache/camel/main/uberjar/UberJarMain.java
+++ b/dsl/camel-uberjar-main/src/main/java/org/apache/camel/main/uberjar/UberJarMain.java
@@ -48,7 +48,7 @@ public class UberJarMain extends KameletMain {
     @Override
     protected void doBuild() throws Exception {
         setAppName("Apache Camel (UberJar)");
-        setDownload(false); // no need for download as all is included in fat-jar
+        setDownload(false); // no need for download as all is included in uber-jar
 
         // load configuration file
         OrderedProperties prop = new OrderedProperties();
@@ -69,7 +69,7 @@ public class UberJarMain extends KameletMain {
         // setup configurations
         for (String key : prop.stringPropertyNames()) {
             if ("camel.main.routesReloadEnabled".equals(key)) {
-                // skip reload as this is not possible in fat-jar mode
+                // skip reload as this is not possible in uber-jar mode
                 continue;
             }
             if (key.startsWith("camel.")) {