* changed licence of Interfaceheaders and audiomanagertypes.h after review

2 files changed, 42 insertions, 36 deletions

diff --git a/include/control/IAmControlReceive.h b/include/control/IAmControlReceive.h
index 0c440f4..630aeaa 100644
--- a/include/control/IAmControlReceive.h
+++ b/include/control/IAmControlReceive.h
@@ -1,24 +1,27 @@
-/** Copyright (c) 2012 GENIVI Alliance

- *  Copyright (c) 2012 BMW

+/**

+ * Copyright (C) 2012, GENIVI Alliance, Inc.

+ * Copyright (C) 2012, BMW AG

  *

- *  \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012

+ * This file is part of GENIVI Project AudioManager.

  *

- *  \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.

- 

- *  For further information see http://www.genivi.org/.

+ * 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 Mueller, christian.ei.mueller@bmw.de BMW 2011,2012

+ *

+ * \file CAmCommandReceiver.h

+ * For further information see http://www.genivi.org/.

  *

- * 

  * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

  */

-#if !defined(EA_9408C8ED_AF20_4839_B557_1316C8F36E07__INCLUDED_)

-#define EA_9408C8ED_AF20_4839_B557_1316C8F36E07__INCLUDED_

+#if !defined(EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_)

+#define EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -40,7 +43,7 @@ namespace am {
 	 * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n

 	 * For more information, please check CAmSerializer
 	 * @author Christian Mueller
-	 * @created 05-Mar-2012 9:02:08 PM
+	 * @created 06-Mar-2012 9:46:48 AM
 	 */
 	class IAmControlReceive
 	{
@@ -613,4 +616,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_9408C8ED_AF20_4839_B557_1316C8F36E07__INCLUDED_)
+#endif // !defined(EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_)
diff --git a/include/control/IAmControlSend.h b/include/control/IAmControlSend.h
index 74b840a..11c3fdb 100644
--- a/include/control/IAmControlSend.h
+++ b/include/control/IAmControlSend.h
@@ -1,24 +1,27 @@
-/** Copyright (c) 2012 GENIVI Alliance

- *  Copyright (c) 2012 BMW

+/**

+ * Copyright (C) 2012, GENIVI Alliance, Inc.

+ * Copyright (C) 2012, BMW AG

  *

- *  \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012

+ * This file is part of GENIVI Project AudioManager.

  *

- *  \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.

- 

- *  For further information see http://www.genivi.org/.

+ * 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 Mueller, christian.ei.mueller@bmw.de BMW 2011,2012

+ *

+ * \file CAmCommandReceiver.h

+ * For further information see http://www.genivi.org/.

  *

- * 

  * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

  */

-#if !defined(EA_F93E3E9B_27D4_41be_8507_07034DAC88C8__INCLUDED_)

-#define EA_F93E3E9B_27D4_41be_8507_07034DAC88C8__INCLUDED_

+#if !defined(EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_)

+#define EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -43,7 +46,7 @@ namespace am {
 	 * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n

 	 * For more information, please check CAmSerializer
 	 * @author Christian Mueller
-	 * @created 05-Mar-2012 9:02:08 PM
+	 * @created 06-Mar-2012 9:46:49 AM
 	 */
 	class IAmControlSend
 	{
@@ -389,4 +392,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_F93E3E9B_27D4_41be_8507_07034DAC88C8__INCLUDED_)
+#endif // !defined(EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_)