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>
author: Lutz Helwing <lutz_helwing@mentor.com> 2015-05-07 11:34:40 +0200
committer: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> 2015-06-17 08:50:42 +0200
commit: d8125a0d7e74c58910840d0f28e891ce7ffda60e (patch)
tree: 5f50080ce36bf73f92526900ba1cec27f96ea824 /src
parent: 9a64599a9d864e2dc2e14832eb2f0c17a497972f (diff)
download: DLT-daemon-d8125a0d7e74c58910840d0f28e891ce7ffda60e.tar.gz
67 files changed, 953 insertions, 791 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 52291f8..5fb3309 100644
--- a/src/CMakeLists.txt
+++ b/src/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@
-########
+#######
 
 add_subdirectory( lib )
 add_subdirectory( daemon )
diff --git a/src/adaptor/CMakeLists.txt b/src/adaptor/CMakeLists.txt
index 7bde645..aa7dc19 100755
--- a/src/adaptor/CMakeLists.txt
+++ b/src/adaptor/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@
-########
+#######
 
 set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin.c)
 add_executable(dlt-adaptor-stdin ${dlt_adaptor_stdin_SRCS})
diff --git a/src/adaptor/dlt-adaptor-stdin.c b/src/adaptor/dlt-adaptor-stdin.c
index 624ea1c..23cd9ca 100755
--- a/src/adaptor/dlt-adaptor-stdin.c
+++ b/src/adaptor/dlt-adaptor-stdin.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
- *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * 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/.
  *
- * \file dlt-adaptor-stdin.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-adaptor-stdin.c
+*/
+
 /*******************************************************************************
 **                                                                            **
 **  SRC-MODULE: dlt-adaptor-stdin.c                                           **
diff --git a/src/adaptor/dlt-adaptor-udp.c b/src/adaptor/dlt-adaptor-udp.c
index ce204c1..67d35b8 100755
--- a/src/adaptor/dlt-adaptor-udp.c
+++ b/src/adaptor/dlt-adaptor-udp.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-adaptor-udp.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-adaptor-udp.c
+*/
+
 /*******************************************************************************
 **                                                                            **
 **  SRC-MODULE: dlt-adaptor-udp.c                                             **
diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt
index bbab009..3ae35aa 100755
--- a/src/console/CMakeLists.txt
+++ b/src/console/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@
-########
+#######
 
 set(dlt_convert_SRCS dlt-convert.c)
 add_executable(dlt-convert ${dlt_convert_SRCS} ${dlt_most_SRCS})
diff --git a/src/console/dlt-control.c b/src/console/dlt-control.c
index cc11298..96f89d0 100755
--- a/src/console/dlt-control.c
+++ b/src/console/dlt-control.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
- *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * 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/.
  *
- * \file dlt-receive.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-control.cpp
+*/
+
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c
index 7a54343..4f593e2 100755
--- a/src/console/dlt-convert.c
+++ b/src/console/dlt-convert.c
@@ -1,25 +1,28 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-convert.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-convert.cpp
+*/
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/console/dlt-receive.c b/src/console/dlt-receive.c
index ff08dd1..11f81a3 100755
--- a/src/console/dlt-receive.c
+++ b/src/console/dlt-receive.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
- *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * 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/.
  *
- * \file dlt-receive.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-receive.cpp
+*/
+
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 42d2081..46a087a 100755
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/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_WATCHDOG OR WITH_SYSTEMD)
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
index 8a17c55..302a613 100644
--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
@@ -1,26 +1,30 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012-2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
  * \author
  * Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  * Markus Klein <Markus.Klein@esk.fraunhofer.de>
  * Mikko Rapeli <mikko.rapeli@bmw.de>
  *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
  * \file dlt-daemon.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 #include <netdb.h>
diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h
index d6cb91f..f917555 100755
--- a/src/daemon/dlt-daemon.h
+++ b/src/daemon/dlt-daemon.h
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-daemon.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/daemon/dlt-daemon_cfg.h b/src/daemon/dlt-daemon_cfg.h
index 07e68c7..acddd45 100755
--- a/src/daemon/dlt-daemon_cfg.h
+++ b/src/daemon/dlt-daemon_cfg.h
@@ -1,25 +1,28 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-daemon_cfg.h
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-daemon_cfg.h
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c
index 6fde373..1b76b2c 100644
--- a/src/daemon/dlt_daemon_client.c
+++ b/src/daemon/dlt_daemon_client.c
@@ -1,26 +1,31 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012-2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
  * \author
  * Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  * Markus Klein <Markus.Klein@esk.fraunhofer.de>
  * Mikko Rapeli <mikko.rapeli@bmw.de>
  *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
  * \file dlt_daemon_client.c
- * For further information see http://www.genivi.org/.
- * @licence end@
- */
+*/
 
 #include <netdb.h>
 #include <ctype.h>
diff --git a/src/daemon/dlt_daemon_client.h b/src/daemon/dlt_daemon_client.h
index 380f78c..fba4eb3 100644
--- a/src/daemon/dlt_daemon_client.h
+++ b/src/daemon/dlt_daemon_client.h
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_daemon_client.h
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt_daemon_client.h
+*/
+
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index ce6af70..31e228b 100644
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_daemon_common.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h
index 4807407..a0dba90 100644
--- a/src/daemon/dlt_daemon_common.h
+++ b/src/daemon/dlt_daemon_common.h
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_daemon_common.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/daemon/dlt_daemon_common_cfg.h b/src/daemon/dlt_daemon_common_cfg.h
index 914767a..b237b60 100755
--- a/src/daemon/dlt_daemon_common_cfg.h
+++ b/src/daemon/dlt_daemon_common_cfg.h
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_daemon_common_cfg.h
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt_daemon_common_cfg.h
+*/
+
 
 
 /*******************************************************************************
diff --git a/src/daemon/dlt_daemon_serial.c b/src/daemon/dlt_daemon_serial.c
index 36bf049..bcacdd6 100644
--- a/src/daemon/dlt_daemon_serial.c
+++ b/src/daemon/dlt_daemon_serial.c
@@ -1,22 +1,27 @@
-/* @licence app begin@
- * Copyright (C) 2012  BMW AG
+/*
+ * @licence app begin@
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_daemon_serial.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/daemon/dlt_daemon_serial.h b/src/daemon/dlt_daemon_serial.h
index 928abc2..a12ab7b 100644
--- a/src/daemon/dlt_daemon_serial.h
+++ b/src/daemon/dlt_daemon_serial.h
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_daemon_serial.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c
index 146d952..4ba5c08 100644
--- a/src/daemon/dlt_daemon_socket.c
+++ b/src/daemon/dlt_daemon_socket.c
@@ -1,26 +1,33 @@
-/* @licence app begin@
- * Copyright (C) 2012-2014  BMW AG
+/*
+ * @licence app begin@
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
  * \author
  * Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  * Markus Klein <Markus.Klein@esk.fraunhofer.de>
  * Mikko Rapeli <mikko.rapeli@bmw.de>
  *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
  * \file dlt_daemon_socket.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
+
 #include <netdb.h>
 #include <ctype.h>
 #include <stdio.h>      /* for printf() and fprintf() */
