Add/update license text part 3

Convert some file formats from dos to unix

Change-Id: Iab31d84016c84bf03df7fdc8cf0c163c23091a88
Issue-ID: APPC-398
Issue-ID: APPC-305
Signed-off-by: Skip Wonnell <skip@att.com>

19 files changed, 487 insertions, 335 deletions

diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
index 65cf97a44..eabe4d01b 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
@@ -1,23 +1,26 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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
+ *      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=========================================================
  */
-
 package org.onap.appc.ccadaptor;
 
 import com.att.eelf.configuration.EELFLogger;
@@ -1043,5 +1046,4 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor
     System.out.println("*************************TRACE 1*****************************");
     cca.configure(key, parameters, ctx);
   }
-
 }
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/DebugLog.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/DebugLog.java
index 2ed7679f8..52527844b 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/DebugLog.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/DebugLog.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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
@@ -15,9 +17,10 @@
  * 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=========================================================
  */
-
 package org.onap.appc.ccadaptor;
 
 import java.io.BufferedWriter;
@@ -94,4 +97,3 @@ public class DebugLog {
     }
 
 }
-
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/EncryptionTool.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/EncryptionTool.java
index a3700ec31..dd92f0a53 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/EncryptionTool.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/EncryptionTool.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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
@@ -15,9 +17,10 @@
  * 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=========================================================
  */
-
 package org.onap.appc.ccadaptor;
 
 import java.security.Provider;
@@ -198,4 +201,4 @@ public class EncryptionTool {
         return out;
     }
 
-}
+}
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/TelnetListener.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/TelnetListener.java
index addb1118f..a730cdc0a 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/TelnetListener.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/TelnetListener.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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
@@ -15,9 +17,10 @@
  * 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=========================================================
  */
-
 package org.onap.appc.ccadaptor;
 
 public interface TelnetListener {
@@ -25,5 +28,4 @@ public interface TelnetListener {
     public void receivedString(String s);
 
     public void filterStrings(String s1, String s2);
-}
-
+}
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/TimedOutException.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/TimedOutException.java
index 05969dfdd..43f40169a 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/TimedOutException.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/TimedOutException.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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
@@ -15,9 +17,10 @@
  * 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=========================================================
  */
-
 package org.onap.appc.ccadaptor;
 
 import java.io.IOException;
@@ -30,6 +33,4 @@ public class TimedOutException extends IOException {
     public TimedOutException(String message) {
         super(message);
     }
-}
-
-
+}
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/XmlUtil.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/XmlUtil.java
index 8f9d70252..4ebbf3491 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/XmlUtil.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/XmlUtil.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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
@@ -15,9 +17,10 @@
  * 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=========================================================
  */
-
 package org.onap.appc.ccadaptor;
 
 import java.util.ArrayList;
@@ -149,4 +152,4 @@ public class XmlUtil {
         }
         return s;
     }
-}
+}
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestConfigComponentAdaptor.java
index 2a258f187..70fb729bb 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestConfigComponentAdaptor.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestConfigComponentAdaptor.java
@@ -1,132 +1,155 @@
-package org.onap.appc.ccadaptor;

-

-import java.util.HashMap;

-import java.util.Map;

-import java.util.Properties;

-

-import org.junit.Test;

-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;

-

-public class TestConfigComponentAdaptor {

-	

-	

-	@Test

-	public void testGetCliRunningConfig(){

-		Properties props = null;

-	    ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);

-	    String Get_config_template = ("get_config_template");

-	    String key = "GetCliRunningConfig";

-	    Map<String, String> parameters = new HashMap<String, String>();

-	    parameters.put("Host_ip_address", "test");

-	    parameters.put("User_name", "test");

-	    parameters.put("Password", "password");

-	    parameters.put("Port_number", "22");

-	    parameters.put("Get_config_template", Get_config_template);

-

-	    SvcLogicContext ctx = new SvcLogicContext();

-	    ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");

-	    cca.configure(key, parameters, ctx);

-		

-	}

