20 files changed, 42 insertions, 373 deletions
diff --git a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/DmaapListener.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java
index 7096d83bf..b2976294b 100644
--- a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/DmaapListener.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.dmaapclient;
+package org.onap.ccsdk.sli.northbound.dmaapclient;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/DummyDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DummyDmaapConsumer.java
index 5edc1c908..a3bc46153 100644
--- a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/DummyDmaapConsumer.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DummyDmaapConsumer.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.dmaapclient;
+package org.onap.ccsdk.sli.northbound.dmaapclient;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/InvalidMessageException.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/InvalidMessageException.java
index 3de5df6c2..b54adaf06 100644
--- a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/InvalidMessageException.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/InvalidMessageException.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.dmaapclient;
+package org.onap.ccsdk.sli.northbound.dmaapclient;
 
 public class InvalidMessageException extends Exception {
 
diff --git a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/SdncDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumer.java
index 5b55bda5b..f6d8ff862 100644
--- a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/SdncDmaapConsumer.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumer.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.dmaapclient;
+package org.onap.ccsdk.sli.northbound.dmaapclient;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/SdncFlatJsonDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
index 7e9c069ac..0e2a32646 100644
--- a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/SdncFlatJsonDmaapConsumer.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.dmaapclient;
+package org.onap.ccsdk.sli.northbound.dmaapclient;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/SdncOdlConnection.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncOdlConnection.java
index 6c6f308fb..4d16dd2a0 100644
--- a/dmaap-listener/src/main/java/org/openecomp/sdnc/dmaapclient/SdncOdlConnection.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncOdlConnection.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.dmaapclient;
+package org.onap.ccsdk.sli.northbound.dmaapclient;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/example-settings.xml b/example-settings.xml
deleted file mode 100644
index 2e7ce6445..000000000
--- a/example-settings.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<!--
- Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-  <profiles>
-    <profile>
-      <id>openecomp-release</id>
-      <repositories>
-        <repository>
-          <id>openecomp-release</id>
-          <name>openecomp-release</name>
-          <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>openecomp-release</id>
-          <name>openecomp-release</name>
-          <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-
-    <profile>
-      <id>openecomp-snapshots</id>
-      <repositories>
-        <repository>
-          <id>openecomp-snapshot</id>
-          <name>openecomp-snapshot</name>
-          <url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>openecomp-snapshot</id>
-          <name>openecomp-snapshot</name>
-          <url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-    <profile>
-      <id>opendaylight-release</id>
-      <repositories>
-        <repository>
-          <id>opendaylight-mirror</id>
-          <name>opendaylight-mirror</name>
-          <url>https://nexus.opendaylight.org/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>opendaylight-mirror</id>
-          <name>opendaylight-mirror</name>
-          <url>https://nexus.opendaylight.org/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-
-    <profile>
-      <id>opendaylight-snapshots</id>
-      <repositories>
-        <repository>
-          <id>opendaylight-snapshot</id>
-          <name>opendaylight-snapshot</name>
-          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>opendaylight-snapshot</id>
-          <name>opendaylight-snapshot</name>
-          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>openecomp-release</activeProfile>
-    <activeProfile>openecomp-snapshots</activeProfile>
-    <activeProfile>opendaylight-release</activeProfile>
-    <activeProfile>opendaylight-snapshots</activeProfile>
-  </activeProfiles>
-
-  <servers>
-   <server>
-    <id>nexus</id>
-    <username>USERNAME</username>
-    <password>PASSWORD</password>
-   </server>
-   <server> 
-    <id>openecomp-release</id> 
-    <username>USERNAME</username> 
-    <password>PASSWORD</password> 
-   </server> 
-   <server> 
-    <id>openecomp-snapshot</id> 
-         <username>USERNAME</username> 
-    <password>PASSWORD</password> 
-   </server> 
-  </servers>
-</settings>
diff --git a/jenkins-settings.xml b/jenkins-settings.xml
deleted file mode 100644
index 344994f85..000000000
--- a/jenkins-settings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<!--
- Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-  <profiles>
-    <profile>
-      <id>openecomp-release</id>
-      <repositories>
-        <repository>
-          <id>openecomp-release</id>
-          <name>openecomp-release</name>
-          <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>openecomp-release</id>
-          <name>openecomp-release</name>
-          <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-
-    <profile>
-      <id>openecomp-snapshots</id>
-      <repositories>
-        <repository>
-          <id>openecomp-snapshot</id>
-          <name>openecomp-snapshot</name>
-          <url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>openecomp-snapshot</id>
-          <name>openecomp-snapshot</name>
-          <url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-    <profile>
-      <id>opendaylight-release</id>
-      <repositories>
-        <repository>
-          <id>opendaylight-mirror</id>
-          <name>opendaylight-mirror</name>
-          <url>https://nexus.opendaylight.org/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>opendaylight-mirror</id>
-          <name>opendaylight-mirror</name>
-          <url>https://nexus.opendaylight.org/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-
-    <profile>
-      <id>opendaylight-snapshots</id>
-      <repositories>
-        <repository>
-          <id>opendaylight-snapshot</id>
-          <name>opendaylight-snapshot</name>
-          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>opendaylight-snapshot</id>
-          <name>opendaylight-snapshot</name>
-          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>openecomp-release</activeProfile>
-    <activeProfile>openecomp-snapshots</activeProfile>
-    <activeProfile>opendaylight-release</activeProfile>
-    <activeProfile>opendaylight-snapshots</activeProfile>
-  </activeProfiles>
-
-  <servers>
-   <server>
-    <id>nexus</id>
-    <username>${ecomp.nexus.user}</username>
-    <password>${ecomp.nexus.password}</password>
-   </server>
-   <server> 
-    <id>openecomp-release</id> 
-    <username>${ecomp.nexus.user}</username> 
-    <password>${ecomp.nexus.password}</password> 
-   </server> 
-   <server> 
-    <id>openecomp-snapshot</id> 
-         <username>${ecomp.nexus.user}</username> 
-    <password>${ecomp.nexus.password}</password> 
-   </server> 
-   <server>
-	<id>sdnc-javadoc</id>
-	<username>${ecomp.nexus.user}</username>
-	<password>${ecomp.nexus.password}</password>
-   </server>
-  </servers>
-</settings>
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncARModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
index 3472b443a..3be906181 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncARModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncArtifactMap.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java
index 4a9f02a8e..d979a3206 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncArtifactMap.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncBaseModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
index 39c50aed0..707eee7e4 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncBaseModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncNodeModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
index f8e5a5b8f..dcf668ed8 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncNodeModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncOdlConnection.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncOdlConnection.java
index 4e0cffab1..7bee801d2 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncOdlConnection.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncOdlConnection.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncServiceModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModel.java
index 0f645d7a3..86a4d2a25 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncServiceModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModel.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
index 496c2cef8..fd304208c 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebCallback.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -60,6 +60,7 @@ import javax.xml.xpath.XPathFactory;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.tuple.Pair;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
+import org.onap.ccsdk.sli.northbound.uebclient.SdncArtifactMap.SdncArtifactType;
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
 import org.openecomp.sdc.api.consumer.INotificationCallback;
@@ -78,7 +79,6 @@ import org.openecomp.sdc.toscaparser.api.NodeTemplate;
 import org.openecomp.sdc.utils.ArtifactTypeEnum;
 import org.openecomp.sdc.utils.DistributionActionResultEnum;
 import org.openecomp.sdc.utils.DistributionStatusEnum;
-import org.openecomp.sdnc.uebclient.SdncArtifactMap.SdncArtifactType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebClient.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebClient.java
index df5dfc0a9..e8ffc3333 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebClient.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebClient.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.api.IDistributionClient;
 import org.openecomp.sdc.api.results.IDistributionClientResult;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebConfiguration.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
index 7855b5ba4..bf0d5b823 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncUebConfiguration.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -111,41 +111,41 @@ public class SdncUebConfiguration implements IConfiguration{
 		Properties props = new Properties();
 		props.load(new FileInputStream(propFile));
 
-		asdcAddress = props.getProperty("org.openecomp.sdnc.uebclient.asdc-address");
-		consumerGroup = props.getProperty("org.openecomp.sdnc.uebclient.consumer-group");
-		consumerID = props.getProperty("org.openecomp.sdnc.uebclient.consumer-id");
-		environmentName = props.getProperty("org.openecomp.sdnc.uebclient.environment-name");
-		password = props.getProperty("org.openecomp.sdnc.uebclient.password");
-		user = props.getProperty("org.openecomp.sdnc.uebclient.user");
+		asdcAddress = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.asdc-address");
+		consumerGroup = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.consumer-group");
+		consumerID = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.consumer-id");
+		environmentName = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.environment-name");
+		password = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.password");
+		user = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.user");
 
-		sdncUser = props.getProperty("org.openecomp.sdnc.uebclient.sdnc-user");
-		sdncPasswd = props.getProperty("org.openecomp.sdnc.uebclient.sdnc-passwd");
-		asdcApiBaseUrl = props.getProperty("org.openecomp.sdnc.uebclient.asdc-api-base-url");
-		asdcApiNamespace = props.getProperty("org.openecomp.sdnc.uebclient.asdc-api-namespace");
+		sdncUser = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.sdnc-user");
+		sdncPasswd = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.sdnc-passwd");
+		asdcApiBaseUrl = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.asdc-api-base-url");
+		asdcApiNamespace = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.asdc-api-namespace");
 
-		incomingDir = props.getProperty("org.openecomp.sdnc.uebclient.spool.incoming");
-		archiveDir = props.getProperty("org.openecomp.sdnc.uebclient.spool.archive");
-		overrideFile = props.getProperty("org.openecomp.sdnc.uebclient.override-file");
+		incomingDir = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.spool.incoming");
+		archiveDir = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.spool.archive");
+		overrideFile = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.override-file");
 
-		String curval = props.getProperty("org.openecomp.sdnc.uebclient.polling-interval");
+		String curval = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.polling-interval");
 		if ((curval != null) && (curval.length() > 0)) {
 			try {
 				pollingInterval = Integer.parseInt(curval);
 			} catch (Exception e) {
-				LOG.warn("Illegal value for org.openecomp.sdnc.uebclient.polling-interval ("+curval+")");
+				LOG.warn("Illegal value for org.onap.ccsdk.sli.northbound.uebclient.polling-interval ("+curval+")");
 			}
 		}
 
-		curval = props.getProperty("org.openecomp.sdnc.uebclient.polling-timeout");
+		curval = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.polling-timeout");
 		if ((curval != null) && (curval.length() > 0)) {
 			try {
 				pollingTimeout = Integer.parseInt(curval);
 			} catch (Exception e) {
-				LOG.warn("Illegal value for org.openecomp.sdnc.uebclient.polling-timeout ("+curval+")");
+				LOG.warn("Illegal value for org.onap.ccsdk.sli.northbound.uebclient.polling-timeout ("+curval+")");
 			}
 		}
 
-		curval = props.getProperty("org.openecomp.sdnc.uebclient.relevant-artifact-types");
+		curval = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.relevant-artifact-types");
 		if ((curval != null) && (curval.length() > 0)) {
 			String[] artifactTypes = curval.split(",");
 
@@ -167,14 +167,14 @@ public class SdncUebConfiguration implements IConfiguration{
 
 		}
 
-		curval = props.getProperty("org.openecomp.sdnc.uebclient.activate-server-tls-auth", "false");
+		curval = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.activate-server-tls-auth", "false");
 		activateServerTLSAuth = "true".equalsIgnoreCase(curval);
-		keyStorePath = props.getProperty("org.openecomp.sdnc.uebclient.keystore-path");
-		keyStorePassword = props.getProperty("org.openecomp.sdnc.uebclient.keystore-password");
-		xsltPathList = props.getProperty("org.openecomp.sdnc.uebclient.xslt-path-list");
+		keyStorePath = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.keystore-path");
+		keyStorePassword = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.keystore-password");
+		xsltPathList = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.xslt-path-list");
 
 
-		String artifactMapFile = props.getProperty("org.openecomp.sdnc.uebclient.artifact-map");
+		String artifactMapFile = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.artifact-map");
 		if (artifactMapFile != null) {
 			artifactMap.load(artifactMapFile);
 		}
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFCModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
index 67b786896..76f015f9a 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFCModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModel.java
index 4e95e46ba..cd79689b4 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModel.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
diff --git a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModuleModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java
index 86df8b2ab..7ae6c3107 100644
--- a/ueb-listener/src/main/java/org/openecomp/sdnc/uebclient/SdncVFModuleModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.uebclient;
+package org.onap.ccsdk.sli.northbound.uebclient;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;