summaryrefslogtreecommitdiff
path: root/AudioManagerUtilities
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2015-04-28 19:05:32 +0200
committerChristian Linke <christian.linke@bmw.de>2015-04-28 19:05:32 +0200
commita3820fa5d5e08066dd70bddae40a66359b9933ac (patch)
tree5e55e244ce37b143a6f56d2e79a52003ba79e5af /AudioManagerUtilities
parent82c16d84de8461c3e0255d4d9646707682b79656 (diff)
downloadaudiomanager-a3820fa5d5e08066dd70bddae40a66359b9933ac.tar.gz
* Updated license file
* Added authors file * Adopted to spdx header file Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerUtilities')
-rw-r--r--AudioManagerUtilities/include/CAmCommandLineSingleton.h25
-rw-r--r--AudioManagerUtilities/include/CAmCommonAPIWrapper.h24
-rw-r--r--AudioManagerUtilities/include/CAmDbusWrapper.h18
-rw-r--r--AudioManagerUtilities/include/CAmDltWrapper.h24
-rw-r--r--AudioManagerUtilities/include/CAmSerializer.h22
-rw-r--r--AudioManagerUtilities/include/CAmSocketHandler.h18
-rw-r--r--AudioManagerUtilities/src/CAmCommandLineSingleton.cpp17
-rw-r--r--AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp16
-rw-r--r--AudioManagerUtilities/src/CAmDbusWrapper.cpp2
-rw-r--r--AudioManagerUtilities/src/CAmDltWrapper.cpp4
-rw-r--r--AudioManagerUtilities/src/CAmSocketHandler.cpp2
11 files changed, 96 insertions, 76 deletions
diff --git a/AudioManagerUtilities/include/CAmCommandLineSingleton.h b/AudioManagerUtilities/include/CAmCommandLineSingleton.h
index 54ba774..7f394ae 100644
--- a/AudioManagerUtilities/include/CAmCommandLineSingleton.h
+++ b/AudioManagerUtilities/include/CAmCommandLineSingleton.h
@@ -1,10 +1,27 @@
-/*
- * CAmCommandLineSingleton.h
+/**
+ * SPDX license identifier: MPL-2.0
+ *
+ * Copyright (C) 2015, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \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 Christian Linke, christian.linke@bmw.de BMW 2015
+ *
+ * \file CAmCommandLineSingleton.h
+ * For further information see http://www.genivi.org/.
*
- * Created on: Apr 15, 2015
- * Author: genius
*/
+
#ifndef AUDIOMANAGERUTILITIES_INCLUDE_CAMCOMMANDLINESINGLETON_H_
#define AUDIOMANAGERUTILITIES_INCLUDE_CAMCOMMANDLINESINGLETON_H_
diff --git a/AudioManagerUtilities/include/CAmCommonAPIWrapper.h b/AudioManagerUtilities/include/CAmCommonAPIWrapper.h
index 9c293f7..e756cc7 100644
--- a/AudioManagerUtilities/include/CAmCommonAPIWrapper.h
+++ b/AudioManagerUtilities/include/CAmCommonAPIWrapper.h
@@ -1,20 +1,18 @@
/**
- * Copyright (C) 2012, BMW AG
+ * SPDX license identifier: MPL-2.0
*
- * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ * Copyright (C) 2012, BMW AG
*
- * \copyright
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
*
- * \file CAmCommonAPIWrapper.h
- * For further information see http://www.genivi.org/.
+ * \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/.
+ *
+ * \file CAmCommonAPIWrapper.h
+ * For further information see http://www.genivi.org/.
*/
diff --git a/AudioManagerUtilities/include/CAmDbusWrapper.h b/AudioManagerUtilities/include/CAmDbusWrapper.h
index 0f8a0bd..b920f22 100644
--- a/AudioManagerUtilities/include/CAmDbusWrapper.h
+++ b/AudioManagerUtilities/include/CAmDbusWrapper.h
@@ -1,16 +1,14 @@
/**
- * Copyright (C) 2012, BMW AG
+ * SPDX license identifier: MPL-2.0
*
- * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
+ * Copyright (C) 2012, BMW AG
*
- * \copyright
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
+ *
+ * \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/.
*
* \file CAmDbusWrapper.h
* For further information see http://www.genivi.org/.
diff --git a/AudioManagerUtilities/include/CAmDltWrapper.h b/AudioManagerUtilities/include/CAmDltWrapper.h
index b3733c3..fb28f78 100644
--- a/AudioManagerUtilities/include/CAmDltWrapper.h
+++ b/AudioManagerUtilities/include/CAmDltWrapper.h
@@ -1,20 +1,18 @@
/**
- * Copyright (C) 2012, BMW AG
+ * SPDX license identifier: MPL-2.0
*
- * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
- * Jens Lorenz, jlorenz@de.adit-jv.com ADIT 2014
+ * Copyright (C) 2012, BMW AG
*
- * \copyright
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
+ * \author Jens Lorenz, jlorenz@de.adit-jv.com ADIT 2014
*
- * \file CAmDltWrapper.h
- * For further information see http://www.genivi.org/.
+ * \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/.
+ *
+ * \file CAmDltWrapper.h
+ * For further information see http://www.genivi.org/.
*/
#ifndef DLTWRAPPER_H_
diff --git a/AudioManagerUtilities/include/CAmSerializer.h b/AudioManagerUtilities/include/CAmSerializer.h
index 1f13a66..fc336fc 100644
--- a/AudioManagerUtilities/include/CAmSerializer.h
+++ b/AudioManagerUtilities/include/CAmSerializer.h
@@ -1,19 +1,17 @@
/**
- * Copyright (C) 2012, BMW AG
+ * SPDX license identifier: MPL-2.0
*
- * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
+ * Copyright (C) 2012, BMW AG
*
- * \copyright
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
*
- * \file CAmSerializer.h
- * For further information see http://www.genivi.org/.
+ * \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/.
+ *
+ * \file CAmSerializer.h
+ * For further information see http://www.genivi.org/.
*/
#ifndef CAMSERIALIZER_H_
diff --git a/AudioManagerUtilities/include/CAmSocketHandler.h b/AudioManagerUtilities/include/CAmSocketHandler.h
index 7759346..5e11fa5 100644
--- a/AudioManagerUtilities/include/CAmSocketHandler.h
+++ b/AudioManagerUtilities/include/CAmSocketHandler.h
@@ -1,16 +1,14 @@
/**
- * Copyright (C) 2012, BMW AG
+ * SPDX license identifier: MPL-2.0
*
- * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
+ * Copyright (C) 2012, BMW AG
*
- * \copyright
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
+ *
+ * \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/.
*
* \file CAmSocketHandler.h
* For further information see http://www.genivi.org/.
diff --git a/AudioManagerUtilities/src/CAmCommandLineSingleton.cpp b/AudioManagerUtilities/src/CAmCommandLineSingleton.cpp
index 82971cd..d2dff35 100644
--- a/AudioManagerUtilities/src/CAmCommandLineSingleton.cpp
+++ b/AudioManagerUtilities/src/CAmCommandLineSingleton.cpp
@@ -1,8 +1,17 @@
-/*
- * CAmCommandLineSingleton.cpp
+/**
+ * SPDX license identifier: MPL-2.0
*
- * Created on: Apr 15, 2015
- * Author: genius
+ * Copyright (C) 2012, BMW AG
+ *
+ * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
+ *
+ * \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/.
+ *
+ * \file CAmCommandLineSingleton.cpp
+ * For further information see http://www.genivi.org/.
*/
#include "CAmCommandLineSingleton.h"
diff --git a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp
index fbd4d4a..f486920 100644
--- a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp
+++ b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp
@@ -1,23 +1,21 @@
/**
+ * SPDX license identifier: MPL-2.0
+ *
* Copyright (C) 2012, BMW AG
*
* \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
*
- * \copyright
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * \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/.
*
* \file CAmCommonAPIWrapper.cpp
* For further information see http://www.genivi.org/.
*/
-
#include <config.h>
#include <fstream>
#include <sstream>
diff --git a/AudioManagerUtilities/src/CAmDbusWrapper.cpp b/AudioManagerUtilities/src/CAmDbusWrapper.cpp
index c5230ec..c819c92 100644
--- a/AudioManagerUtilities/src/CAmDbusWrapper.cpp
+++ b/AudioManagerUtilities/src/CAmDbusWrapper.cpp
@@ -1,4 +1,6 @@
/**
+ * SPDX license identifier: MPL-2.0
+ *
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerUtilities/src/CAmDltWrapper.cpp b/AudioManagerUtilities/src/CAmDltWrapper.cpp
index 8b8c0a1..6a6d8dd 100644
--- a/AudioManagerUtilities/src/CAmDltWrapper.cpp
+++ b/AudioManagerUtilities/src/CAmDltWrapper.cpp
@@ -1,4 +1,6 @@
/**
+ * SPDX license identifier: MPL-2.0
+ *
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -13,7 +15,7 @@
*
*
* \author Christian Linke, christian.linke@bmw.de BMW 2011,2012
- * Jens Lorenz, jlorenz@de.adit-jv.com ADIT 2014
+ * \author Jens Lorenz, jlorenz@de.adit-jv.com ADIT 2014
*
* \file CAmDltWrapper.cpp
* For further information see http://www.genivi.org/.
diff --git a/AudioManagerUtilities/src/CAmSocketHandler.cpp b/AudioManagerUtilities/src/CAmSocketHandler.cpp
index 2e8806a..ccf0481 100644
--- a/AudioManagerUtilities/src/CAmSocketHandler.cpp
+++ b/AudioManagerUtilities/src/CAmSocketHandler.cpp
@@ -1,4 +1,6 @@
/**
+ * SPDX license identifier: MPL-2.0
+ *
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.