-	

-	@Test

-	public void testDownloadCliConfig(){

-		Properties props = null;

-	    ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);

-	    String Get_config_template = ("get_config_template");

-	    String key = "DownloadCliConfig";

-	    Map<String, String> parameters = new HashMap<String, String>();

-	    parameters.put("Host_ip_address", "test");

-	    parameters.put("User_name", "test");

-	    parameters.put("Password", "password");

-	    parameters.put("Port_number", "22");

-	    parameters.put("Get_config_template", Get_config_template);

-

-	    SvcLogicContext ctx = new SvcLogicContext();

-	    ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");

-	    cca.configure(key, parameters, ctx);

-		

-	}

-	

-	@Test

-	public void testXmlDownload(){

-		Properties props = null;

-	    ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);

-	    String Get_config_template = ("get_config_template");

-	    String key = "xml-download";

-	    Map<String, String> parameters = new HashMap<String, String>();

-	    parameters.put("Host_ip_address", "test");

-	    parameters.put("User_name", "test");

-	    parameters.put("Password", "password");

-	    parameters.put("Port_number", "22");

-	    parameters.put("Get_config_template", Get_config_template);

-

-	    SvcLogicContext ctx = new SvcLogicContext();

-	    ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");

-	    cca.configure(key, parameters, ctx);

-	}

-	

-	@Test

-	public void testXmlGetrunningconfig(){

-		Properties props = null;

-	    ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);

-	    String Get_config_template = ("get_config_template");

-	    String key = "xml-getrunningconfig";

-	    Map<String, String> parameters = new HashMap<String, String>();

-	    parameters.put("Host_ip_address", "test");

-	    parameters.put("User_name", "test");

-	    parameters.put("Password", "password");

-	    parameters.put("Port_number", "22");

-	    parameters.put("Get_config_template", Get_config_template);

-

-	    SvcLogicContext ctx = new SvcLogicContext();

-	    ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");

-	    cca.configure(key, parameters, ctx);

-		

-	}

-	

-	@Test

-	public void testEscapeSql(){

-		Properties props = null;

-	    ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);

-	    String Get_config_template = ("get_config_template");

-	    String key = "escapeSql";

-	    Map<String, String> parameters = new HashMap<String, String>();

-	    parameters.put("Host_ip_address", "test");

-	    parameters.put("User_name", "test");

-	    parameters.put("Password", "password");

-	    parameters.put("Port_number", "22");

-	    parameters.put("Get_config_template", Get_config_template);

-

-	    SvcLogicContext ctx = new SvcLogicContext();

-	    ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");

-	    cca.configure(key, parameters, ctx);

-	}

-	

-	@Test

-	public void testAll(){

-		Properties props = null;

-	    ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);

-	    String Get_config_template = ("test");

-	    String Download_config_template = ("test");

-	    String key = "GetCliRunningConfig";

-	    Map<String, String> parameters = new HashMap<String,String>();

-	    parameters.put("Host_ip_address", "test");

-	    parameters.put("User_name", "test");

-	    parameters.put("Password", "password");

-	    parameters.put("Port_number", "22");

-	    parameters.put("Protocol", "netconf");

-	    parameters.put("Contents", "Contents");

-	    parameters.put("Get_config_template", Get_config_template);

-	    parameters.put("Download_config_template", Download_config_template);

-	    parameters.put("Config_contents", "config\nsystem\nservice-interface serv1\nipv4\ngateway-ip-address 192.168.30.44");

-

-	    SvcLogicContext ctx = new SvcLogicContext();

-	    ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");

-	    cca.configure(key, parameters, ctx);

-		

-		

-	}

