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>

59 files changed, 1037 insertions, 393 deletions

diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/.gitignore b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/.gitignore
index 541e6082d..2bf34acdc 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/.gitignore
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/.gitignore
@@ -1,4 +1,4 @@
 /bin/
 /target/
 /target-ide/
-/.settings/
\ No newline at end of file
+/.settings/
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/.gitignore b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/.gitignore
index 615a76bbc..e8a6cec94 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/.gitignore
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/.gitignore
@@ -1,4 +1,5 @@
 /target/
+/target-ide/
 /bin/
 /classes/
-/.settings/
+/.settings/
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/.gitignore b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/.gitignore
index b33175423..18c1ccfaf 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/.gitignore
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/.gitignore
@@ -1,4 +1,5 @@
 /bin/
 /target/
+/target-ide/
 /.settings/
-/build/
+/build/
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/MockGenerator.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/MockGenerator.java
index e34c3da1f..9ede03ef3 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/MockGenerator.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/MockGenerator.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import java.util.HashMap;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestCreateSnapshot.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestCreateSnapshot.java
index 3da8d2b06..3260c0ced 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestCreateSnapshot.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestCreateSnapshot.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import org.junit.Assert;
@@ -40,4 +63,4 @@ public class TestCreateSnapshot {
         verify(mg.getImageService(), atLeastOnce()).getImageByName(getImageNameCaptor.capture());
         assertEquals(createSnapshotCaptor.getValue(), getImageNameCaptor.getValue());
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestEvacuateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestEvacuateServer.java
index 977911120..2a9e0e15b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestEvacuateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestEvacuateServer.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import org.junit.Assert;
@@ -26,4 +49,4 @@ public class TestEvacuateServer {
         verify(mg.getComputeService()).moveServer(server.getId(), "newServer1");
     }
 
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestLookupServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestLookupServer.java
index 273c9a734..b4c2c2e8e 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestLookupServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestLookupServer.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import static org.junit.Assert.assertTrue;
@@ -31,4 +54,4 @@ public class TestLookupServer {
         }
         assertTrue(correctServerReturned);
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestMigrateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestMigrateServer.java
index 38d11951a..e6d9f21a6 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestMigrateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestMigrateServer.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import static org.mockito.Mockito.verify;
@@ -24,7 +47,7 @@ public class TestMigrateServer {
         } catch (APPCException e) {
             Assert.fail("Exception during MigrateServer.executeProviderOperation");
         }
-        verify(mg.getComputeService()).migrateServer(mg.SERVER_ID);
+        verify(mg.getComputeService()).migrateServer(MockGenerator.SERVER_ID);
         verify(server, atLeastOnce()).waitForStateChange(anyInt(), anyInt(), Matchers.anyVararg());
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRebuildServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRebuildServer.java
index 5e16c00ed..58a5b5502 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRebuildServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRebuildServer.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import org.junit.Assert;
@@ -106,4 +129,4 @@ public class TestRebuildServer {
         inOrderTest.verify(server).start();
     }
 
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRestartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRestartServer.java
index 202c09a5e..c7c0e95f8 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRestartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRestartServer.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import static org.mockito.Mockito.inOrder;
@@ -41,4 +64,4 @@ public class TestRestartServer {
         inOrderTest.verify(server).stop();
         inOrderTest.verify(server).start();
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestStartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestStartServer.java
index f6c188319..b4092eea0 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestStartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestStartServer.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import static org.mockito.Mockito.inOrder;
@@ -40,4 +63,4 @@ public class TestStartServer {
         InOrder inOrderTest = inOrder(server);
         inOrderTest.verify(server).unpause();
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestStopServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestStopServer.java
index 4a35a2bbe..a4405eaac 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestStopServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestStopServer.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import static org.mockito.Mockito.inOrder;
@@ -40,4 +63,4 @@ public class TestStopServer {
         InOrder inOrderTest = inOrder(server);
         inOrderTest.verify(server).unpause();
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestTerminateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestTerminateServer.java
index 2cce04fe4..75c94a449 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestTerminateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestTerminateServer.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import static org.mockito.Mockito.inOrder;
@@ -42,4 +65,4 @@ public class TestTerminateServer {
         inOrderTest.verify(server).stop();
         inOrderTest.verify(server).delete();
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestTerminateStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestTerminateStack.java
index 6bc8f4631..b4ce07b3b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestTerminateStack.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestTerminateStack.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import static org.mockito.Mockito.doReturn;
@@ -48,4 +71,4 @@ public class TestTerminateStack {
         }
         verify(stackService).deleteStack(stack1);
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestVmStatuschecker.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestVmStatuschecker.java
index cdf3b7fe2..a664b0864 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestVmStatuschecker.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestVmStatuschecker.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.adapter.iaas.provider.operation.impl;
 
 import org.junit.Assert;
@@ -59,4 +82,4 @@ public class TestVmStatuschecker {
         verify(mg.getSvcLogicContext(), atLeastOnce()).setAttribute(Constants.STATUS_OF_VM,
                 "error");
     }
-}
+}
\ No newline at end of file
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/.gitignore b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/.gitignore
index 615a76bbc..f38e03519 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/.gitignore
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/.gitignore
@@ -2,3 +2,4 @@
 /bin/
 /classes/
 /.settings/
+/target-ide/
\ No newline at end of file
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
diff --git a/appc-directed-graph/dg-loader/features/.gitignore b/appc-directed-graph/dg-loader/features/.gitignore
index 841e8d948..c3dd7d6ef 100644
--- a/appc-directed-graph/dg-loader/features/.gitignore
+++ b/appc-directed-graph/dg-loader/features/.gitignore
@@ -2,7 +2,8 @@
 .classpath
 .project
 .settings/
+/target-ide/
 
 # Maven
 log/
-target/
+target/
\ No newline at end of file
diff --git a/appc-inbound/.gitignore b/appc-inbound/.gitignore
index 4b38b789e..c4168ae67 100755
--- a/appc-inbound/.gitignore
+++ b/appc-inbound/.gitignore
@@ -1,32 +1,33 @@
-# Target dirs in all projects

-**/target/*

-

-# Added for Intellij IDEA IDE

-**/.idea/*

-*.iml

-

-# Generated models and features

-**/bin/*

-

-# MANIFEST.MF is updated on every clean install

-**/src/main/resources/META-INF/

-**/pom.xml.versionsBackup

-pom.xml.versionsBackup

-

-.project

-

-*.prefs

-.classpath

-**/.classpath

-/target/

-logs/

-debug-logs/

-/.settings/

-**/*.iml

-/.idea/

-

-

-# MANIFEST.MF is updated on every clean install

-**/src/main/resources/META-INF/

-**/src/main/yang-gen-sal

-**/src/main/yang-gen-config

+# Target dirs in all projects
+**/target/*
+
+# Added for Intellij IDEA IDE
+**/.idea/*
+*.iml
+
+# Generated models and features
+**/bin/*
+
+# MANIFEST.MF is updated on every clean install
+**/src/main/resources/META-INF/
+**/pom.xml.versionsBackup
+pom.xml.versionsBackup
+
+.project
+
+*.prefs
+.classpath
+**/.classpath
+/target/
+logs/
+debug-logs/
+/.settings/
+**/*.iml
+/.idea/
+.settings
+
+
+# MANIFEST.MF is updated on every clean install
+**/src/main/resources/META-INF/
+**/src/main/yang-gen-sal
+**/src/main/yang-gen-config
\ No newline at end of file
diff --git a/appc-inbound/appc-artifact-handler/features/.gitignore b/appc-inbound/appc-artifact-handler/features/.gitignore
index b83d22266..774433019 100755
--- a/appc-inbound/appc-artifact-handler/features/.gitignore
+++ b/appc-inbound/appc-artifact-handler/features/.gitignore
@@ -1 +1,2 @@
 /target/
+/target-ide/
\ No newline at end of file
diff --git a/appc-inbound/appc-artifact-handler/model/.gitignore b/appc-inbound/appc-artifact-handler/model/.gitignore
index 0f44a0f25..4af69aa87 100755
--- a/appc-inbound/appc-artifact-handler/model/.gitignore
+++ b/appc-inbound/appc-artifact-handler/model/.gitignore
@@ -1,2 +1,3 @@
 /target/
 /.classpath
+/target-ide/
\ No newline at end of file
diff --git a/appc-inbound/appc-artifact-handler/provider/.gitignore b/appc-inbound/appc-artifact-handler/provider/.gitignore
index 0f44a0f25..4af69aa87 100755
--- a/appc-inbound/appc-artifact-handler/provider/.gitignore
+++ b/appc-inbound/appc-artifact-handler/provider/.gitignore
@@ -1,2 +1,3 @@
 /target/
 /.classpath
+/target-ide/
\ No newline at end of file
diff --git a/appc-inbound/appc-design-services/features/.gitignore b/appc-inbound/appc-design-services/features/.gitignore
index b83d22266..774433019 100755
--- a/appc-inbound/appc-design-services/features/.gitignore
+++ b/appc-inbound/appc-design-services/features/.gitignore
@@ -1 +1,2 @@
 /target/
+/target-ide/
\ No newline at end of file
diff --git a/appc-inbound/appc-design-services/model/.gitignore b/appc-inbound/appc-design-services/model/.gitignore
index b83d22266..774433019 100755
--- a/appc-inbound/appc-design-services/model/.gitignore
+++ b/appc-inbound/appc-design-services/model/.gitignore
@@ -1 +1,2 @@
 /target/
+/target-ide/
\ No newline at end of file
diff --git a/appc-inbound/appc-design-services/provider/.gitignore b/appc-inbound/appc-design-services/provider/.gitignore
index b83d22266..774433019 100755
--- a/appc-inbound/appc-design-services/provider/.gitignore
+++ b/appc-inbound/appc-design-services/provider/.gitignore
@@ -1 +1,2 @@
 /target/
+/target-ide/
\ No newline at end of file
diff --git a/appc-inbound/appc-interfaces-service/bundle/.gitignore b/appc-inbound/appc-interfaces-service/bundle/.gitignore
index b83d22266..7ef8f2467 100644
--- a/appc-inbound/appc-interfaces-service/bundle/.gitignore
+++ b/appc-inbound/appc-interfaces-service/bundle/.gitignore
@@ -1 +1,3 @@
 /target/
+/target-ide/
+.settings
\ No newline at end of file
diff --git a/appc-inbound/appc-interfaces-service/features/.gitignore b/appc-inbound/appc-interfaces-service/features/.gitignore
index b83d22266..e4b755c95 100644
--- a/appc-inbound/appc-interfaces-service/features/.gitignore
+++ b/appc-inbound/appc-interfaces-service/features/.gitignore
@@ -1 +1,3 @@
 /target/
+/target-ide/
+/.settings/
\ No newline at end of file
diff --git a/appc-inbound/appc-interfaces-service/model/.gitignore b/appc-inbound/appc-interfaces-service/model/.gitignore
index b83d22266..774433019 100644
--- a/appc-inbound/appc-interfaces-service/model/.gitignore
+++ b/appc-inbound/appc-interfaces-service/model/.gitignore
@@ -1 +1,2 @@
 /target/
+/target-ide/
\ No newline at end of file
diff --git a/appc-provider/appc-provider-bundle/.gitignore b/appc-provider/appc-provider-bundle/.gitignore
index 5ef400af7..67b7abeb9 100644
--- a/appc-provider/appc-provider-bundle/.gitignore
+++ b/appc-provider/appc-provider-bundle/.gitignore
@@ -1,4 +1,5 @@
 /target/
+/target-ide/
 /bin/
 /.settings/
-**/yang-gen-config/
+**/yang-gen-config/
\ No newline at end of file
diff --git a/appc-provider/appc-provider-bundle/pom.xml b/appc-provider/appc-provider-bundle/pom.xml
index 622dfbdaf..3e60cb35b 100644
--- a/appc-provider/appc-provider-bundle/pom.xml
+++ b/appc-provider/appc-provider-bundle/pom.xml
@@ -269,4 +269,4 @@
             <artifactId>json</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/appc-provider/appc-provider-features/.gitignore b/appc-provider/appc-provider-features/.gitignore
index 2992ae832..8a45e5364 100644
--- a/appc-provider/appc-provider-features/.gitignore
+++ b/appc-provider/appc-provider-features/.gitignore
@@ -1,3 +1,4 @@
 /target/
 /bin/
 /.settings/
+/target-ide/
\ No newline at end of file
diff --git a/appc-provider/appc-provider-features/pom.xml b/appc-provider/appc-provider-features/pom.xml
index 222aa415e..7fa0a2389 100644
--- a/appc-provider/appc-provider-features/pom.xml
+++ b/appc-provider/appc-provider-features/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============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.
+  ============LICENSE_END=========================================================
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -140,4 +161,4 @@
 
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/appc-provider/appc-provider-installer/pom.xml b/appc-provider/appc-provider-installer/pom.xml
index 5a997af0d..c941c2dfe 100644
--- a/appc-provider/appc-provider-installer/pom.xml
+++ b/appc-provider/appc-provider-installer/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============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.
+  ============LICENSE_END=========================================================
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
diff --git a/appc-provider/appc-provider-model/.gitignore b/appc-provider/appc-provider-model/.gitignore
index 2992ae832..a7d704055 100644
--- a/appc-provider/appc-provider-model/.gitignore
+++ b/appc-provider/appc-provider-model/.gitignore
@@ -1,3 +1,4 @@
 /target/
+/target-ide/
 /bin/
-/.settings/
+/.settings/
\ No newline at end of file
diff --git a/appc-provider/appc-provider-model/pom.xml b/appc-provider/appc-provider-model/pom.xml
index 2bc6e411f..771ea9876 100644
--- a/appc-provider/appc-provider-model/pom.xml
+++ b/appc-provider/appc-provider-model/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============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.
+  ============LICENSE_END=========================================================
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -115,4 +136,4 @@
             <artifactId>ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/appc-provider/pom.xml b/appc-provider/pom.xml
index 147fc4c2d..a803322d9 100644
--- a/appc-provider/pom.xml
+++ b/appc-provider/pom.xml
@@ -1,3 +1,24 @@
+<!--
+  ============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.
+  ============LICENSE_END=========================================================
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/artifacts/impl/TestArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/artifacts/impl/TestArtifactProcessor.java
index 8253238e8..1166f0d50 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/artifacts/impl/TestArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/artifacts/impl/TestArtifactProcessor.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.sdc.artifacts.impl;
 
 import org.junit.Assert;
@@ -125,4 +148,4 @@ public class TestArtifactProcessor {
         return serviceArtifacts;
     }
 
-}
+}
\ No newline at end of file
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
index f4cbc6a74..071c863c9 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.sdc.artifacts.impl;
 
 import org.junit.Before;
@@ -129,4 +152,4 @@ public class TestLicenseArtifactProcessor {
         serviceArtifacts.add(artifactInfo);
         return serviceArtifacts;
     }
-}
+}
\ No newline at end of file
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcTestObjects.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcTestObjects.java
index 49c93d0a9..d01c76efc 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcTestObjects.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcTestObjects.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.sdc.listener;
 
 import org.junit.Assert;
@@ -18,4 +41,4 @@ public class SdcTestObjects {
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcTestUtils.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcTestUtils.java
index 7f2a01a7a..a073b951b 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcTestUtils.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcTestUtils.java
@@ -1,3 +1,26 @@
+/*-
+ * ============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.sdc.listener;
 
 import org.junit.Assert;
@@ -105,4 +128,4 @@ public class SdcTestUtils {
         }
         return new String(bFile);
     }
-}
+}
\ No newline at end of file
diff --git a/appc-test-dependencies/pom.xml b/appc-test-dependencies/pom.xml
index db09d8285..5b975cf57 100644
--- a/appc-test-dependencies/pom.xml
+++ b/appc-test-dependencies/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============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.
+  ============LICENSE_END=========================================================
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -43,4 +64,4 @@
             <version>1.4.196</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file