From 936d463dce2089b3dc85ba6ec9e020bbc951a771 Mon Sep 17 00:00:00 2001 From: Skip Wonnell Date: Mon, 19 Feb 2018 15:09:15 -0600 Subject: [PATCH] Update .properties and .xml files with license Change-Id: I551f9e9033de2f13028f28ad434003d61102d54f Issue-ID: APPC-637 Signed-off-by: Skip Wonnell --- .code_styling/APPC CheckStyle Preferences.xml | 23 +++++++++++++ .code_styling/Checkstyle_Suppression_Filter.xml | 25 +++++++++++++- .code_styling/appc-code-cleanup-preferences.xml | 23 +++++++++++++ .code_styling/appc-code-templates-preferences.xml | 25 +++++++++++++- .code_styling/appc-formatter-preferences.xml | 23 +++++++++++++ .gitreview | 21 ++++++++++++ README.md | 40 +++++++++++++++++++++- .../src/test/resources/test.properties | 21 ++++++++++++ .../provider/appc_southbound.properties | 29 +++++++++++++--- .../test/resources/properties_loader.properties | 23 ++++++++++++- appc-dg/appc-dg-shared/README.txt | 38 +++++++++++++++++++- .../provider/src/test/resources/xml/.gitignore | 22 ++++++++++++ .../src/test/resources/xml/Appc_UniTest.xml | 5 --- .../appc-sdc-listener-bundle/log4j.properties | 25 ++++++++++++-- version.properties | 22 ++++++++++++ 15 files changed, 349 insertions(+), 16 deletions(-) create mode 100644 appc-directed-graph/dg-loader/provider/src/test/resources/xml/.gitignore delete mode 100644 appc-directed-graph/dg-loader/provider/src/test/resources/xml/Appc_UniTest.xml diff --git a/.code_styling/APPC CheckStyle Preferences.xml b/.code_styling/APPC CheckStyle Preferences.xml index 11bc3ed92..df715240e 100644 --- a/.code_styling/APPC CheckStyle Preferences.xml +++ b/.code_styling/APPC CheckStyle Preferences.xml @@ -1,3 +1,26 @@ + diff --git a/.code_styling/Checkstyle_Suppression_Filter.xml b/.code_styling/Checkstyle_Suppression_Filter.xml index fe36353f3..538742671 100644 --- a/.code_styling/Checkstyle_Suppression_Filter.xml +++ b/.code_styling/Checkstyle_Suppression_Filter.xml @@ -1,10 +1,33 @@ + - diff --git a/.code_styling/appc-code-cleanup-preferences.xml b/.code_styling/appc-code-cleanup-preferences.xml index cc2b1343d..76a810074 100644 --- a/.code_styling/appc-code-cleanup-preferences.xml +++ b/.code_styling/appc-code-cleanup-preferences.xml @@ -1,3 +1,26 @@ + - \ No newline at end of file + diff --git a/.code_styling/appc-formatter-preferences.xml b/.code_styling/appc-formatter-preferences.xml index fd82d8bfd..c465679f1 100644 --- a/.code_styling/appc-formatter-preferences.xml +++ b/.code_styling/appc-formatter-preferences.xml @@ -1,3 +1,26 @@ + diff --git a/.gitreview b/.gitreview index b49d5cb17..6016956cd 100644 --- a/.gitreview +++ b/.gitreview @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ [gerrit] host=gerrit.onap.org port=29418 diff --git a/README.md b/README.md index 0c841ccc1..644d91168 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,41 @@ +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (C) 2017-2018 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. + + # ONAP APPC --- @@ -125,7 +163,7 @@ A Heat template that can be used on RackSpace to spin up the APPC Host VM as wel # Validating APPC Installation -First of all, APPC Features come in the form of Karaf Features (an ODL-OpenDaylight package) which can be composed of one or more OSGI bundles. These features get installed in the ODL framework in order to be used and installed in the APPC Docker Container (NOTE: SDN-C Core Features also get installed since APPC docker image uses the SDN-C Core docker image as a base image). +First of all, APPC Features come in the form of Karaf Features (an ODL-OpenDaylight package) which can be composed of one or more OSGI bundles. These features get installed in the ODL framework in order to be used and installed in the APPC Docker Container (NOTE: SDN-C Core Features also get installed since APPC docker image uses the SDN-C Core docker image as a base image). ### Accessing docker containers diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties index 4674473ed..09d42083a 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ org.onap.appc.adapter.chef.chefclient.userId=test org.onap.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem org.onap.appc.adapter.chef.chefclient.endPoint=http://127.0.0.1 diff --git a/appc-config/appc-encryption-tool/provider/appc_southbound.properties b/appc-config/appc-encryption-tool/provider/appc_southbound.properties index 2ef508203..a68cb39de 100644 --- a/appc-config/appc-encryption-tool/provider/appc_southbound.properties +++ b/appc-config/appc-encryption-tool/provider/appc_southbound.properties @@ -1,4 +1,25 @@ -testVnf_Type.testAction1.user = -testVnf_Type.testAction1.port = -testVnf_Type.testAction1.password = -testVnf_Type.testAction1.url = +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ +testVnf_Type.testAction1.user = +testVnf_Type.testAction1.port = +testVnf_Type.testAction1.password = +testVnf_Type.testAction1.url = diff --git a/appc-config/appc-flow-controller/provider/src/test/resources/properties_loader.properties b/appc-config/appc-flow-controller/provider/src/test/resources/properties_loader.properties index fc0aee0fe..da3db1d0f 100644 --- a/appc-config/appc-flow-controller/provider/src/test/resources/properties_loader.properties +++ b/appc-config/appc-flow-controller/provider/src/test/resources/properties_loader.properties @@ -1 +1,22 @@ -test = OK \ No newline at end of file +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ +test = OK diff --git a/appc-dg/appc-dg-shared/README.txt b/appc-dg/appc-dg-shared/README.txt index 960d51885..2b3c636bf 100644 --- a/appc-dg/appc-dg-shared/README.txt +++ b/appc-dg/appc-dg-shared/README.txt @@ -1 +1,37 @@ -This project contains set of DG-ready reusable APP-C utility classes, such as utility for executing a command on remote machine via SSH and more. \ No newline at end of file +# ============LICENSE_START========================================== +# =================================================================== +# Copyright © 2017-2018 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ + +This project contains set of DG-ready reusable APP-C utility classes, such as utility for executing a command on remote machine via SSH and more. diff --git a/appc-directed-graph/dg-loader/provider/src/test/resources/xml/.gitignore b/appc-directed-graph/dg-loader/provider/src/test/resources/xml/.gitignore new file mode 100644 index 000000000..1570f9901 --- /dev/null +++ b/appc-directed-graph/dg-loader/provider/src/test/resources/xml/.gitignore @@ -0,0 +1,22 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ +Appc_UniTest.xml diff --git a/appc-directed-graph/dg-loader/provider/src/test/resources/xml/Appc_UniTest.xml b/appc-directed-graph/dg-loader/provider/src/test/resources/xml/Appc_UniTest.xml deleted file mode 100644 index f3615da13..000000000 --- a/appc-directed-graph/dg-loader/provider/src/test/resources/xml/Appc_UniTest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/log4j.properties b/appc-sdc-listener/appc-sdc-listener-bundle/log4j.properties index abdf8675a..4503d26f3 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/log4j.properties +++ b/appc-sdc-listener/appc-sdc-listener-bundle/log4j.properties @@ -1,12 +1,33 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ log4j.rootCategory=DEBUG, CONSOLE, LOGFILE - + log4j.logger.com.att=TRACE, CONSOLE, LOGFILE # CONSOLE is set to be a ConsoleAppender using a PatternLayout. log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n - + # LOGFILE is set to be a File appender using a PatternLayout. log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender log4j.appender.LOGFILE.File=logs/wordnik.log diff --git a/version.properties b/version.properties index bbe05f816..5afae6528 100644 --- a/version.properties +++ b/version.properties @@ -1,3 +1,25 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ + ########################################################### # Versioning variables # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) -- 2.16.6