-	

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.appc.ccadaptor;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+
+public class TestConfigComponentAdaptor {
+    
+    
+    @Test
+    public void testGetCliRunningConfig(){
+        Properties props = null;
+        ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);
+        String Get_config_template = ("get_config_template");
+        String key = "GetCliRunningConfig";
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("Host_ip_address", "test");
+        parameters.put("User_name", "test");
+        parameters.put("Password", "password");
+        parameters.put("Port_number", "22");
+        parameters.put("Get_config_template", Get_config_template);
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");
+        cca.configure(key, parameters, ctx);
+        
+    }
+    
+    @Test
+    public void testDownloadCliConfig(){
+        Properties props = null;
+        ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);
+        String Get_config_template = ("get_config_template");
+        String key = "DownloadCliConfig";
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("Host_ip_address", "test");
+        parameters.put("User_name", "test");
+        parameters.put("Password", "password");
+        parameters.put("Port_number", "22");
+        parameters.put("Get_config_template", Get_config_template);
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");
+        cca.configure(key, parameters, ctx);
+        
+    }
+    
+    @Test
+    public void testXmlDownload(){
+        Properties props = null;
+        ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);
+        String Get_config_template = ("get_config_template");
+        String key = "xml-download";
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("Host_ip_address", "test");
+        parameters.put("User_name", "test");
+        parameters.put("Password", "password");
+        parameters.put("Port_number", "22");
+        parameters.put("Get_config_template", Get_config_template);
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");
+        cca.configure(key, parameters, ctx);
+    }
+    
+    @Test
+    public void testXmlGetrunningconfig(){
+        Properties props = null;
+        ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);
+        String Get_config_template = ("get_config_template");
+        String key = "xml-getrunningconfig";
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("Host_ip_address", "test");
+        parameters.put("User_name", "test");
+        parameters.put("Password", "password");
+        parameters.put("Port_number", "22");
+        parameters.put("Get_config_template", Get_config_template);
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");
+        cca.configure(key, parameters, ctx);
+        
+    }
+    
+    @Test
+    public void testEscapeSql(){
+        Properties props = null;
+        ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);
+        String Get_config_template = ("get_config_template");
+        String key = "escapeSql";
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("Host_ip_address", "test");
+        parameters.put("User_name", "test");
+        parameters.put("Password", "password");
+        parameters.put("Port_number", "22");
+        parameters.put("Get_config_template", Get_config_template);
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");
+        cca.configure(key, parameters, ctx);
+    }
+    
+    @Test
+    public void testAll(){
+        Properties props = null;
+        ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);
+        String Get_config_template = ("test");
+        String Download_config_template = ("test");
+        String key = "GetCliRunningConfig";
+        Map<String, String> parameters = new HashMap<String,String>();
+        parameters.put("Host_ip_address", "test");
+        parameters.put("User_name", "test");
+        parameters.put("Password", "password");
+        parameters.put("Port_number", "22");
+        parameters.put("Protocol", "netconf");
+        parameters.put("Contents", "Contents");
+        parameters.put("Get_config_template", Get_config_template);
+        parameters.put("Download_config_template", Download_config_template);
+        parameters.put("Config_contents", "config\nsystem\nservice-interface serv1\nipv4\ngateway-ip-address 192.168.30.44");
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name", "test");
+        cca.configure(key, parameters, ctx);
+        
+        
+    }
+    
+
+}
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestDebugLog.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestDebugLog.java
index c7a7953bd..53eaf325e 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestDebugLog.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestDebugLog.java
@@ -1,19 +1,42 @@
-package org.onap.appc.ccadaptor;

-

-import org.junit.Test;

-

