aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorC.J. Collier <cjcollier@linuxfoundation.org>2017-02-23 23:36:46 -0800
committerC.J. Collier <cjcollier@linuxfoundation.org>2017-02-23 23:36:46 -0800
commit80b48f48cbfc1baeb04296b47ed62cbef5adffb3 (patch)
tree54a7370117c0f0e614f8889e6acf4af52d32608d
parente3824a33ccd51ee30ad46561d0409ec1256f7220 (diff)
Replace AllSeenAlliance License with Apache License Version 2.0RB14.02
http://www.apache.org/licenses/LICENSE-2.0 * Executed in batch by https://cgit.allseenalliance.org/extras/automation.git/tree/relicense/bin/do-relicense * Patch review took place here: https://git.allseenalliance.org/gerrit/#/c/9377/ * For each branch of each project of the AllJoyn Open Source Project gerrit repository - search / replace old license with new in all matching files - search / replace old copyright with new in all files which only include copyright - assign copyright to Open Connectivity Foundation, AllJoyn Open Source Project Contributors and others. - propose changes for review by commiters - include SPDX Change-Id: Id4ebcba77787787770ad9fefb4999cfa84aa7dc8 Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
-rwxr-xr-xbuild_core/tools/bin/make_status.py41
-rw-r--r--build_core/tools/scons/javastatus.py41
-rw-r--r--build_core/tools/scons/jsstatus.py41
-rw-r--r--build_core/tools/scons/unitystatus.py41
4 files changed, 108 insertions, 56 deletions
diff --git a/build_core/tools/bin/make_status.py b/build_core/tools/bin/make_status.py
index 18c1433..bebb620 100755
--- a/build_core/tools/bin/make_status.py
+++ b/build_core/tools/bin/make_status.py
@@ -196,20 +196,33 @@ def writeCPP0xHeaders():
*/
/******************************************************************************
- * Copyright (c) 2009-2014, AllSeen Alliance. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- ******************************************************************************/
+ * Copyright (c) Open Connectivity Foundation (OCF), AllJoyn Open Source
+ * Project (AJOSP) Contributors and others.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Apache License, Version 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Copyright (c) Open Connectivity Foundation and Contributors to AllSeen
+ * Alliance. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+******************************************************************************/
#pragma once
diff --git a/build_core/tools/scons/javastatus.py b/build_core/tools/scons/javastatus.py
index 29ebac6..c2015c0 100644
--- a/build_core/tools/scons/javastatus.py
+++ b/build_core/tools/scons/javastatus.py
@@ -124,20 +124,33 @@ def writeHeaders():
if None != codeOut:
codeOut.write("""/* This file is auto-generated. Do not modify. */
/*
- * Copyright (c) 2009-2014, AllSeen Alliance. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
+ * Copyright (c) Open Connectivity Foundation (OCF), AllJoyn Open Source
+ * Project (AJOSP) Contributors and others.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Apache License, Version 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Copyright (c) Open Connectivity Foundation and Contributors to AllSeen
+ * Alliance. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+*/
package org.alljoyn.bus;
diff --git a/build_core/tools/scons/jsstatus.py b/build_core/tools/scons/jsstatus.py
index 3a80196..9e0355c 100644
--- a/build_core/tools/scons/jsstatus.py
+++ b/build_core/tools/scons/jsstatus.py
@@ -124,20 +124,33 @@ def writeHeaders():
if None != codeOut:
codeOut.write("""/* This file is auto-generated. Do not modify. */
/*
- * Copyright (c) 2011-2014, AllSeen Alliance. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
+ * Copyright (c) Open Connectivity Foundation (OCF), AllJoyn Open Source
+ * Project (AJOSP) Contributors and others.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Apache License, Version 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Copyright (c) Open Connectivity Foundation and Contributors to AllSeen
+ * Alliance. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+*/
#include "BusErrorInterface.h"
#include "TypeMapping.h"
diff --git a/build_core/tools/scons/unitystatus.py b/build_core/tools/scons/unitystatus.py
index 1bbe2eb..f8e4116 100644
--- a/build_core/tools/scons/unitystatus.py
+++ b/build_core/tools/scons/unitystatus.py
@@ -129,20 +129,33 @@ def writeHeaders():
*
* Note: This file is generated during the make process.
*
- * Copyright (c) 2009-2014, AllSeen Alliance. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- ******************************************************************************/
+ * Copyright (c) Open Connectivity Foundation (OCF), AllJoyn Open Source
+ * Project (AJOSP) Contributors and others.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Apache License, Version 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Copyright (c) Open Connectivity Foundation and Contributors to AllSeen
+ * Alliance. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+******************************************************************************/
using System;
using System.Runtime.InteropServices;