diff --git a/src/daemon/dlt_daemon_socket.h b/src/daemon/dlt_daemon_socket.h
index 1ab7346..51f82fc 100644
--- a/src/daemon/dlt_daemon_socket.h
+++ b/src/daemon/dlt_daemon_socket.h
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_daemon_socket.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 6b457be..9186937 100644
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/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-2014, 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@
-########
+#######
 
 include_directories( 
     ${CMAKE_SOURCE_DIR}/
diff --git a/src/dbus/dlt-dbus-options.c b/src/dbus/dlt-dbus-options.c
index f1c72dd..7a54dca 100644
--- a/src/dbus/dlt-dbus-options.c
+++ b/src/dbus/dlt-dbus-options.c
@@ -1,24 +1,31 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
- *
- * \author Alexander Wenzel <alexander.wenzel@bmw.de>
+ * 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/.
  *
- * \file dlt-dbus-options.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-dbus-options.c
+ */
+
+
+
 #include "dlt-dbus.h"
 
 #include <stdlib.h>
diff --git a/src/dbus/dlt-dbus.c b/src/dbus/dlt-dbus.c
index ce5505f..44593aa 100644
--- a/src/dbus/dlt-dbus.c
+++ b/src/dbus/dlt-dbus.c
@@ -1,24 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.wenzel@bmw.de>
- *
- * \file dlt-dbus.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-dbus.c
+ */
+
 #include "dlt-dbus.h"
 
 #include <stdio.h>
diff --git a/src/dbus/dlt-dbus.h b/src/dbus/dlt-dbus.h
index 07f5b5f..9dd6fdb 100644
--- a/src/dbus/dlt-dbus.h
+++ b/src/dbus/dlt-dbus.h
@@ -1,24 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.wenzel@bmw.de>
- *
- * \file dlt-dbus.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-dbus.h
+ */
+
 #ifndef DLT_DBUS_H_
 #define DLT_DBUS_H_
 
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 767afc7..0387e81 100755
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/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@
-########
+#######
 
 set(dlt_example_user_SRCS dlt-example-user.c)
 add_executable(dlt-example-user ${dlt_example_user_SRCS})
diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c
index 96336a4..b02be19 100644
--- a/src/examples/dlt-example-filetransfer.c
+++ b/src/examples/dlt-example-filetransfer.c
@@ -1,25 +1,28 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-filetransfer.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-example-filetransfer.c
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/examples/dlt-example-user-common-api.c b/src/examples/dlt-example-user-common-api.c
index 8404090..6bf9141 100644
--- a/src/examples/dlt-example-user-common-api.c
+++ b/src/examples/dlt-example-user-common-api.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-example-user-common-api.c
+ */
+
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/examples/dlt-example-user-func.c b/src/examples/dlt-example-user-func.c
index 20b700a..6023cd5 100755
--- a/src/examples/dlt-example-user-func.c
+++ b/src/examples/dlt-example-user-func.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-example-user-func.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c
index 9c4a529..8872aa9 100755
--- a/src/examples/dlt-example-user.c
+++ b/src/examples/dlt-example-user.c
@@ -1,25 +1,28 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-example-user.c
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 6668793..af8472d 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/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@
-########q
+#######
 
 set(dlt_LIB_SRCS dlt_user dlt_client dlt_filetransfer ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c)
 
diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c
index d5f81e9..210d303 100755
--- a/src/lib/dlt_client.c
+++ b/src/lib/dlt_client.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_client.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h
index 6b490e7..d4d8a35 100755
--- a/src/lib/dlt_client_cfg.h
+++ b/src/lib/dlt_client_cfg.h
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_client_cfg.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c
index 43047e3..f3ba2db 100644
--- a/src/lib/dlt_filetransfer.c
+++ b/src/lib/dlt_filetransfer.c
@@ -1,25 +1,28 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_filetransfer.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt_filetransfer.c
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 95bcf8d..97e780e 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -1,26 +1,30 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012-2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
  * \author
  * Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  * Markus Klein <Markus.Klein@esk.fraunhofer.de>
  * Mikko Rapeli <mikko.rapeli@bmw.de>
  *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
  * \file dlt_user.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 #include <stdlib.h> /* for getenv(), free(), atexit() */
diff --git a/src/lib/dlt_user.c.rej b/src/lib/dlt_user.c.rej
deleted file mode 100644
index c197d0d..0000000
--- a/src/lib/dlt_user.c.rej
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/lib/dlt_user.c
-+++ src/lib/dlt_user.c
-@@ -501,48 +501,21 @@ int dlt_user_atexit_blow_out_user_buffer(void){
- 
- 	uint32_t exitTime = dlt_uptime() + DLT_USER_ATEXIT_RESEND_BUFFER_EXIT_TIMEOUT;
- 
--	/* Send content of ringbuffer */
--	DLT_SEM_LOCK();
--	count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer));
--	DLT_SEM_FREE();
--    
--    if (count > 0)
--    {
--        while(dlt_uptime() < exitTime )
--        {
--            if (dlt_user.dlt_log_handle == -1)
--            {
--                /* Reattach to daemon if neccesary */
--                dlt_user_log_reattach_to_daemon();
-+	while(dlt_uptime() < exitTime ){
- 
--                if ((dlt_user.dlt_log_handle != -1) && (dlt_user.overflow_counter))
--                {
--                    if (dlt_user_log_send_overflow()==0)
--                    {
--				        snprintf(str,DLT_USER_BUFFER_LENGTH,"%u messages discarded!\n",dlt_user.overflow_counter);
--				        dlt_log(LOG_WARNING, str);
--                        dlt_user.overflow_counter=0;
--                    }
--                }
--            } 
--            
--            if (dlt_user.dlt_log_handle != -1)
--            {
--		        ret = dlt_user_log_resend_buffer();
-+		ret = dlt_user_log_resend_buffer();
- 
--		        if(ret == 0)
--		        {
--				        return 0;
--		        }
--	        }
-+		if(ret == 0)
-+		{
-+				return 0;
-+		}
- 
--		    usleep(DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP);
--	    }
-+		usleep(DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP);
-+	}
- 
--	    DLT_SEM_LOCK();
--	    count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer));
--	    DLT_SEM_FREE();
--    }
-+	DLT_SEM_LOCK();
-+	count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer));
-+	DLT_SEM_FREE();
- 
- 	return count;
- }
diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h
index 124be44..b9eeb8a 100755
--- a/src/lib/dlt_user_cfg.h
+++ b/src/lib/dlt_user_cfg.h
@@ -1,25 +1,28 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_user_cfg.h
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt_user_cfg.h
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/lib/dlt_user_cfg.h.rej b/src/lib/dlt_user_cfg.h.rej
deleted file mode 100644
index a722e78..0000000
--- a/src/lib/dlt_user_cfg.h.rej
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/lib/dlt_user_cfg.h
-+++ src/lib/dlt_user_cfg.h
-@@ -126,11 +126,11 @@
- /* Name of environment variable for local print mode */
- #define DLT_USER_ENV_LOCAL_PRINT_MODE "DLT_LOCAL_PRINT_MODE"
- 
--/* Timeout offset for resending user buffer at exit in 10th milliseconds (10000 = 1s)*/
-+/* Timeout offset for resending user buffer at exit in usec (1000 usec = 1ms)*/
- #define DLT_USER_ATEXIT_RESEND_BUFFER_EXIT_TIMEOUT 100000
- 
- /* Sleeps between resending user buffer at exit in usec (1000 usec = 1ms)*/
--#define DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP 100000
-+#define DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP 1000
- 
- 
- /************************/
diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
index 88e77b2..24922c3 100755
--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
@@ -1,25 +1,30 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012-2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
  * \author
  * Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  * Markus Klein <Markus.Klein@esk.fraunhofer.de>
  * Mikko Rapeli <mikko.rapeli@bmw.de>
  *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
  * \file dlt_common.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 #include <stdio.h>