-public class TestDebugLog {

-

-	@Test

-	public void testAppendToFile() {

-		DebugLog.appendToFile("appendData");

-	}

-

-	@Test

-	public void TestGetDateTime() {

-		String DateTime = DebugLog.getDateTime();

-		System.out.println(DateTime);

-

-	}

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.appc.ccadaptor;
+
+import org.junit.Test;
+
+public class TestDebugLog {
+
+    @Test
+    public void testAppendToFile() {
+        DebugLog.appendToFile("appendData");
+    }
+
+    @Test
+    public void TestGetDateTime() {
+        String DateTime = DebugLog.getDateTime();
+        System.out.println(DateTime);
+
+    }
+
+}
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestEncryptionTool.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestEncryptionTool.java
index a4a092e23..6476a3020 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestEncryptionTool.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestEncryptionTool.java
@@ -1,24 +1,47 @@
-package org.onap.appc.ccadaptor;

-

-import org.junit.Assert;

-import org.junit.Test;

-

-public class TestEncryptionTool {

-

-	@Test

-	public void testEncrypt() {

-		EncryptionTool tool = EncryptionTool.getInstance();

-		String value = tool.encrypt("encrypt");

-		Assert.assertEquals("enc:JjEZHlg7VQ==", value);

-		System.out.println(value);

-	}

-

-	@Test

-	public void testDecrypt() {

-		EncryptionTool tool = EncryptionTool.getInstance();

-		String value = tool.decrypt("enc:JjEZHlg7VQ==");

-		Assert.assertEquals("encrypt", value);

-		System.out.println(value);

-	}

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.appc.ccadaptor;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestEncryptionTool {
+
+    @Test
+    public void testEncrypt() {
+        EncryptionTool tool = EncryptionTool.getInstance();
+        String value = tool.encrypt("encrypt");
+        Assert.assertEquals("enc:JjEZHlg7VQ==", value);
+        System.out.println(value);
+    }
+
+    @Test
+    public void testDecrypt() {
+        EncryptionTool tool = EncryptionTool.getInstance();
+        String value = tool.decrypt("enc:JjEZHlg7VQ==");
+        Assert.assertEquals("encrypt", value);
+        System.out.println(value);
+    }
+
+}
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestSshJcraftWrapper.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestSshJcraftWrapper.java
index 2a2adb75e..aee08b1b1 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestSshJcraftWrapper.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestSshJcraftWrapper.java
@@ -1,23 +1,46 @@
-package org.onap.appc.ccadaptor;

-

-import org.junit.Assert;

-import org.junit.Test;

-

-public class TestSshJcraftWrapper {

-	

-	@Test

-	public void TestCheckIfReceivedStringMatchesDelimeter(){

-		SshJcraftWrapper wrapper = new SshJcraftWrapper();

-		wrapper.getTheDate();

-		boolean result = wrapper.checkIfReceivedStringMatchesDelimeter("#", "config#", "config#");

-		System.out.println(result);

-	}

-	

-	@Test

-	public void testRemoveWhiteSpaceAndNewLineCharactersAroundString(){

-		SshJcraftWrapper wrapper = new SshJcraftWrapper();

-		String nameSpace = wrapper.removeWhiteSpaceAndNewLineCharactersAroundString("namespace");

-		Assert.assertEquals("namespace", nameSpace);

-	}

-	

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.appc.ccadaptor;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestSshJcraftWrapper {
+    
+    @Test
+    public void TestCheckIfReceivedStringMatchesDelimeter(){
+        SshJcraftWrapper wrapper = new SshJcraftWrapper();
+        wrapper.getTheDate();
+        boolean result = wrapper.checkIfReceivedStringMatchesDelimeter("#", "config#", "config#");
+        System.out.println(result);
+    }
+    
+    @Test
+    public void testRemoveWhiteSpaceAndNewLineCharactersAroundString(){
+        SshJcraftWrapper wrapper = new SshJcraftWrapper();
+        String nameSpace = wrapper.removeWhiteSpaceAndNewLineCharactersAroundString("namespace");
+        Assert.assertEquals("namespace", nameSpace);
+    }
+    
+}
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestXmlUtil.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestXmlUtil.java
index f3e7a1004..eeb2f3c8a 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestXmlUtil.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/onap/appc/ccadaptor/TestXmlUtil.java
@@ -1,19 +1,42 @@
-package org.onap.appc.ccadaptor;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.junit.Assert;

-import org.junit.Test;

-

-public class TestXmlUtil {

-

-	@Test

-	public void testXml() {

-		Map<String, String> varmap = new HashMap<String, String>();

-		varmap.put("network.data", "ipv4");

-		String xmlData = XmlUtil.getXml(varmap, "network");

-		Assert.assertEquals("<data>ipv4</data>\n", xmlData);

-		System.out.println(xmlData);

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.appc.ccadaptor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestXmlUtil {
+
+    @Test
+    public void testXml() {
+        Map<String, String> varmap = new HashMap<String, String>();
+        varmap.put("network.data", "ipv4");
+        String xmlData = XmlUtil.getXml(varmap, "network");
+        Assert.assertEquals("<data>ipv4</data>\n", xmlData);
+        System.out.println(xmlData);
+    }
+}
\ No newline at end of file
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/AppcDataServiceActivator.java b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/AppcDataServiceActivator.java
index 698924853..552c1987f 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/AppcDataServiceActivator.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/AppcDataServiceActivator.java
@@ -1,23 +1,26 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.data.services;
 
 import java.util.LinkedList;
@@ -56,4 +59,4 @@ public class AppcDataServiceActivator implements BundleActivator {
 			registration = null;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/AppcDataServiceConstant.java b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/AppcDataServiceConstant.java
index c26a47096..f1c45c57b 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/AppcDataServiceConstant.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/AppcDataServiceConstant.java
@@ -1,23 +1,26 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.data.services;
 
 public class AppcDataServiceConstant {
@@ -50,4 +53,4 @@ public class AppcDataServiceConstant {
     }
     
     
-}
+}
\ No newline at end of file
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/db/DGGeneralDBService.java b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/db/DGGeneralDBService.java
index dbb765f61..303c974f9 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/db/DGGeneralDBService.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/db/DGGeneralDBService.java
@@ -1,23 +1,26 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.data.services.db;
 
 import java.util.Set;
@@ -442,4 +445,4 @@ public class DGGeneralDBService {
          return localContext.getAttribute("artifact-content");
  }
 
-}
+}
\ No newline at end of file
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/db/GeneralDataService.java b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/db/GeneralDataService.java
index d0b8726ad..49c8e4732 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/db/GeneralDataService.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/db/GeneralDataService.java
@@ -1,23 +1,26 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.data.services.db;
 
 import java.util.Map;
@@ -39,42 +42,42 @@ import com.att.eelf.configuration.EELFManager;
 
 public class GeneralDataService {
 
-	private static final EELFLogger log = EELFManager.getInstance().getLogger(GeneralDataService.class);
-	
-	public void saveTransactionLog(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException 
-	{
-		SvcLogicContext logger = new SvcLogicContext();
-		String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
-		String messageType = inParams.get(AppcDataServiceConstant.INPUT_PARAM_MESSAGE_TYPE);
-		String message = inParams.get(AppcDataServiceConstant.INPUT_PARAM_MESSAGE);
-		try 
-		{
-			
-			String escapedMessage = EscapeUtils.escapeSql(message);
-			logger.setAttribute("request-id", ctx.getAttribute("request-id"));
-			logger.setAttribute("log-message-type", messageType);
-			logger.setAttribute("log-message", escapedMessage);
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(GeneralDataService.class);
+    
+    public void saveTransactionLog(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException 
+    {
+        SvcLogicContext logger = new SvcLogicContext();
+        String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
+        String messageType = inParams.get(AppcDataServiceConstant.INPUT_PARAM_MESSAGE_TYPE);
+        String message = inParams.get(AppcDataServiceConstant.INPUT_PARAM_MESSAGE);
+        try 
+        {
+            
+            String escapedMessage = EscapeUtils.escapeSql(message);
+            logger.setAttribute("request-id", ctx.getAttribute("request-id"));
+            logger.setAttribute("log-message-type", messageType);
+            logger.setAttribute("log-message", escapedMessage);
 
-			responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
-			DGGeneralDBService db = DGGeneralDBService.initialise();
-			QueryStatus status = db.saveConfigTransactionLog( logger, responsePrefix);
+            responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
+            DGGeneralDBService db = DGGeneralDBService.initialise();
+            QueryStatus status = db.saveConfigTransactionLog( logger, responsePrefix);
 
-			logger.setAttribute("log-message", null);
-			logger.setAttribute("log-message-type", null);
-			logger.setAttribute("request-id", null);
+            logger.setAttribute("log-message", null);
+            logger.setAttribute("log-message-type", null);
+            logger.setAttribute("request-id", null);
 
-			if (status == QueryStatus.FAILURE)
-				throw new Exception("Unable to insert into config_transaction_log");
+            if (status == QueryStatus.FAILURE)
+                throw new Exception("Unable to insert into config_transaction_log");
 
 
-		} 
-		catch (Exception e) 
-		{
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
-			AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
-			ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
-			throw new SvcLogicException(e.getMessage());
-		}
-	}
-	
-}
+        } 
+        catch (Exception e) 
+        {
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_STATUS,
+            AppcDataServiceConstant.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(responsePrefix + AppcDataServiceConstant.OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage());
+            throw new SvcLogicException(e.getMessage());
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/node/ConfigResourceNode.java b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/node/ConfigResourceNode.java
index 30fcbbdcc..e22567336 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/node/ConfigResourceNode.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/node/ConfigResourceNode.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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
@@ -15,9 +17,10 @@
  * 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=========================================================
  */
-
 package org.onap.appc.data.services.node;
 
 import java.util.ArrayList;
@@ -788,4 +791,4 @@ public class ConfigResourceNode implements SvcLogicJavaPlugin {
         }
         return capabilityCheckNeeded;
     }
-}
+}
\ No newline at end of file
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/utils/EscapeUtils.java b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/utils/EscapeUtils.java
index 56e776c7c..6df4e1bad 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/utils/EscapeUtils.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/onap/appc/data/services/utils/EscapeUtils.java
@@ -1,39 +1,42 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.data.services.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
 public class EscapeUtils {
 
-	public EscapeUtils() {
-		// TODO Auto-generated constructor stub
-	}
+    public EscapeUtils() {
+        // TODO Auto-generated constructor stub
+    }
 
-	public static String escapeSql(String str) {
-		if (str == null) {
-			return null;
-		}
-		String searchList[] = new String[]{"'","\\"};
-		String replacementList[] = new String[]{ "''","\\\\"};
-		return StringUtils.replaceEach(str,searchList, replacementList);
-	}
-}
+    public static String escapeSql(String str) {
+        if (str == null) {
+            return null;
+        }
+        String searchList[] = new String[]{"'","\\"};
+        String replacementList[] = new String[]{ "''","\\\\"};
+        return StringUtils.replaceEach(str,searchList, replacementList);
+    }
+}
\ No newline at end of file
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/EncryptionToolActivator.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/EncryptionToolActivator.java
index cf72ece91..ebd723fcc 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/EncryptionToolActivator.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/EncryptionToolActivator.java
@@ -1,23 +1,26 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.encryptiontool;
 
 import java.util.LinkedList;
@@ -51,4 +54,4 @@ public class EncryptionToolActivator implements BundleActivator {
             registration = null;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java
index b91ccbc72..821355a1d 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/Constants.java
@@ -1,23 +1,26 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.encryptiontool.wrapper;
 
 public class Constants
@@ -30,4 +33,4 @@ public class Constants
     private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR";
 
     public static final String APPC_CONFIG_DIR="/opt/onap/appc/data/properties";
-}
+}
\ No newline at end of file