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/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new a205054 HOP-2377: add support for Apple M1
new a414731 Merge pull request #981 from hansva/HOP-2377
a205054 is described below
commit a205054531edc5bd9e25dca833d4e9c9f22a80a7
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Tue Aug 3 17:45:42 2021 +0200
HOP-2377: add support for Apple M1
HOP-2377: update launch scripts and make more generic
HOP-2377: formatting
---
assemblies/client/pom.xml | 12 +++++++
assemblies/client/src/assembly/assembly.xml | 11 +++++-
assemblies/static/src/main/resources/hop-conf.sh | 36 ++++++++++----------
.../static/src/main/resources/hop-encrypt.sh | 33 +++++++++---------
assemblies/static/src/main/resources/hop-gui.sh | 32 +++++++++---------
assemblies/static/src/main/resources/hop-import.sh | 34 +++++++++----------
assemblies/static/src/main/resources/hop-run.sh | 36 ++++++++++----------
assemblies/static/src/main/resources/hop-search.sh | 36 ++++++++++----------
assemblies/static/src/main/resources/hop-server.sh | 39 +++++++++++-----------
.../static/src/main/resources/hop-translator.sh | 34 +++++++++----------
pom.xml | 2 +-
11 files changed, 158 insertions(+), 147 deletions(-)
diff --git a/assemblies/client/pom.xml b/assemblies/client/pom.xml
index 07fd00a..b2ddddd 100644
--- a/assemblies/client/pom.xml
+++ b/assemblies/client/pom.xml
@@ -37,6 +37,7 @@
<org.eclipse.swt.gtk.linux.x86_64.version>${org.eclipse.platform.version}</org.eclipse.swt.gtk.linux.x86_64.version>
<org.eclipse.swt.win32.win32.x86_64.version>${org.eclipse.platform.version}</org.eclipse.swt.win32.win32.x86_64.version>
<org.eclipse.swt.cocoa.macosx.x86_64.version>${org.eclipse.platform.version}</org.eclipse.swt.cocoa.macosx.x86_64.version>
+
<org.eclipse.swt.cocoa.macosx.aarch64.version>${org.eclipse.platform.version}</org.eclipse.swt.cocoa.macosx.aarch64.version>
</properties>
<dependencies>
@@ -231,6 +232,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt.cocoa.macosx.aarch64</artifactId>
+ <version>${org.eclipse.swt.cocoa.macosx.aarch64.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
diff --git a/assemblies/client/src/assembly/assembly.xml
b/assemblies/client/src/assembly/assembly.xml
index 130d579..8c26bb6 100644
--- a/assemblies/client/src/assembly/assembly.xml
+++ b/assemblies/client/src/assembly/assembly.xml
@@ -67,7 +67,16 @@
<includes>
<include>org.eclipse.platform:*.macosx.x86_64</include>
</includes>
- <outputDirectory>libswt/osx64</outputDirectory>
+ <outputDirectory>libswt/osx/x86_64</outputDirectory>
+ <outputFileNameMapping>swt.jar</outputFileNameMapping>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.eclipse.platform:*.macosx.aarch64</include>
+ </includes>
+ <outputDirectory>libswt/osx/arm64</outputDirectory>
<outputFileNameMapping>swt.jar</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
diff --git a/assemblies/static/src/main/resources/hop-conf.sh
b/assemblies/static/src/main/resources/hop-conf.sh
index 26be0d1..a47dfd3 100755
--- a/assemblies/static/src/main/resources/hop-conf.sh
+++ b/assemblies/static/src/main/resources/hop-conf.sh
@@ -18,8 +18,8 @@
#
#
-ORIGINDIR=$( pwd )
-BASEDIR=$( dirname $0 )
+ORIGINDIR=$(pwd)
+BASEDIR=$(dirname $0)
cd $BASEDIR
# set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
@@ -43,40 +43,38 @@ fi
# Add HOP variables if they're set:
#
if [ -n "${HOP_AUDIT_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
fi
if [ -n "${HOP_CONFIG_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
fi
if [ -n "${HOP_SHARED_JDBC_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
fi
if [ -n "${HOP_PLUGIN_BASE_FOLDERS}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
fi
if [ -n "${HOP_PASSWORD_ENCODER_PLUGIN}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
fi
if [ -n "${HOP_AES_ENCODER_KEY}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
fi
HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Conf
-DHOP_AUTO_CREATE_CONFIG=Y -DHOP_PLATFORM_OS="$(uname -s)
-case $( uname -s ) in
- Linux)
- CLASSPATH="lib/*:libswt/linux/$( uname -m )/*"
- ;;
- Darwin)
- CLASSPATH="lib/*:libswt/osx64/*"
- HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
- ;;
+case $(uname -s) in
+Linux)
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ ;;
+Darwin)
+ CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
+ ;;
esac
-
-"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.config.HopConfig "$@"
+"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.config.HopConfig "$@"
EXITCODE=$?
cd ${ORIGINDIR}
exit $EXITCODE
-
diff --git a/assemblies/static/src/main/resources/hop-encrypt.sh
b/assemblies/static/src/main/resources/hop-encrypt.sh
index 849d315..f177c12 100755
--- a/assemblies/static/src/main/resources/hop-encrypt.sh
+++ b/assemblies/static/src/main/resources/hop-encrypt.sh
@@ -18,8 +18,8 @@
#
#
-ORIGINDIR=$( pwd )
-BASEDIR=$( dirname $0 )
+ORIGINDIR=$(pwd)
+BASEDIR=$(dirname $0)
cd $BASEDIR
# Settings for all OSses
@@ -31,34 +31,34 @@ OPTIONS='-Xmx64m'
# OPTIONS="${OPTIONS} -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5009"
if [ -n "${HOP_AUDIT_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
fi
if [ -n "${HOP_CONFIG_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
fi
if [ -n "${HOP_SHARED_JDBC_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
fi
if [ -n "${HOP_PLUGIN_BASE_FOLDERS}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
fi
if [ -n "${HOP_PASSWORD_ENCODER_PLUGIN}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
fi
if [ -n "${HOP_AES_ENCODER_KEY}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
fi
HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Encrypt
-DHOP_PLATFORM_OS="$(uname -s)
-case $( uname -s ) in
- Linux)
- CLASSPATH="lib/*"
- ;;
- Darwin)
- CLASSPATH="lib/*"
- HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
- ;;
+case $(uname -s) in
+Linux)
+ CLASSPATH="lib/*"
+ ;;
+Darwin)
+ CLASSPATH="lib/*"
+ HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
+ ;;
esac
java ${HOP_OPTIONS} -classpath "${CLASSPATH}"
org.apache.hop.encryption.HopEncrypt $@
@@ -66,4 +66,3 @@ EXITCODE=$?
cd ${ORIGINDIR}
exit $EXITCODE
-
diff --git a/assemblies/static/src/main/resources/hop-gui.sh
b/assemblies/static/src/main/resources/hop-gui.sh
index ae6c355..70f1fe9 100755
--- a/assemblies/static/src/main/resources/hop-gui.sh
+++ b/assemblies/static/src/main/resources/hop-gui.sh
@@ -18,8 +18,8 @@
#
#
-ORIGINDIR=$( pwd )
-BASEDIR=$( dirname $0 )
+ORIGINDIR=$(pwd)
+BASEDIR=$(dirname $0)
cd $BASEDIR
# set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
@@ -43,34 +43,34 @@ fi
# Add HOP variables if they're set:
#
if [ -n "${HOP_AUDIT_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
fi
if [ -n "${HOP_CONFIG_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
fi
if [ -n "${HOP_SHARED_JDBC_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
fi
if [ -n "${HOP_PLUGIN_BASE_FOLDERS}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
fi
if [ -n "${HOP_PASSWORD_ENCODER_PLUGIN}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
fi
if [ -n "${HOP_AES_ENCODER_KEY}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
fi
HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=GUI
-DHOP_AUTO_CREATE_CONFIG=Y -DHOP_PLATFORM_OS="$(uname -s)
-case $( uname -s ) in
- Linux)
- CLASSPATH="lib/*:libswt/linux/$( uname -m )/*"
- ;;
- Darwin)
- CLASSPATH="lib/*:libswt/osx64/*"
- HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
- ;;
+case $(uname -s) in
+Linux)
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ ;;
+Darwin)
+ CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
+ ;;
esac
"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.ui.hopgui.HopGui $@
diff --git a/assemblies/static/src/main/resources/hop-import.sh
b/assemblies/static/src/main/resources/hop-import.sh
index 77eb474..e0931e1 100755
--- a/assemblies/static/src/main/resources/hop-import.sh
+++ b/assemblies/static/src/main/resources/hop-import.sh
@@ -17,8 +17,8 @@
# limitations under the License.
#
-ORIGINDIR=$( pwd )
-BASEDIR=$( dirname $0 )
+ORIGINDIR=$(pwd)
+BASEDIR=$(dirname $0)
cd $BASEDIR
# set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
@@ -42,37 +42,37 @@ fi
# Add HOP variables if they're set:
#
if [ -n "${HOP_AUDIT_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
fi
if [ -n "${HOP_CONFIG_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
fi
if [ -n "${HOP_SHARED_JDBC_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
fi
if [ -n "${HOP_PLUGIN_BASE_FOLDERS}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
fi
if [ -n "${HOP_PASSWORD_ENCODER_PLUGIN}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
fi
if [ -n "${HOP_AES_ENCODER_KEY}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
fi
HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Import
-DHOP_AUTO_CREATE_CONFIG=Y -DHOP_PLATFORM_OS="$(uname -s)
-case $( uname -s ) in
- Linux)
- CLASSPATH="lib/*:libswt/linux/$( uname -m )/*"
- ;;
- Darwin)
- CLASSPATH="lib/*:libswt/osx64/*"
- HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
- ;;
+case $(uname -s) in
+Linux)
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ ;;
+Darwin)
+ CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
+ ;;
esac
-"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.imp.HopImport "$@"
+"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.imp.HopImport "$@"
EXITCODE=$?
cd ${ORIGINDIR}
diff --git a/assemblies/static/src/main/resources/hop-run.sh
b/assemblies/static/src/main/resources/hop-run.sh
index ef61244..416f9c1 100755
--- a/assemblies/static/src/main/resources/hop-run.sh
+++ b/assemblies/static/src/main/resources/hop-run.sh
@@ -18,8 +18,8 @@
#
#
-ORIGINDIR=$( pwd )
-BASEDIR=$( dirname $0 )
+ORIGINDIR=$(pwd)
+BASEDIR=$(dirname $0)
cd $BASEDIR
# set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
@@ -43,40 +43,38 @@ fi
# Add HOP variables if they're set:
#
if [ -n "${HOP_AUDIT_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
fi
if [ -n "${HOP_CONFIG_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
fi
if [ -n "${HOP_SHARED_JDBC_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
fi
if [ -n "${HOP_PLUGIN_BASE_FOLDERS}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
fi
if [ -n "${HOP_PASSWORD_ENCODER_PLUGIN}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
fi
if [ -n "${HOP_AES_ENCODER_KEY}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
fi
HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Run
-DHOP_AUTO_CREATE_CONFIG=Y -DHOP_PLATFORM_OS="$(uname -s)
-case $( uname -s ) in
- Linux)
- CLASSPATH="lib/*:libswt/linux/$( uname -m )/*"
- ;;
- Darwin)
- CLASSPATH="lib/*:libswt/osx64/*"
- HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
- ;;
+case $(uname -s) in
+Linux)
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ ;;
+Darwin)
+ CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
+ ;;
esac
-
-"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.run.HopRun "$@"
+"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.run.HopRun "$@"
EXITCODE=$?
cd ${ORIGINDIR}
exit $EXITCODE
-
diff --git a/assemblies/static/src/main/resources/hop-search.sh
b/assemblies/static/src/main/resources/hop-search.sh
index 4e84626..1b735be 100755
--- a/assemblies/static/src/main/resources/hop-search.sh
+++ b/assemblies/static/src/main/resources/hop-search.sh
@@ -18,8 +18,8 @@
#
#
-ORIGINDIR=$( pwd )
-BASEDIR=$( dirname $0 )
+ORIGINDIR=$(pwd)
+BASEDIR=$(dirname $0)
cd $BASEDIR
# set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
@@ -43,40 +43,38 @@ fi
# Add HOP variables if they're set:
#
if [ -n "${HOP_AUDIT_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
fi
if [ -n "${HOP_CONFIG_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
fi
if [ -n "${HOP_SHARED_JDBC_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
fi
if [ -n "${HOP_PLUGIN_BASE_FOLDERS}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
fi
if [ -n "${HOP_PASSWORD_ENCODER_PLUGIN}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
fi
if [ -n "${HOP_AES_ENCODER_KEY}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
fi
HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Search
-DHOP_AUTO_CREATE_CONFIG=Y -DHOP_PLATFORM_OS="$(uname -s)
-case $( uname -s ) in
- Linux)
- CLASSPATH="lib/*:libswt/linux/$( uname -m )/*"
- ;;
- Darwin)
- CLASSPATH="lib/*:libswt/osx64/*"
- HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
- ;;
+case $(uname -s) in
+Linux)
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ ;;
+Darwin)
+ CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
+ ;;
esac
-
-"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.search.HopSearch "$@"
+"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
"${CLASSPATH}" org.apache.hop.search.HopSearch "$@"
EXITCODE=$?
cd ${ORIGINDIR}
exit $EXITCODE
-
diff --git a/assemblies/static/src/main/resources/hop-server.sh
b/assemblies/static/src/main/resources/hop-server.sh
index d16eb13..7125618 100755
--- a/assemblies/static/src/main/resources/hop-server.sh
+++ b/assemblies/static/src/main/resources/hop-server.sh
@@ -18,8 +18,8 @@
#
#
-ORIGINDIR=$( pwd )
-BASEDIR=$( dirname $0 )
+ORIGINDIR=$(pwd)
+BASEDIR=$(dirname $0)
cd $BASEDIR
# set java primary is HOP_JAVA_HOME fallback to JAVA_HOME or default java
@@ -43,46 +43,45 @@ fi
# Add HOP variables if they're set:
#
if [ -n "${HOP_AUDIT_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
fi
if [ -n "${HOP_CONFIG_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
fi
if [ -n "${HOP_SHARED_JDBC_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
fi
if [ -n "${HOP_PLUGIN_BASE_FOLDERS}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
fi
if [ -n "${HOP_PASSWORD_ENCODER_PLUGIN}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
fi
if [ -n "${HOP_AES_ENCODER_KEY}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
fi
HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Server
-DHOP_AUTO_CREATE_CONFIG=Y -DHOP_PLATFORM_OS="$(uname -s)
-case $( uname -s ) in
- Linux)
- CLASSPATH="lib/*:libswt/linux/$( uname -m )/*"
- ;;
- Darwin)
- CLASSPATH="lib/*:libswt/osx64/*"
- HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
- ;;
+case $(uname -s) in
+Linux)
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ ;;
+Darwin)
+ CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
+ ;;
esac
if [ ! "x$JAAS_LOGIN_MODULE_CONFIG" = "x" -a ! "x$JAAS_LOGIN_MODULE_NAME" =
"x" ]; then
- HOP_OPTIONS=$HOP_OPTIONS"
-Djava.security.auth.login.config=$JAAS_LOGIN_MODULE_CONFIG"
- HOP_OPTIONS=$HOP_OPTIONS" -Dloginmodulename=$JAAS_LOGIN_MODULE_NAME"
+ HOP_OPTIONS=$HOP_OPTIONS"
-Djava.security.auth.login.config=$JAAS_LOGIN_MODULE_CONFIG"
+ HOP_OPTIONS=$HOP_OPTIONS" -Dloginmodulename=$JAAS_LOGIN_MODULE_NAME"
fi
# OPTIONS="$OPTIONS -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
-"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
${CLASSPATH} org.apache.hop.www.HopServer $@
+"$_HOP_JAVA" ${HOP_OPTIONS} -Djava.library.path=$LIBPATH -classpath
${CLASSPATH} org.apache.hop.www.HopServer $@
EXITCODE=$?
cd ${ORIGINDIR}
exit $EXITCODE
-
diff --git a/assemblies/static/src/main/resources/hop-translator.sh
b/assemblies/static/src/main/resources/hop-translator.sh
index 3ae8019..59246d6 100755
--- a/assemblies/static/src/main/resources/hop-translator.sh
+++ b/assemblies/static/src/main/resources/hop-translator.sh
@@ -18,8 +18,8 @@
#
#
-ORIGINDIR=$( pwd )
-BASEDIR=$( dirname $0 )
+ORIGINDIR=$(pwd)
+BASEDIR=$(dirname $0)
cd $BASEDIR
# Settings for all OSses
@@ -33,40 +33,38 @@ OPTIONS='-Xmx1g'
# Add HOP variables if they're set:
#
if [ -n "${HOP_AUDIT_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AUDIT_FOLDER=${HOP_AUDIT_FOLDER}"
fi
if [ -n "${HOP_CONFIG_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_CONFIG_FOLDER=${HOP_CONFIG_FOLDER}"
fi
if [ -n "${HOP_SHARED_JDBC_FOLDER}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_SHARED_JDBC_FOLDER=${HOP_SHARED_JDBC_FOLDER}"
fi
if [ -n "${HOP_PLUGIN_BASE_FOLDERS}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PLUGIN_BASE_FOLDERS=${HOP_PLUGIN_BASE_FOLDERS}"
fi
if [ -n "${HOP_PASSWORD_ENCODER_PLUGIN}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
+ HOP_OPTIONS="${HOP_OPTIONS}
-DHOP_PASSWORD_ENCODER_PLUGIN=${HOP_PASSWORD_ENCODER_PLUGIN}"
fi
if [ -n "${HOP_AES_ENCODER_KEY}" ]; then
- HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
+ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_AES_ENCODER_KEY=${HOP_AES_ENCODER_KEY}"
fi
HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Translator
-DHOP_AUTO_CREATE_CONFIG=Y -DHOP_PLATFORM_OS="$(uname -s)
-case $( uname -s ) in
- Linux)
- CLASSPATH="lib/*:libswt/linux/$( uname -m )/*"
- ;;
- Darwin)
- CLASSPATH="lib/*:libswt/osx64/*"
- OPTIONS="${OPTIONS} -XstartOnFirstThread"
- ;;
+case $(uname -s) in
+Linux)
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ ;;
+Darwin)
+ CLASSPATH="lib/*:libswt/osx/$(uname -m)/*"
+ OPTIONS="${OPTIONS} -XstartOnFirstThread"
+ ;;
esac
-
java ${OPTIONS} -classpath "${CLASSPATH}"
org.apache.hop.ui.i18n.editor.Translator $@
EXITCODE=$?
cd ${ORIGINDIR}
exit $EXITCODE
-
diff --git a/pom.xml b/pom.xml
index 6eb7a85..40a9e15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<!-- Third-party dependencies -->
<jetty.version>9.4.35.v20201120</jetty.version>
- <org.eclipse.platform.version>3.116.0</org.eclipse.platform.version>
+ <org.eclipse.platform.version>3.116.100</org.eclipse.platform.version>
<org.eclipse.commands.version>3.9.600</org.eclipse.commands.version>
<org.eclipse.equinox.version>3.10.600</org.eclipse.equinox.version>
<rhino.version>1.7.12</rhino.version>
