From af0ac35983c2c344af117869eefb36a08e426387 Mon Sep 17 00:00:00 2001 From: Pierantonio Merlino Date: Fri, 16 Aug 2024 11:47:43 +0200 Subject: [PATCH] refactor: Remove monit and sysV bundles and references (#5334) * Removed monit resources and references Signed-off-by: pierantoniomerlino * Removed sysV resources and references Signed-off-by: pierantoniomerlino * Removed sysc.provider; deleted service.manager property from ant Signed-off-by: pierantoniomerlino * Removed sysv from distrib pom and build properties Signed-off-by: pierantoniomerlino * Fixed ant script Signed-off-by: pierantoniomerlino --------- Signed-off-by: pierantoniomerlino --- kura/distrib/config/kura.build.properties | 1 - kura/distrib/pom.xml | 13 - .../src/main/ant/build_equinox_distrib.xml | 116 +------ .../main/resources/common/kura.init.raspbian | 54 ---- .../src/main/resources/common/kura.init.yocto | 50 --- .../main/resources/common/monit.init.raspbian | 46 --- .../main/resources/common/monitrc.raspbian | 14 - .../docker-x86_64-nn/deb/control/preinst | 2 +- .../docker-x86_64-nn/deb/control/prerm | 2 +- .../generic-aarch64-nn/deb/control/preinst | 2 +- .../generic-aarch64-nn/deb/control/prerm | 2 +- .../generic-aarch64/deb/control/preinst | 2 +- .../generic-aarch64/deb/control/prerm | 2 +- .../generic-arm32-nn/deb/control/preinst | 2 +- .../generic-arm32-nn/deb/control/prerm | 2 +- .../generic-arm32/deb/control/preinst | 2 +- .../resources/generic-arm32/deb/control/prerm | 2 +- .../generic-x86_64/deb/control/preinst | 2 +- .../generic-x86_64/deb/control/prerm | 2 +- kura/distrib/src/main/sh/extract.sh | 4 +- kura/distrib/src/main/sh/extract_nn.sh | 4 +- kura/distrib/src/main/sh/extract_upgrade.sh | 6 +- .../.gitignore | 2 - .../META-INF/MANIFEST.MF | 19 -- .../OSGI-INF/dnsserver.xml | 23 -- .../about.html | 36 --- .../about_files/epl-v20.html | 301 ------------------ .../build.properties | 21 -- .../pom.xml | 33 -- .../sysv/net/dns/LinuxDnsServerSysV.java | 59 ---- kura/pom.xml | 1 - 31 files changed, 30 insertions(+), 797 deletions(-) delete mode 100755 kura/distrib/src/main/resources/common/kura.init.raspbian delete mode 100755 kura/distrib/src/main/resources/common/kura.init.yocto delete mode 100644 kura/distrib/src/main/resources/common/monit.init.raspbian delete mode 100644 kura/distrib/src/main/resources/common/monitrc.raspbian delete mode 100644 kura/org.eclipse.kura.linux.sysv.provider/.gitignore delete mode 100644 kura/org.eclipse.kura.linux.sysv.provider/META-INF/MANIFEST.MF delete mode 100644 kura/org.eclipse.kura.linux.sysv.provider/OSGI-INF/dnsserver.xml delete mode 100644 kura/org.eclipse.kura.linux.sysv.provider/about.html delete mode 100644 kura/org.eclipse.kura.linux.sysv.provider/about_files/epl-v20.html delete mode 100644 kura/org.eclipse.kura.linux.sysv.provider/build.properties delete mode 100644 kura/org.eclipse.kura.linux.sysv.provider/pom.xml delete mode 100644 kura/org.eclipse.kura.linux.sysv.provider/src/main/java/org/eclipse/kura/internal/linux/sysv/net/dns/LinuxDnsServerSysV.java diff --git a/kura/distrib/config/kura.build.properties b/kura/distrib/config/kura.build.properties index 03ad47363eb..ecfc182fa8a 100644 --- a/kura/distrib/config/kura.build.properties +++ b/kura/distrib/config/kura.build.properties @@ -47,7 +47,6 @@ org.eclipse.kura.ble.ibeacon.provider.version=2.0.0-SNAPSHOT org.eclipse.kura.ble.eddystone.provider.version=2.0.0-SNAPSHOT org.eclipse.kura.linux.command.version=2.0.0-SNAPSHOT org.eclipse.kura.linux.net.version=3.0.0-SNAPSHOT -org.eclipse.kura.linux.sysv.provider.version=2.0.0-SNAPSHOT org.eclipse.kura.linux.systemd.provider.version=2.0.0-SNAPSHOT org.eclipse.kura.linux.debian.provider.version=2.0.0-SNAPSHOT org.eclipse.kura.linux.redhat.provider.version=2.0.0-SNAPSHOT diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 63ea5e7a659..e73de846885 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -321,11 +321,6 @@ org.eclipse.kura.linux.net ${org.eclipse.kura.linux.net.version} - - org.eclipse.kura - org.eclipse.kura.linux.sysv.provider - ${org.eclipse.kura.linux.sysv.provider.version} - org.eclipse.kura org.eclipse.kura.linux.systemd.provider @@ -771,7 +766,6 @@ - @@ -1202,7 +1196,6 @@ - @@ -1300,7 +1293,6 @@ - @@ -1393,7 +1385,6 @@ - @@ -1491,7 +1482,6 @@ - @@ -1584,7 +1574,6 @@ - @@ -1682,7 +1671,6 @@ - @@ -1775,7 +1763,6 @@ - diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml index d09bbbf4d4f..b52f2adf29b 100644 --- a/kura/distrib/src/main/ant/build_equinox_distrib.xml +++ b/kura/distrib/src/main/ant/build_equinox_distrib.xml @@ -114,22 +114,6 @@ - - - - - - - - - - - - - - - - @@ -251,10 +235,8 @@ - - @@ -509,12 +491,6 @@ fi]]> file="src/main/resources/common/manage_kura_users.sh" prefix="${build.output.name}/${install.folder}/" filemode="700" /> - - @@ -524,29 +500,6 @@ fi]]> prefix="${build.output.name}/${install.folder}" filemode="700" /> - - - - - - - - - - - - @@ -554,12 +507,6 @@ fi]]> - - - - - - - - - - - - - - @@ -1738,6 +1667,11 @@ fi]]> + + + @@ -1752,14 +1686,6 @@ fi]]> - - - - - - @@ -1776,14 +1702,6 @@ fi]]> - - - - - - file="${project.build.directory}/plugins/org.eclipse.kura.linux.net_${org.eclipse.kura.linux.net.version}.jar" prefix="${build.output.name}/${plugins.folder}" /> + + + @@ -1826,15 +1750,6 @@ fi]]> prefix="${build.output.name}/${plugins.folder}" /> - - - - - - - - - - - - diff --git a/kura/distrib/src/main/resources/common/kura.init.raspbian b/kura/distrib/src/main/resources/common/kura.init.raspbian deleted file mode 100755 index 162c0d96fbc..00000000000 --- a/kura/distrib/src/main/resources/common/kura.init.raspbian +++ /dev/null @@ -1,54 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: kura -# Required-Start: $all -# Required-Stop: $all -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Kura initscript -# Description: -### END INIT INFO - -INSTALL_DIR=/opt/eclipse - -kura=${INSTALL_DIR}/kura/bin/start_kura_background.sh -pidfile=/var/run/kura.pid -kura_args="" - -export PATH=$PATH:/usr/java/bin - -test -x "$kura" || exit 0 - -case "$1" in - start) - echo -n "Starting Kura" - start-stop-daemon --start --quiet --exec $kura -- $kura_args - RETVAL=$? - echo "." - ;; - stop) - echo -n "Stopping Kura" - ((echo "stop 0"; sleep 10) | telnet localhost 5002) > /dev/null 2>&1 - start-stop-daemon --stop --quiet --pidfile $pidfile - RETVAL=$? - echo "." - if [ -f /tmp/watchdog ]; then - echo w > `cat /tmp/watchdog` - fi - ;; - restart) - $0 stop - $0 start - RETVAL=$? - ;; - status) - $kura $kura_args status - RETVAL=$? - echo "." - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 -esac - -exit $RETVAL diff --git a/kura/distrib/src/main/resources/common/kura.init.yocto b/kura/distrib/src/main/resources/common/kura.init.yocto deleted file mode 100755 index e90e2b1786d..00000000000 --- a/kura/distrib/src/main/resources/common/kura.init.yocto +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh -# -# This is an init script for openembedded -# Copy it to /etc/init.d/kura and type -# > update-rc.d kura defaults 99 -# - -KURA_DIR=/opt/eclipse/kura - -kura=${KURA_DIR}/bin/start_kura_background.sh -pidfile=/var/run/kura.pid -kura_args="" - -export PATH=$PATH:/usr/java/bin - -test -x "$kura" || exit 0 - -case "$1" in - start) - echo -n "Starting Kura" - start-stop-daemon --start --quiet --exec $kura -- $kura_args - RETVAL=$? - echo "." - ;; - stop) - echo -n "Stopping Kura" - ((echo "stop 0"; sleep 10) | telnet localhost 5002) > /dev/null 2>&1 - start-stop-daemon --stop --quiet --pidfile $pidfile - RETVAL=$? - echo "." - if [ -f /tmp/watchdog ]; then - echo w > `cat /tmp/watchdog` - fi - ;; - restart) - $0 stop - $0 start - RETVAL=$? - ;; - status) - $kura $kura_args status - RETVAL=$? - echo "." - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 -esac - -exit $RETVAL diff --git a/kura/distrib/src/main/resources/common/monit.init.raspbian b/kura/distrib/src/main/resources/common/monit.init.raspbian deleted file mode 100644 index f08e1c13c79..00000000000 --- a/kura/distrib/src/main/resources/common/monit.init.raspbian +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: monit -# Required-Start: $all -# Required-Stop: $all -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: monit initscript -# Description: -### END INIT INFO - -monit=/usr/bin/monit -pidfile=/var/run/monit.pid -monit_args="-c /etc/monitrc" - -test -x "$monit" || exit 0 - -case "$1" in - start) - echo -n "Starting Monit" - start-stop-daemon --start --quiet --exec $monit -- $monit_args - RETVAL=$? - echo "." - ;; - stop) - echo -n "Stopping Monit" - start-stop-daemon --stop --quiet --pidfile $pidfile - RETVAL=$? - echo "." - ;; - restart) - $0 stop - $0 start - RETVAL=$? - ;; - status) - $monit $monit_args status - RETVAL=$? - echo "." - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 -esac - -exit $RETVAL diff --git a/kura/distrib/src/main/resources/common/monitrc.raspbian b/kura/distrib/src/main/resources/common/monitrc.raspbian deleted file mode 100644 index 12010fa84ba..00000000000 --- a/kura/distrib/src/main/resources/common/monitrc.raspbian +++ /dev/null @@ -1,14 +0,0 @@ -set daemon 5 -set logfile syslog facility log_daemon -set statefile /var/.monit.state -check system localhost - if memory usage > 75% then alert - if cpu usage (user) > 80% for 1 cycles then alert - if cpu usage (system) > 80% for 1 cycles then alert - if cpu usage (user) > 90% for 30 cycles then unmonitor - if cpu usage (system) > 90% for 30 cycles then unmonitor - if loadavg(15min) greater than 4 for 5 cycle then alert -check process kura with pidfile "/var/run/kura.pid" - start program = "/etc/init.d/kura start" - stop program = "/etc/init.d/kura stop" - if cpu usage > 80% for 5 cycles then alert diff --git a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/preinst b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/preinst index 331165b5c9c..7cb78b958ab 100644 --- a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/preinst +++ b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/preinst @@ -84,7 +84,7 @@ echo "" echo "Installing Kura..." echo "Installing Kura..." > /tmp/kura_install.log 2>&1 -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/prerm b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/prerm index 729de7ecf6c..834141ff7c7 100644 --- a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/prerm +++ b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/prerm @@ -100,7 +100,7 @@ echo "Uninstalling KURA..." PIDS=`pgrep java` -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst index 375d8828fa2..292fcd5358b 100755 --- a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst +++ b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst @@ -85,7 +85,7 @@ echo "" echo "Installing Kura..." echo "Installing Kura..." > /tmp/kura_install.log 2>&1 -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm index 1d7b42f95f2..de04778d1f8 100644 --- a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm +++ b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm @@ -117,7 +117,7 @@ echo "Uninstalling KURA..." PIDS=`pgrep java` -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst b/kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst index cf2c585a473..12cd3109f9e 100755 --- a/kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst +++ b/kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst @@ -87,7 +87,7 @@ echo "" echo "Installing Kura..." echo "Installing Kura..." > /tmp/kura_install.log 2>&1 -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm b/kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm index 42482d95bc7..edd084f9fae 100644 --- a/kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm +++ b/kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm @@ -145,7 +145,7 @@ echo "Uninstalling KURA..." PIDS=`pgrep java` -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/preinst b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/preinst index 375d8828fa2..292fcd5358b 100755 --- a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/preinst +++ b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/preinst @@ -85,7 +85,7 @@ echo "" echo "Installing Kura..." echo "Installing Kura..." > /tmp/kura_install.log 2>&1 -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/prerm b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/prerm index 1d7b42f95f2..de04778d1f8 100644 --- a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/prerm +++ b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/prerm @@ -117,7 +117,7 @@ echo "Uninstalling KURA..." PIDS=`pgrep java` -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/preinst b/kura/distrib/src/main/resources/generic-arm32/deb/control/preinst index cf2c585a473..12cd3109f9e 100755 --- a/kura/distrib/src/main/resources/generic-arm32/deb/control/preinst +++ b/kura/distrib/src/main/resources/generic-arm32/deb/control/preinst @@ -87,7 +87,7 @@ echo "" echo "Installing Kura..." echo "Installing Kura..." > /tmp/kura_install.log 2>&1 -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/prerm b/kura/distrib/src/main/resources/generic-arm32/deb/control/prerm index 42482d95bc7..edd084f9fae 100644 --- a/kura/distrib/src/main/resources/generic-arm32/deb/control/prerm +++ b/kura/distrib/src/main/resources/generic-arm32/deb/control/prerm @@ -145,7 +145,7 @@ echo "Uninstalling KURA..." PIDS=`pgrep java` -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst b/kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst index cf2c585a473..12cd3109f9e 100755 --- a/kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst +++ b/kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst @@ -87,7 +87,7 @@ echo "" echo "Installing Kura..." echo "Installing Kura..." > /tmp/kura_install.log 2>&1 -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm b/kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm index 42482d95bc7..edd084f9fae 100644 --- a/kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm +++ b/kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm @@ -145,7 +145,7 @@ echo "Uninstalling KURA..." PIDS=`pgrep java` -#Kill JVM and monit for installation +# Kill Kura for installation if [ -f "/var/run/kura.pid" ] ; then KURA_PID=`cat /var/run/kura.pid` diff --git a/kura/distrib/src/main/sh/extract.sh b/kura/distrib/src/main/sh/extract.sh index bec0737211d..20a60d1adef 100755 --- a/kura/distrib/src/main/sh/extract.sh +++ b/kura/distrib/src/main/sh/extract.sh @@ -322,8 +322,8 @@ echo "" echo "Installing Kura..." echo "Installing Kura..." > $LOG 2>&1 -#Kill JVM and monit for installation -{ killall monit java || true; } >> $LOG 2>&1 +# Kill Kura for installation +{ killall java || true; } >> $LOG 2>&1 run_kura_install exit 0 diff --git a/kura/distrib/src/main/sh/extract_nn.sh b/kura/distrib/src/main/sh/extract_nn.sh index a1564be98e0..86cb1048095 100755 --- a/kura/distrib/src/main/sh/extract_nn.sh +++ b/kura/distrib/src/main/sh/extract_nn.sh @@ -133,8 +133,8 @@ echo "" echo "Installing Kura..." echo "Installing Kura..." > $LOG 2>&1 -#Kill JVM and monit for installation -killall monit java >> $LOG 2>&1 +# Kill Kura for installation +killall java >> $LOG 2>&1 run_kura_install exit 0 diff --git a/kura/distrib/src/main/sh/extract_upgrade.sh b/kura/distrib/src/main/sh/extract_upgrade.sh index 4a06c48db81..6483eadb4f6 100755 --- a/kura/distrib/src/main/sh/extract_upgrade.sh +++ b/kura/distrib/src/main/sh/extract_upgrade.sh @@ -292,9 +292,9 @@ fi trap run_cleanup INT TERM EXIT set -e -# kill JVM and monit for upgrade -echo "Stopping monit and kura" >> $LOG 2>&1 -{ killall monit java || true; } >> $LOG 2>&1 +# Kill Kura for upgrade +echo "Stopping Kura" >> $LOG 2>&1 +{ killall java || true; } >> $LOG 2>&1 run_kura_upgrade exit 0 diff --git a/kura/org.eclipse.kura.linux.sysv.provider/.gitignore b/kura/org.eclipse.kura.linux.sysv.provider/.gitignore deleted file mode 100644 index 4dc009173e3..00000000000 --- a/kura/org.eclipse.kura.linux.sysv.provider/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/bin diff --git a/kura/org.eclipse.kura.linux.sysv.provider/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.linux.sysv.provider/META-INF/MANIFEST.MF deleted file mode 100644 index ed002bec62e..00000000000 --- a/kura/org.eclipse.kura.linux.sysv.provider/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: org.eclipse.kura.linux.sysv.provider -Bundle-SymbolicName: org.eclipse.kura.linux.sysv.provider;singleton:=true -Bundle-Version: 2.0.0.qualifier -Bundle-Vendor: Eclipse Kura -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" -Service-Component: OSGI-INF/*.xml -Bundle-ClassPath: . -Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.kura;version="[1.1,2.0)", - org.eclipse.kura.core.linux.util;version="[1.1,2.0)", - org.eclipse.kura.executor;version="[1.0,2.0)", - org.eclipse.kura.internal.linux.net.dns;version="[1.0,2.0)", - org.eclipse.kura.linux.net.dns;version="[1.1,1.2)", - org.eclipse.kura.net;version="[2.0,3.0)", - org.eclipse.kura.net.dns;version="[1.0,2.0)", - org.osgi.service.component;version="1.2.0", - org.slf4j;version="1.6.4" diff --git a/kura/org.eclipse.kura.linux.sysv.provider/OSGI-INF/dnsserver.xml b/kura/org.eclipse.kura.linux.sysv.provider/OSGI-INF/dnsserver.xml deleted file mode 100644 index e62875b08c5..00000000000 --- a/kura/org.eclipse.kura.linux.sysv.provider/OSGI-INF/dnsserver.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - diff --git a/kura/org.eclipse.kura.linux.sysv.provider/about.html b/kura/org.eclipse.kura.linux.sysv.provider/about.html deleted file mode 100644 index ec5809fefb9..00000000000 --- a/kura/org.eclipse.kura.linux.sysv.provider/about.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - About - - -

About This Content

- -

November 30, 2017

-

License

- -

- The Eclipse Foundation makes available all content in this plug-in - ("Content"). Unless otherwise indicated below, the Content - is provided to you under the terms and conditions of the Eclipse - Public License Version 2.0 ("EPL"). A copy of the EPL is - available at http://www.eclipse.org/legal/epl-2.0. - For purposes of the EPL, "Program" will mean the Content. -

- -

- If you did not receive this Content directly from the Eclipse - Foundation, the Content is being redistributed by another party - ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the - Redistributor's license that was provided with the Content. If no such - license exists, contact the Redistributor. Unless otherwise indicated - below, the terms and conditions of the EPL still apply to any source - code in the Content and such source code may be obtained at http://www.eclipse.org. -

- - - \ No newline at end of file diff --git a/kura/org.eclipse.kura.linux.sysv.provider/about_files/epl-v20.html b/kura/org.eclipse.kura.linux.sysv.provider/about_files/epl-v20.html deleted file mode 100644 index cc699dea65b..00000000000 --- a/kura/org.eclipse.kura.linux.sysv.provider/about_files/epl-v20.html +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - Eclipse Public License - Version 2.0 - - - -

Eclipse Public License - v 2.0

-

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. -

-

1. DEFINITIONS

-

“Contribution” means:

-
    -
  • a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and -
    • -
  • - b) in the case of each subsequent Contributor: -
      -
    • i) changes to the Program, and
      • -
    • ii) additions to the Program;
      • -
    - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - “originates” from a Contributor if it was added to the Program by such - Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. -
    • -
