You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/11/25 13:51:27 UTC
[hop] branch master updated: HOP-4625 Move library folder libswt to lib\swt
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new b08f4af1c0 HOP-4625 Move library folder libswt to lib\swt
new c83235ead6 Merge pull request #1826 from nadment/HOP-4625
b08f4af1c0 is described below
commit b08f4af1c0ada85b94c4f8353fe630da4d809274
Author: Nicolas Adment <39...@users.noreply.github.com>
AuthorDate: Thu Nov 24 20:48:54 2022 +0100
HOP-4625 Move library folder libswt to lib\swt
---
assemblies/client/src/assembly/assembly.xml | 10 +++++-----
assemblies/static/src/main/resources/hop-conf.bat | 2 +-
assemblies/static/src/main/resources/hop-conf.sh | 8 ++++----
assemblies/static/src/main/resources/hop-encrypt.bat | 2 +-
assemblies/static/src/main/resources/hop-encrypt.sh | 8 ++++----
assemblies/static/src/main/resources/hop-gui.bat | 2 +-
assemblies/static/src/main/resources/hop-gui.sh | 8 ++++----
assemblies/static/src/main/resources/hop-import.bat | 2 +-
assemblies/static/src/main/resources/hop-import.sh | 8 ++++----
assemblies/static/src/main/resources/hop-run.bat | 2 +-
assemblies/static/src/main/resources/hop-run.sh | 8 ++++----
assemblies/static/src/main/resources/hop-search.bat | 2 +-
assemblies/static/src/main/resources/hop-search.sh | 8 ++++----
assemblies/static/src/main/resources/hop-server.bat | 2 +-
assemblies/static/src/main/resources/hop-server.sh | 8 ++++----
assemblies/static/src/main/resources/hop-translator.bat | 2 +-
assemblies/static/src/main/resources/hop-translator.sh | 8 ++++----
docker/Dockerfile.web | 2 +-
docker/Dockerfile.web-fatjar | 2 +-
.../main/java/org/apache/hop/beam/gui/HopBeamGuiPlugin.java | 2 +-
20 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/assemblies/client/src/assembly/assembly.xml b/assemblies/client/src/assembly/assembly.xml
index c9ebec35af..82b2811e41 100644
--- a/assemblies/client/src/assembly/assembly.xml
+++ b/assemblies/client/src/assembly/assembly.xml
@@ -68,7 +68,7 @@
<includes>
<include>org.eclipse.platform:*.gtk.linux.x86_64</include>
</includes>
- <outputDirectory>libswt/linux/x86_64</outputDirectory>
+ <outputDirectory>lib/swt/linux/x86_64</outputDirectory>
<outputFileNameMapping>swt.jar</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
@@ -77,7 +77,7 @@
<includes>
<include>org.eclipse.platform:*.gtk.linux.aarch64</include>
</includes>
- <outputDirectory>libswt/linux/arm64</outputDirectory>
+ <outputDirectory>lib/swt/linux/arm64</outputDirectory>
<outputFileNameMapping>swt.jar</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
@@ -86,7 +86,7 @@
<includes>
<include>org.eclipse.platform:*.win32.x86_64</include>
</includes>
- <outputDirectory>libswt/win64</outputDirectory>
+ <outputDirectory>lib/swt/win64</outputDirectory>
<outputFileNameMapping>swt.jar</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
@@ -95,7 +95,7 @@
<includes>
<include>org.eclipse.platform:*.macosx.x86_64</include>
</includes>
- <outputDirectory>libswt/osx/x86_64</outputDirectory>
+ <outputDirectory>lib/swt/osx/x86_64</outputDirectory>
<outputFileNameMapping>swt.jar</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
@@ -104,7 +104,7 @@
<includes>
<include>org.eclipse.platform:*.macosx.aarch64</include>
</includes>
- <outputDirectory>libswt/osx/arm64</outputDirectory>
+ <outputDirectory>lib/swt/osx/arm64</outputDirectory>
<outputFileNameMapping>swt.jar</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
diff --git a/assemblies/static/src/main/resources/hop-conf.bat b/assemblies/static/src/main/resources/hop-conf.bat
index f25f58ed7c..ba516301b0 100644
--- a/assemblies/static/src/main/resources/hop-conf.bat
+++ b/assemblies/static/src/main/resources/hop-conf.bat
@@ -23,7 +23,7 @@ REM switch to script directory
cd /D %~dp0
set LIBSPATH=lib\core;lib\beam
-set CLASSPATH=lib\core\*;lib\beam\*;libswt\win64\*
+set CLASSPATH=lib\core\*;lib\beam\*;lib\swt\win64\*
:NormalStart
REM set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
diff --git a/assemblies/static/src/main/resources/hop-conf.sh b/assemblies/static/src/main/resources/hop-conf.sh
index a1a7719cfb..c4f7b403c4 100755
--- a/assemblies/static/src/main/resources/hop-conf.sh
+++ b/assemblies/static/src/main/resources/hop-conf.sh
@@ -68,16 +68,16 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Conf -DHOP_AUTO_CREATE_CONFIG
case $(uname -s) in
Linux)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/$(uname -m)/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-encrypt.bat b/assemblies/static/src/main/resources/hop-encrypt.bat
index 291aa43c56..11004b23e9 100644
--- a/assemblies/static/src/main/resources/hop-encrypt.bat
+++ b/assemblies/static/src/main/resources/hop-encrypt.bat
@@ -23,7 +23,7 @@ REM switch to script directory
cd /D %~dp0
set LIBSPATH=lib\core;lib\beam
-set CLASSPATH=lib\core\*;lib\beam\*;libswt\win64\*
+set CLASSPATH=lib\core\*;lib\beam\*;lib\swt\win64\*
:NormalStart
REM set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
diff --git a/assemblies/static/src/main/resources/hop-encrypt.sh b/assemblies/static/src/main/resources/hop-encrypt.sh
index e52efec93d..c1ded3102b 100755
--- a/assemblies/static/src/main/resources/hop-encrypt.sh
+++ b/assemblies/static/src/main/resources/hop-encrypt.sh
@@ -56,16 +56,16 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Encrypt -DHOP_PLATFORM_OS="$(
case $(uname -s) in
Linux)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/$(uname -m)/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-gui.bat b/assemblies/static/src/main/resources/hop-gui.bat
index b5416b07bc..e2bcef41eb 100755
--- a/assemblies/static/src/main/resources/hop-gui.bat
+++ b/assemblies/static/src/main/resources/hop-gui.bat
@@ -26,7 +26,7 @@ REM Option to change the Characterset of the Windows Shell to show foreign carac
if not "%HOP_WINDOWS_SHELL_ENCODING%"=="" chcp %HOP_WINDOWS_SHELL_ENCODING%
set LIBSPATH=lib\core;lib\beam
-set CLASSPATH=lib\core\*;lib\beam\*;libswt\win64\*
+set CLASSPATH=lib\core\*;lib\beam\*;lib\swt\win64\*
set _temphelp=0
if [%1]==[help] set _temphelp=1
diff --git a/assemblies/static/src/main/resources/hop-gui.sh b/assemblies/static/src/main/resources/hop-gui.sh
index 8f64583aaf..9c4fd9be83 100755
--- a/assemblies/static/src/main/resources/hop-gui.sh
+++ b/assemblies/static/src/main/resources/hop-gui.sh
@@ -71,16 +71,16 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=GUI -DHOP_AUTO_CREATE_CONFIG=
case $(uname -s) in
Linux)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/$(uname -m)/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-import.bat b/assemblies/static/src/main/resources/hop-import.bat
index ef9f67322f..b533e59c87 100644
--- a/assemblies/static/src/main/resources/hop-import.bat
+++ b/assemblies/static/src/main/resources/hop-import.bat
@@ -23,7 +23,7 @@ REM switch to script directory
cd /D %~dp0
set LIBSPATH=lib\core;lib\beam
-set CLASSPATH=lib\core\*;lib\beam\*;libswt\win64\*
+set CLASSPATH=lib\core\*;lib\beam\*;lib\swt\win64\*
:NormalStart
REM set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
diff --git a/assemblies/static/src/main/resources/hop-import.sh b/assemblies/static/src/main/resources/hop-import.sh
index 85ab0eea28..bf2e049915 100755
--- a/assemblies/static/src/main/resources/hop-import.sh
+++ b/assemblies/static/src/main/resources/hop-import.sh
@@ -67,16 +67,16 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Import -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/$(uname -m)/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-run.bat b/assemblies/static/src/main/resources/hop-run.bat
index df1bfa325c..1b7f9d9dfc 100755
--- a/assemblies/static/src/main/resources/hop-run.bat
+++ b/assemblies/static/src/main/resources/hop-run.bat
@@ -26,7 +26,7 @@ REM Option to change the Characterset of the Windows Shell to show foreign carac
if not "%HOP_WINDOWS_SHELL_ENCODING%"=="" chcp %HOP_WINDOWS_SHELL_ENCODING%
set LIBSPATH=lib\core;lib\beam
-set CLASSPATH=lib\core\*;lib\beam\*;libswt\win64\*
+set CLASSPATH=lib\core\*;lib\beam\*;lib\swt\win64\*
set _temphelp=0
if [%1]==[help] set _temphelp=1
diff --git a/assemblies/static/src/main/resources/hop-run.sh b/assemblies/static/src/main/resources/hop-run.sh
index 4e4b56d491..12f5621cb7 100755
--- a/assemblies/static/src/main/resources/hop-run.sh
+++ b/assemblies/static/src/main/resources/hop-run.sh
@@ -68,16 +68,16 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Run -DHOP_AUTO_CREATE_CONFIG=
case $(uname -s) in
Linux)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/$(uname -m)/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-search.bat b/assemblies/static/src/main/resources/hop-search.bat
index a266f9086b..52a866fdda 100644
--- a/assemblies/static/src/main/resources/hop-search.bat
+++ b/assemblies/static/src/main/resources/hop-search.bat
@@ -23,7 +23,7 @@ REM switch to script directory
cd /D %~dp0
set LIBSPATH=lib\core;lib\beam
-set CLASSPATH=lib\core\*;lib\beam\*;libswt\win64\*
+set CLASSPATH=lib\core\*;lib\beam\*;lib\swt\win64\*
:NormalStart
REM set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
diff --git a/assemblies/static/src/main/resources/hop-search.sh b/assemblies/static/src/main/resources/hop-search.sh
index 1bd8948891..1a6886a2a8 100755
--- a/assemblies/static/src/main/resources/hop-search.sh
+++ b/assemblies/static/src/main/resources/hop-search.sh
@@ -68,16 +68,16 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Search -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/$(uname -m)/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-server.bat b/assemblies/static/src/main/resources/hop-server.bat
index 6eed23df20..70ea57bda9 100644
--- a/assemblies/static/src/main/resources/hop-server.bat
+++ b/assemblies/static/src/main/resources/hop-server.bat
@@ -26,7 +26,7 @@ REM Option to change the Characterset of the Windows Shell to show foreign carac
if not "%HOP_WINDOWS_SHELL_ENCODING%"=="" chcp %HOP_WINDOWS_SHELL_ENCODING%
set LIBSPATH=lib\core;lib\beam
-set CLASSPATH=lib\core\*;lib\beam\*;libswt\win64\*
+set CLASSPATH=lib\core\*;lib\beam\*;lib\swt\win64\*
:NormalStart
REM set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
diff --git a/assemblies/static/src/main/resources/hop-server.sh b/assemblies/static/src/main/resources/hop-server.sh
index 7d9e03da0d..49669ceb21 100755
--- a/assemblies/static/src/main/resources/hop-server.sh
+++ b/assemblies/static/src/main/resources/hop-server.sh
@@ -68,16 +68,16 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Server -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/$(uname -m)/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-translator.bat b/assemblies/static/src/main/resources/hop-translator.bat
index 20ea17397e..897d55d7f4 100644
--- a/assemblies/static/src/main/resources/hop-translator.bat
+++ b/assemblies/static/src/main/resources/hop-translator.bat
@@ -23,7 +23,7 @@ REM switch to script directory
cd /D %~dp0
set LIBSPATH=lib\core;lib\beam
-set CLASSPATH=lib\core\*;lib\beam\*;libswt\win64\*
+set CLASSPATH=lib\core\*;lib\beam\*;lib\swt\win64\*
:NormalStart
REM set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
diff --git a/assemblies/static/src/main/resources/hop-translator.sh b/assemblies/static/src/main/resources/hop-translator.sh
index f8dec9a8d5..a601c6ec71 100755
--- a/assemblies/static/src/main/resources/hop-translator.sh
+++ b/assemblies/static/src/main/resources/hop-translator.sh
@@ -69,16 +69,16 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Translator -DHOP_AUTO_CREATE_
case $(uname -s) in
Linux)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/linux/$(uname -m)/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/linux/$(uname -m)/*"
fi
;;
Darwin)
if $($_HOP_JAVA -XshowSettings:properties -version 2>&1| grep -q "os.arch = aarch64"); then
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/arm64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/arm64/*"
else
- CLASSPATH="lib/core/*:lib/beam/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/core/*:lib/beam/*:lib/swt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web
index cf03869548..c960e95a48 100644
--- a/docker/Dockerfile.web
+++ b/docker/Dockerfile.web
@@ -59,6 +59,6 @@ COPY ./docker/resources/run-web.sh /tmp/
# Fix hop-config.json
RUN sed -i 's/config\/projects/${HOP_CONFIG_FOLDER}\/projects/g' "${CATALINA_HOME}"/webapps/ROOT/config/hop-config.json
-RUN mkdir -p "$CATALINA_HOME"/libswt/linux/x86_64
+RUN mkdir -p "$CATALINA_HOME"/lib/swt/linux/x86_64
CMD ["/bin/bash", "/tmp/run-web.sh"]
diff --git a/docker/Dockerfile.web-fatjar b/docker/Dockerfile.web-fatjar
index e063278d86..5f093c8ecd 100644
--- a/docker/Dockerfile.web-fatjar
+++ b/docker/Dockerfile.web-fatjar
@@ -62,6 +62,6 @@ COPY ./docker/resources/run-web.sh /tmp/
# Fix hop-config.json
RUN sed -i 's/config\/projects/${HOP_CONFIG_FOLDER}\/projects/g' "${CATALINA_HOME}"/webapps/ROOT/config/hop-config.json
-RUN mkdir -p "$CATALINA_HOME"/libswt/linux/x86_64
+RUN mkdir -p "$CATALINA_HOME"/lib/swt/linux/x86_64
CMD ["/bin/bash", "/tmp/run-web.sh"]
diff --git a/plugins/engines/beam/src/main/java/org/apache/hop/beam/gui/HopBeamGuiPlugin.java b/plugins/engines/beam/src/main/java/org/apache/hop/beam/gui/HopBeamGuiPlugin.java
index 0bde430739..31c507c024 100644
--- a/plugins/engines/beam/src/main/java/org/apache/hop/beam/gui/HopBeamGuiPlugin.java
+++ b/plugins/engines/beam/src/main/java/org/apache/hop/beam/gui/HopBeamGuiPlugin.java
@@ -211,7 +211,7 @@ public class HopBeamGuiPlugin {
Set<File> jarFiles = new HashSet<>();
jarFiles.addAll(FileUtils.listFiles(new File("lib"), new String[] {"jar"}, true));
- File libSwtFiles = new File("libswt/linux/x86_64");
+ File libSwtFiles = new File("lib/swt/linux/x86_64");
if (libSwtFiles.exists())
jarFiles.addAll(FileUtils.listFiles(libSwtFiles, new String[] {"jar"}, true));