From 7eda0730a32f10937d8170f2fd4a031e5c14bdb0 Mon Sep 17 00:00:00 2001 From: Shailendra Borale Date: Tue, 24 Oct 2017 11:05:00 -0400 Subject: Changed license to CC-BY 4.0 Updated Root License so/LICENSE.txt with CC-BY 4.0 license. Removed txt file license from csar files . Root license will be used. Change-Id: I6e56824522274a77e6da86dbe72bc0c0ea2db78a Issue-Id: SO-261 Signed-off-by: Shailendra Borale --- LICENSE.txt | 59 +++++++++++++-------- .../resource-examples/service_Rg511NfmService.csar | Bin 65454 -> 65050 bytes .../service_Rg516VmmscSrvc_csar.csar | Bin 282835 -> 282433 bytes .../asdc/service_Rg511NfmService.csar | Bin 65454 -> 65050 bytes .../asdc/service_Rg516VmmscSrvc_csar.csar | Bin 282835 -> 282433 bytes 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index cf1d4b6151..bb235ffb2c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,22 +1,39 @@ /* - * ============LICENSE_START========================================== - * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - * - */ \ No newline at end of file +* ============LICENSE_START========================================== +* =================================================================== +* Copyright © 2017 AT&T Intellectual Property. All rights reserved. +* =================================================================== +* +* Unless otherwise specified, all software contained herein is licensed +* under the Apache License, Version 2.0 (the “License”); +* you may not use this software except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* +* +* Unless otherwise specified, all documentation contained herein is licensed +* under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +* you may not use this documentation except in compliance with the License. +* You may obtain a copy of the License at +* +* https://creativecommons.org/licenses/by/4.0/ +* +* Unless required by applicable law or agreed to in writing, documentation +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ============LICENSE_END============================================ +* +* ECOMP is a trademark and service mark of AT&T Intellectual Property. +* +*/ diff --git a/asdc-controller/src/main/resources/resource-examples/service_Rg511NfmService.csar b/asdc-controller/src/main/resources/resource-examples/service_Rg511NfmService.csar index 47105115b4..a383359ca0 100644 Binary files a/asdc-controller/src/main/resources/resource-examples/service_Rg511NfmService.csar and b/asdc-controller/src/main/resources/resource-examples/service_Rg511NfmService.csar differ diff --git a/asdc-controller/src/main/resources/resource-examples/service_Rg516VmmscSrvc_csar.csar b/asdc-controller/src/main/resources/resource-examples/service_Rg516VmmscSrvc_csar.csar index 1389bc2106..edbd8d8fcc 100644 Binary files a/asdc-controller/src/main/resources/resource-examples/service_Rg516VmmscSrvc_csar.csar and b/asdc-controller/src/main/resources/resource-examples/service_Rg516VmmscSrvc_csar.csar differ diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg511NfmService.csar b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg511NfmService.csar index 47105115b4..a383359ca0 100644 Binary files a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg511NfmService.csar and b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg511NfmService.csar differ diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg516VmmscSrvc_csar.csar b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg516VmmscSrvc_csar.csar index 1389bc2106..edbd8d8fcc 100644 Binary files a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg516VmmscSrvc_csar.csar and b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg516VmmscSrvc_csar.csar differ -- cgit 1.2.3-korg