-

“Contributor” means any person or entity that Distributes the Program.

-

“Licensed Patents” mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. -

-

“Program” means the Contributions Distributed in accordance with this - Agreement. -

-

“Recipient” means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. -

-

“Derivative Works” shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. -

-

“Modified Works” shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, interfaces, - types, classes, structures, or files of the Program solely in each case - in order to link to, bind by name, or subclass the Program or Modified - Works thereof. -

-

“Distribute” means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. -

-

“Source Code” means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. -

-

“Secondary License” means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. -

-

2. GRANT OF RIGHTS

-
    -
  • a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. -
    • -
  • b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, - at the time the Contribution is added by the Contributor, such - addition of the Contribution causes such combination to be covered - by the Licensed Patents. The patent license shall not apply to any - other combinations which include the Contribution. No hardware per - se is licensed hereunder. -
    • -
  • c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the rights - and licenses granted hereunder, each Recipient hereby assumes sole - responsibility to secure any other intellectual property rights needed, - if any. For example, if a third party patent license is required to - allow Recipient to Distribute the Program, it is Recipient's - responsibility to acquire that license before distributing the Program. -
    • -
  • d) Each Contributor represents that to its knowledge it has sufficient - copyright rights in its Contribution, if any, to grant the copyright - license set forth in this Agreement. -
    • -
  • e) Notwithstanding the terms of any Secondary License, no Contributor - makes additional grants to any Recipient (other than those set forth - in this Agreement) as a result of such Recipient's receipt of the - Program under the terms of a Secondary License (if permitted under - the terms of Section 3). -
    • -
