[LICENSE] Updating licenses as per legal decision

Change-Id: Iaa769b9446688358da0fdc844fe80747a8dd35a4
Signed-off-by: root <ha076r@att.com>

diff --git a/LICENSE b/LICENSE
index 5640474..afc34a4 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *
- */
\ No newline at end of file
+ */

diff --git a/installation/appc/src/main/scripts/installFeatures.sh b/installation/appc/src/main/scripts/installFeatures.sh
index ea9d6a2..47506ba 100644 (file)
--- a/installation/appc/src/main/scripts/installFeatures.sh
+++ b/installation/appc/src/main/scripts/installFeatures.sh
@@ -2,9 +2,9 @@
 
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -18,6 +18,7 @@
 # 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.
 ###
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}

diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh
index 31e62ec..66d50f8 100644 (file)
--- a/installation/appc/src/main/scripts/installZips.sh
+++ b/installation/appc/src/main/scripts/installZips.sh
@@ -2,9 +2,9 @@
 
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -18,6 +18,7 @@
 # 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.
 ###
 
 if [ -z "$SETTINGS_FILE" -a -z "$GLOBAL_SETTINGS_FILE" -a -s "$HOME"/.m2/settings.xml ]

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index fd4055b..fd02e15 100644 (file)
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -2,9 +2,9 @@
 
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -18,6 +18,7 @@
 # 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.
 ###
 
 # Install SDN-C & APP-C platform components if not already installed and start container

diff --git a/installation/src/main/appc-properties/appc.properties b/installation/src/main/appc-properties/appc.properties
index 0cc30d9..4e2fd02 100644 (file)
--- a/installation/src/main/appc-properties/appc.properties
+++ b/installation/src/main/appc-properties/appc.properties
@@ -1,8 +1,8 @@
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -16,6 +16,7 @@
 # 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/platform-logic/appc/src/main/xml/APPC_method_topology_operation_all_2.0.0.xml b/platform-logic/appc/src/main/xml/APPC_method_topology_operation_all_2.0.0.xml
index b3c4dee..e87571b 100644 (file)
--- a/platform-logic/appc/src/main/xml/APPC_method_topology_operation_all_2.0.0.xml
+++ b/platform-logic/appc/src/main/xml/APPC_method_topology_operation_all_2.0.0.xml
@@ -1,8 +1,8 @@
 <!--
   ============LICENSE_START=======================================================
-  openECOMP : APP-C
+  APPC
   ================================================================================
-  Copyright (C) 2017 OpenECOMP
+  Copyright (C) 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.
@@ -16,7 +16,8 @@
   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.
+-->
 
 <service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.0'><method rpc='topology-operation-all' mode='sync'>
 <!--What method should we try to call. Closely maps to __action__Server()--><switch test='`$org.openecomp.appc.action`'>

diff --git a/platform-logic/installer/src/assembly/assemble_zip.xml b/platform-logic/installer/src/assembly/assemble_zip.xml
index 2db7334..258de8d 100644 (file)
--- a/platform-logic/installer/src/assembly/assemble_zip.xml
+++ b/platform-logic/installer/src/assembly/assemble_zip.xml
@@ -1,8 +1,8 @@
 <!--
   ============LICENSE_START=======================================================
-  openECOMP : APP-C
+  APPC
   ================================================================================
-  Copyright (C) 2017 OpenECOMP
+  Copyright (C) 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.
@@ -16,7 +16,8 @@
   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.
+-->
 
 <!-- Defines how we build the .zip file which is our distribution. -->
 

diff --git a/platform-logic/installer/src/main/resources/svclogic.properties b/platform-logic/installer/src/main/resources/svclogic.properties
index 7b3a4a5..d894eb1 100644 (file)
--- a/platform-logic/installer/src/main/resources/svclogic.properties
+++ b/platform-logic/installer/src/main/resources/svclogic.properties
@@ -1,8 +1,8 @@
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -16,6 +16,7 @@
 # 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.
 ###
 
 org.openecomp.sdnc.sli.dbtype = jdbc

diff --git a/platform-logic/installer/src/main/scripts/install.sh b/platform-logic/installer/src/main/scripts/install.sh
index 448ab37..ddf3933 100644 (file)
--- a/platform-logic/installer/src/main/scripts/install.sh
+++ b/platform-logic/installer/src/main/scripts/install.sh
@@ -2,9 +2,9 @@
 
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -18,6 +18,7 @@
 # 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.
 ###
 
 # BASEDIR env variable points to /opt/openecomp/appc/svclogic

diff --git a/platform-logic/installer/src/main/scripts/setenv.sh b/platform-logic/installer/src/main/scripts/setenv.sh
index 8cd13a3..ebf90d3 100644 (file)
--- a/platform-logic/installer/src/main/scripts/setenv.sh
+++ b/platform-logic/installer/src/main/scripts/setenv.sh
@@ -2,9 +2,9 @@
 
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -18,6 +18,7 @@
 # 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.
 ###
 
 SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/sdnc/data/properties}

diff --git a/platform-logic/installer/src/main/scripts/showActiveGraphs.sh b/platform-logic/installer/src/main/scripts/showActiveGraphs.sh
index 6714f99..21e130a 100644 (file)
--- a/platform-logic/installer/src/main/scripts/showActiveGraphs.sh
+++ b/platform-logic/installer/src/main/scripts/showActiveGraphs.sh
@@ -1,8 +1,8 @@
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -16,6 +16,7 @@
 # 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.
 ###
 
 MYSQL_USER=${MYSQL_USER:-sdnctl}

diff --git a/platform-logic/installer/src/main/scripts/svclogic.sh b/platform-logic/installer/src/main/scripts/svclogic.sh
index 987e83f..eb9d273 100644 (file)
--- a/platform-logic/installer/src/main/scripts/svclogic.sh
+++ b/platform-logic/installer/src/main/scripts/svclogic.sh
@@ -2,9 +2,9 @@
 
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 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.
@@ -18,6 +18,7 @@
 # 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.
 ###
 
 BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"

diff --git a/pom.xml b/pom.xml
index f120af0..769d6b8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -98,8 +98,8 @@
                     <sectionDelimiter>================================================================================</sectionDelimiter>
                     <licenseName>apache_v2</licenseName>
                     <inceptionYear>2017</inceptionYear>
-                    <organizationName>OpenECOMP</organizationName>
-                    <projectName>openECOMP : APP-C</projectName>
+                    <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
+                    <projectName>APPC</projectName>
                     <canUpdateCopyright>true</canUpdateCopyright>
                     <canUpdateDescription>true</canUpdateDescription>
                     <canUpdateLicense>true</canUpdateLicense>

diff --git a/version.properties b/version.properties
index 04f4a42..d6c9a49 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,3 +1,24 @@
+###
+# ============LICENSE_START=======================================================
+# APPC
+# ================================================================================
+# Copyright (C) 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 is a trademark and service mark of AT&T Intellectual Property.
+###
+
 ###########################################################
 # Versioning variables
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )