Updated license headers to latest GENIVI license policy. Fixed further LRT Scan findings. Renamed and cleanup further files.

Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>

7 files changed, 70 insertions, 63 deletions

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index a9838e4..10bbfe1 100644
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 if(WITH_SYSTEMD)
 
diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake
index 0c39637..d98b481 100644
--- a/systemd/dlt-adaptor-udp.service.cmake
+++ b/systemd/dlt-adaptor-udp.service.cmake
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 [Unit]
 Description=GENIVI DLT adaptor stdin. Adaptor for forwarding received UDP messages to DLT daemon.
diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake
index e448523..cb27cd9 100755
--- a/systemd/dlt-dbus.service.cmake
+++ b/systemd/dlt-dbus.service.cmake
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 [Unit]
 Description=GENIVI DLT DBus. Application to forward DBus messages to DLT.
diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake
index 3652292..31ff50b 100644
--- a/systemd/dlt-example-user.service.cmake
+++ b/systemd/dlt-example-user.service.cmake
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 [Unit]
 Description=GENIVI DLT example user. Generate DLT messages and store them to file or send them to daemon.
diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake
index b92c8b2..9a976e3 100644
--- a/systemd/dlt-receive.service.cmake
+++ b/systemd/dlt-receive.service.cmake
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 [Unit]
 Description=GENIVI DLT receive. Receive DLT messages from DLT daemon and print or store the messages.
diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake
index f1383dd..b1c1f9e 100755
--- a/systemd/dlt-system.service.cmake
+++ b/systemd/dlt-system.service.cmake
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 [Unit]
 Description=GENIVI DLT system. Application to forward syslog messages to DLT, transfer system information, logs and files.
diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake
index 22279c4..35d2216 100755
--- a/systemd/dlt.service.cmake
+++ b/systemd/dlt.service.cmake
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 [Unit]
 Description=GENIVI DLT logging daemon