-

3. REQUIREMENTS

-

3.1 If a Contributor Distributes the Program in any form, then:

-
    -
  • a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and -
    • -
  • - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: -
      -
    • i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including warranties - or conditions of title and non-infringement, and implied warranties - or conditions of merchantability and fitness for a particular purpose; -
      • -
    • ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, incidental - and consequential damages, such as lost profits; -
      • -
    • iii) does not attempt to limit or alter the recipients' rights in the - Source Code under section 3.2; and -
      • -
    • iv) requires any subsequent distribution of the Program by any party - to be under a license that satisfies the requirements of this section 3. -
      • -
    -
    • -
-

3.2 When the Program is Distributed as Source Code:

-
    -
  • a) it must be made available under this Agreement, or if the Program (i) - is combined with other material in a separate file or files made available - under a Secondary License, and (ii) the initial Contributor attached to - the Source Code the notice described in Exhibit A of this Agreement, - then the Program may be made available under the terms of such - Secondary Licenses, and -
    • -
  • b) a copy of this Agreement must be included with each copy of the Program.
    • -
-

3.3 Contributors may not remove or alter any copyright, patent, trademark, - attribution notices, disclaimers of warranty, or limitations of liability - (‘notices’) contained within the Program from any copy of the Program which - they Distribute, provided that Contributors may add their own appropriate - notices. -