diff --git a/src/shared/dlt_common_cfg.h b/src/shared/dlt_common_cfg.h
index f765ed6..d554fb2 100755
--- a/src/shared/dlt_common_cfg.h
+++ b/src/shared/dlt_common_cfg.h
@@ -1,25 +1,28 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_common_cfg.h
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt_common_cfg.h
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c
index 554e2d5..760884f 100644
--- a/src/shared/dlt_offline_trace.c
+++ b/src/shared/dlt_offline_trace.c
@@ -1,25 +1,28 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_offline_trace.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt_offline_trace.c
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c
index d4eb35b..e67a134 100644
--- a/src/shared/dlt_shm.c
+++ b/src/shared/dlt_shm.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_shm.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/shared/dlt_user_shared.c b/src/shared/dlt_user_shared.c
index 300b77e..20454a7 100755
--- a/src/shared/dlt_user_shared.c
+++ b/src/shared/dlt_user_shared.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_user_shared.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/shared/dlt_user_shared.h b/src/shared/dlt_user_shared.h
index a980d0d..6db3299 100755
--- a/src/shared/dlt_user_shared.h
+++ b/src/shared/dlt_user_shared.h
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_user_shared.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/shared/dlt_user_shared_cfg.h b/src/shared/dlt_user_shared_cfg.h
index a8576f5..cdfd4fe 100755
--- a/src/shared/dlt_user_shared_cfg.h
+++ b/src/shared/dlt_user_shared_cfg.h
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_user_shared_cfg.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt
index 8398207..7c98de8 100644
--- a/src/system/CMakeLists.txt
+++ b/src/system/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_WATCHDOG OR WITH_SYSTEMD OR WITH_SYSTEMD_JOURNAL)
     message( STATUS "Added ${systemd_SRCS} to dlt-system")