-

4. COMMERCIAL DISTRIBUTION

-

Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, the - Contributor who includes the Program in a commercial product offering should - do so in a manner which does not create potential liability for other - Contributors. Therefore, if a Contributor includes the Program in a - commercial product offering, such Contributor (“Commercial Contributor”) - hereby agrees to defend and indemnify every other Contributor - (“Indemnified Contributor”) against any losses, damages and costs - (collectively “Losses”) arising from claims, lawsuits and other legal actions - brought by a third party against the Indemnified Contributor to the extent - caused by the acts or omissions of such Commercial Contributor in connection - with its distribution of the Program in a commercial product offering. - The obligations in this section do not apply to any claims or Losses relating - to any actual or alleged intellectual property infringement. In order to - qualify, an Indemnified Contributor must: a) promptly notify the - Commercial Contributor in writing of such claim, and b) allow the Commercial - Contributor to control, and cooperate with the Commercial Contributor in, - the defense and any related settlement negotiations. The Indemnified - Contributor may participate in any such claim at its own expense. -

-

For example, a Contributor might include the Program - in a commercial product offering, Product X. That Contributor is then a - Commercial Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance claims - and warranties are such Commercial Contributor's responsibility alone. - Under this section, the Commercial Contributor would have to defend claims - against the other Contributors related to those performance claims and - warranties, and if a court requires any other Contributor to pay any damages - as a result, the Commercial Contributor must pay those damages. -

-

5. NO WARRANTY

-

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED - BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, - WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, - MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is - solely responsible for determining the appropriateness of using and - distributing the Program and assumes all risks associated with its - exercise of rights under this Agreement, including but not limited to the - risks and costs of program errors, compliance with applicable laws, damage - to or loss of data, programs or equipment, and unavailability or - interruption of operations. -

-

6. DISCLAIMER OF LIABILITY

-

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED - BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY - LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS - GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -

-

7. GENERAL

-

If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of the - remainder of the terms of this Agreement, and without further action by the - parties hereto, such provision shall be reformed to the minimum extent - necessary to make such provision valid and enforceable. -

-

If Recipient institutes patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Program itself - (excluding combinations of the Program with other software or hardware) - infringes such Recipient's patent(s), then such Recipient's rights granted - under Section 2(b) shall terminate as of the date such litigation is filed. -

-

All Recipient's rights under this Agreement shall terminate if it fails to - comply with any of the material terms or conditions of this Agreement and - does not cure such failure in a reasonable period of time after becoming - aware of such noncompliance. If all Recipient's rights under this Agreement - terminate, Recipient agrees to cease use and distribution of the Program - as soon as reasonably practicable. However, Recipient's obligations under - this Agreement and any licenses granted by Recipient relating to the - Program shall continue and survive. -