diff --git a/src/system/dlt-system-filetransfer.c b/src/system/dlt-system-filetransfer.c
index 5cfcf09..3f31c81 100644
--- a/src/system/dlt-system-filetransfer.c
+++ b/src/system/dlt-system-filetransfer.c
@@ -1,28 +1,34 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012-2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
  * \author
  * Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
  * Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  * Markus Klein <Markus.Klein@esk.fraunhofer.de>
  * Mikko Rapeli <mikko.rapeli@bmw.de>
  *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
  * \file dlt-system-filetransfer.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
+
 /*******************************************************************************
 **                                                                            **
 **  SRC-MODULE: dlt-system-filetransfer.c                                                  **
diff --git a/src/system/dlt-system-journal.c b/src/system/dlt-system-journal.c
index 926cd17..bbd8385 100644
--- a/src/system/dlt-system-journal.c
+++ b/src/system/dlt-system-journal.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2013  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> BMW 2013
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-system-journal.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/system/dlt-system-logfile.c b/src/system/dlt-system-logfile.c
index 1354b83..a2ec7ec 100644
--- a/src/system/dlt-system-logfile.c
+++ b/src/system/dlt-system-logfile.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
  *
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-system-logfile.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/system/dlt-system-options.c b/src/system/dlt-system-options.c
index 3b4195d..d00b571 100644
--- a/src/system/dlt-system-options.c
+++ b/src/system/dlt-system-options.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
  *
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-system-options.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/system/dlt-system-process-handling.c b/src/system/dlt-system-process-handling.c
index c23bcca..2352204 100644
--- a/src/system/dlt-system-process-handling.c
+++ b/src/system/dlt-system-process-handling.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
  *
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-system-process-handling.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/system/dlt-system-processes.c b/src/system/dlt-system-processes.c
index 4457f50..fab3b4f 100644
--- a/src/system/dlt-system-processes.c
+++ b/src/system/dlt-system-processes.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- *
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
- *
- * \file dlt-system-logfile.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-system-processes.c
+ */
+
 /*******************************************************************************
 **                                                                            **
 **  SRC-MODULE: dlt-system-processes.c                                                  **
diff --git a/src/system/dlt-system-shell.c b/src/system/dlt-system-shell.c
index 1c875fb..a753185 100644
--- a/src/system/dlt-system-shell.c
+++ b/src/system/dlt-system-shell.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- *
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
- *
- * \file dlt-system-logfile.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-system-shell.c
+ */
+
 /*******************************************************************************
 **                                                                            **
 **  SRC-MODULE: dlt-system-shell.c                                                  **
diff --git a/src/system/dlt-system-syslog.c b/src/system/dlt-system-syslog.c
index d7e7e1d..8a6a7be 100644
--- a/src/system/dlt-system-syslog.c
+++ b/src/system/dlt-system-syslog.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- *
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
- *
- * \file dlt-system-logfile.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-system-syslog.c
+ */
+
 /*******************************************************************************
 **                                                                            **
 **  SRC-MODULE: dlt-system-syslog.c                                                  **
diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c
index c44b9b3..255a789 100644
--- a/src/system/dlt-system-watchdog.c
+++ b/src/system/dlt-system-watchdog.c
@@ -1,26 +1,31 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012-2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
  * \author
  * Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
  * Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  * Markus Klein <Markus.Klein@esk.fraunhofer.de>
  * Mikko Rapeli <mikko.rapeli@bmw.de>
  *
- * \file dlt-system-logfile.c
- * For further information see http://www.genivi.org/.
- * @licence end@
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-system-watchdog.c
  */
 
 #if defined(DLT_SYSTEMD_WATCHDOG_ENABLE)
diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c
index 8575d2f..60781b1 100644
--- a/src/system/dlt-system.c
+++ b/src/system/dlt-system.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
  *
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-system.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/system/dlt-system.h b/src/system/dlt-system.h
index 07cc2d6..1f217b0 100644
--- a/src/system/dlt-system.h
+++ b/src/system/dlt-system.h
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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/.
  *
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
- *
- * \file dlt-system.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt-system.h
+ */
+
 /*******************************************************************************
 **                                                                            **
 **  SRC-MODULE: dlt-system.h                                                  **
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 7c1f0f2..7716d64 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,18 +1,20 @@
 #######
-# 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@
-########
+#######
+
 set(dlt_test_multi_process_SRCS dlt-test-multi-process.c)
 add_executable(dlt-test-multi-process ${dlt_test_multi_process_SRCS})
 target_link_libraries(dlt-test-multi-process dlt)
diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c
index cb03503..42bda9d 100755
--- a/src/tests/dlt-test-client.c
+++ b/src/tests/dlt-test-client.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-client.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c
index 14b69e4..d08db91 100644
--- a/src/tests/dlt-test-filetransfer.c
+++ b/src/tests/dlt-test-filetransfer.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-filetransfer.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c
index 95e622a..98ee652 100644
--- a/src/tests/dlt-test-multi-process-client.c
+++ b/src/tests/dlt-test-multi-process-client.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de>
  *
- * \author Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-multi-process-client.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c
index bb81cb3..4740882 100755
--- a/src/tests/dlt-test-multi-process.c
+++ b/src/tests/dlt-test-multi-process.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
  *
- * \author Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-multi-process.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/tests/dlt-test-multi-process.h b/src/tests/dlt-test-multi-process.h
index 0c252ae..ee8341e 100644
--- a/src/tests/dlt-test-multi-process.h
+++ b/src/tests/dlt-test-multi-process.h
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
  *
- * \author Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-multi-process.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c
index e3498c0..fbc152e 100644
--- a/src/tests/dlt-test-stress-client.c
+++ b/src/tests/dlt-test-stress-client.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-stress-client.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c
index 6f0683f..73da3e5 100644
--- a/src/tests/dlt-test-stress-user.c
+++ b/src/tests/dlt-test-stress-user.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-stress-user.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c
index 650aecd..6ed66b0 100755
--- a/src/tests/dlt-test-stress.c
+++ b/src/tests/dlt-test-stress.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-stress.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c
index 6d6045f..44abdf7 100755
--- a/src/tests/dlt-test-user.c
+++ b/src/tests/dlt-test-user.c
@@ -1,23 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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@
+ */
+
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-user.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
author	Lutz Helwing <lutz_helwing@mentor.com>	2015-05-07 11:34:40 +0200
committer	Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>	2015-06-17 08:50:42 +0200
commit	d8125a0d7e74c58910840d0f28e891ce7ffda60e (patch)
tree	5f50080ce36bf73f92526900ba1cec27f96ea824 /src
parent	9a64599a9d864e2dc2e14832eb2f0c17a497972f (diff)
download	DLT-daemon-d8125a0d7e74c58910840d0f28e891ce7ffda60e.tar.gz