-

Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and may - only be modified in the following manner. The Agreement Steward reserves - the right to publish new versions (including revisions) of this Agreement - from time to time. No one other than the Agreement Steward has the right - to modify this Agreement. The Eclipse Foundation is the initial Agreement - Steward. The Eclipse Foundation may assign the responsibility to serve as - the Agreement Steward to a suitable separate entity. Each new version of - the Agreement will be given a distinguishing version number. The Program - (including Contributions) may always be Distributed subject to the version - of the Agreement under which it was received. In addition, after a new - version of the Agreement is published, Contributor may elect to Distribute - the Program (including its Contributions) under the new version. -

-

Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. -

-

Exhibit A – Form of Secondary Licenses Notice

-

“This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}.” -

-
-

Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. -

-

If it is not possible or desirable to put the notice in a particular file, - then You may include the notice in a location (such as a LICENSE file in a - relevant directory) where a recipient would be likely to look for - such a notice. -

-

You may add additional accurate notices of copyright ownership.

-
- - \ No newline at end of file diff --git a/kura/org.eclipse.kura.linux.sysv.provider/build.properties b/kura/org.eclipse.kura.linux.sysv.provider/build.properties deleted file mode 100644 index 0e0bc4b1122..00000000000 --- a/kura/org.eclipse.kura.linux.sysv.provider/build.properties +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Eurotech -# - -bin.includes = .,\ - META-INF/,\ - OSGI-INF/,\ - about.html,\ - about_files/ -source.. = src/main/java/ -src.includes = about.html,\ - about_files/ diff --git a/kura/org.eclipse.kura.linux.sysv.provider/pom.xml b/kura/org.eclipse.kura.linux.sysv.provider/pom.xml deleted file mode 100644 index a7f780e0d53..00000000000 --- a/kura/org.eclipse.kura.linux.sysv.provider/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 4.0.0 - - - org.eclipse.kura - kura - 6.0.0-SNAPSHOT - - - org.eclipse.kura.linux.sysv.provider - 2.0.0-SNAPSHOT - eclipse-plugin - - - ${project.basedir}/.. - - diff --git a/kura/org.eclipse.kura.linux.sysv.provider/src/main/java/org/eclipse/kura/internal/linux/sysv/net/dns/LinuxDnsServerSysV.java b/kura/org.eclipse.kura.linux.sysv.provider/src/main/java/org/eclipse/kura/internal/linux/sysv/net/dns/LinuxDnsServerSysV.java deleted file mode 100644 index 3f49a2f514c..00000000000 --- a/kura/org.eclipse.kura.linux.sysv.provider/src/main/java/org/eclipse/kura/internal/linux/sysv/net/dns/LinuxDnsServerSysV.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - * 3 Port d.o.o. - *******************************************************************************/ -package org.eclipse.kura.internal.linux.sysv.net.dns; - -import java.io.File; - -import org.eclipse.kura.internal.linux.net.dns.DnsServerService; -import org.eclipse.kura.linux.net.dns.LinuxDnsServer; - -public class LinuxDnsServerSysV extends LinuxDnsServer implements DnsServerService { - - private static final String BIND9_COMMAND = "/etc/init.d/bind9"; - private static final String NAMED_COMMAND = "/etc/init.d/named"; - - @Override - public String getDnsConfigFileName() { - return "/etc/bind/named.conf"; - } - - @Override - public String getDnsRfcZonesFileName() { - return "/etc/named.rfc1912.zones"; - } - - @Override - public String getDnsServiceName() { - return "/usr/sbin/named"; - } - - @Override - public String[] getDnsStartCommand() { - return new String[] { getCommandName(), "start" }; - } - - @Override - public String[] getDnsRestartCommand() { - return new String[] { getCommandName(), "restart" }; - } - - @Override - public String[] getDnsStopCommand() { - return new String[] { getCommandName(), "stop" }; - } - - private String getCommandName() { - return new File(NAMED_COMMAND).exists() ? NAMED_COMMAND : BIND9_COMMAND; - } -} diff --git a/kura/pom.xml b/kura/pom.xml index ff5328a8e06..e4056254f00 100644 --- a/kura/pom.xml +++ b/kura/pom.xml @@ -97,7 +97,6 @@ org.eclipse.kura.wire.component.join.provider org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider org.eclipse.kura.cloudconnection.raw.mqtt.provider - org.eclipse.kura.linux.sysv.provider org.eclipse.kura.linux.systemd.provider org.eclipse.kura.linux.debian.provider org.eclipse.kura.linux.redhat.provider