Refactor to use org.onap local packages

This is stage 1 of refactoring to use org.onap instead of org.openecomp
in java packages and class names.
Leaving the update from openecomp portalsdk to onap epsdk for a future
exercise since I'm trying to get a standalone GUI working (i.e. non-portal).

Issue-ID: DMAAP-159

Change-Id: I6a9368c66fa3603b1d9984f600802326ff2f0592
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>

50 files changed, 116 insertions, 115 deletions

diff --git a/dcae_dmaapbc_webapp/dbca-common/pom.xml b/dcae_dmaapbc_webapp/dbca-common/pom.xml
index b036b2a..8a65d5d 100644
--- a/dcae_dmaapbc_webapp/dbca-common/pom.xml
+++ b/dcae_dmaapbc_webapp/dbca-common/pom.xml
@@ -3,9 +3,9 @@
 	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>
 
-	<groupId>org.openecomp.ui.dmaapbc</groupId>
+	<groupId>org.onap.ui.dmaapbc</groupId>
 	<artifactId>dmaap-bc-app-common</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>DCAE DMaaP Bus Controller Webapp Common Java Files</name>
 	<description>Code for the DCAE DMaaP Bus Controller GUI</description>
@@ -15,7 +15,7 @@
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<epsdk.version>1.1.0</epsdk.version>
-		<dbca.version>1.1.0-SNAPSHOT</dbca.version>
+		<dbca.version>1.2.0-SNAPSHOT</dbca.version>
 		<skipTests>true</skipTests>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/client/DmaapBcRestClient.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/client/DmaapBcRestClient.java
index 39d28dd..5aafa74 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/client/DmaapBcRestClient.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/client/DmaapBcRestClient.java
@@ -17,24 +17,24 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.client;
+package org.onap.dcae.dmaapbc.client;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.http.client.utils.URIBuilder;
-import org.openecomp.dcae.dmaapbc.model.DR_Node;
-import org.openecomp.dcae.dmaapbc.model.DR_Pub;
-import org.openecomp.dcae.dmaapbc.model.DR_Sub;
-import org.openecomp.dcae.dmaapbc.model.DcaeLocation;
-import org.openecomp.dcae.dmaapbc.model.Dmaap;
-import org.openecomp.dcae.dmaapbc.model.DmaapObject;
-import org.openecomp.dcae.dmaapbc.model.ErrorResponse;
-import org.openecomp.dcae.dmaapbc.model.Feed;
-import org.openecomp.dcae.dmaapbc.model.MR_Client;
-import org.openecomp.dcae.dmaapbc.model.MR_Cluster;
-import org.openecomp.dcae.dmaapbc.model.Topic;
+import org.onap.dcae.dmaapbc.model.DR_Node;
+import org.onap.dcae.dmaapbc.model.DR_Pub;
+import org.onap.dcae.dmaapbc.model.DR_Sub;
+import org.onap.dcae.dmaapbc.model.DcaeLocation;
+import org.onap.dcae.dmaapbc.model.Dmaap;
+import org.onap.dcae.dmaapbc.model.DmaapObject;
+import org.onap.dcae.dmaapbc.model.ErrorResponse;
+import org.onap.dcae.dmaapbc.model.Feed;
+import org.onap.dcae.dmaapbc.model.MR_Client;
+import org.onap.dcae.dmaapbc.model.MR_Cluster;
+import org.onap.dcae.dmaapbc.model.Topic;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/client/HttpStatusAndResponse.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/client/HttpStatusAndResponse.java
index a9b1585..50faafd 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/client/HttpStatusAndResponse.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/client/HttpStatusAndResponse.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.client;
+package org.onap.dcae.dmaapbc.client;
 
 /**
  * Holds the status code and body that result from accessing an HTTP URL.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/client/IRestClientConstants.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/client/IRestClientConstants.java
index 1db390b..1cf0c96 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/client/IRestClientConstants.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/client/IRestClientConstants.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.client;
+package org.onap.dcae.dmaapbc.client;
 
 public interface IRestClientConstants {
 
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/client/SimpleRestClientBase.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/client/SimpleRestClientBase.java
index 7868d8c..3fc6474 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/client/SimpleRestClientBase.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/client/SimpleRestClientBase.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.client;
+package org.onap.dcae.dmaapbc.client;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DataBusHomeController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DataBusHomeController.java
index 8748f29..8ac462d 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DataBusHomeController.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DataBusHomeController.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.controller;
+package org.onap.dcae.dmaapbc.dbcapp.controller;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DataRouterController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DataRouterController.java
index cb6aa93..c2fbb26 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DataRouterController.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DataRouterController.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.controller;
+package org.onap.dcae.dmaapbc.dbcapp.controller;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -7,7 +7,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.dcae.dmaapbc.dbcapp.util.DbcappProperties;
+import org.onap.dcae.dmaapbc.dbcapp.util.DbcappProperties;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.util.SystemProperties;
 import org.slf4j.MDC;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DbcappRestrictedBaseController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DbcappRestrictedBaseController.java
index 517af09..7964e45 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DbcappRestrictedBaseController.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DbcappRestrictedBaseController.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.controller;
+package org.onap.dcae.dmaapbc.dbcapp.controller;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -15,21 +15,21 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.dcae.dmaapbc.client.DmaapBcRestClient;
-import org.openecomp.dcae.dmaapbc.client.HttpStatusAndResponse;
-import org.openecomp.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
-import org.openecomp.dcae.dmaapbc.dbcapp.rest.DbcUsvcRestClient;
-import org.openecomp.dcae.dmaapbc.dbcapp.service.DmaapAccessService;
-import org.openecomp.dcae.dmaapbc.dbcapp.util.DbcappProperties;
-import org.openecomp.dcae.dmaapbc.model.DR_Pub;
-import org.openecomp.dcae.dmaapbc.model.DR_Sub;
-import org.openecomp.dcae.dmaapbc.model.DcaeLocation;
-import org.openecomp.dcae.dmaapbc.model.Dmaap;
-import org.openecomp.dcae.dmaapbc.model.DmaapObject;
-import org.openecomp.dcae.dmaapbc.model.ErrorResponse;
-import org.openecomp.dcae.dmaapbc.model.Feed;
-import org.openecomp.dcae.dmaapbc.model.MR_Client;
-import org.openecomp.dcae.dmaapbc.model.Topic;
+import org.onap.dcae.dmaapbc.client.DmaapBcRestClient;
+import org.onap.dcae.dmaapbc.client.HttpStatusAndResponse;
+import org.onap.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
+import org.onap.dcae.dmaapbc.dbcapp.rest.DbcUsvcRestClient;
+import org.onap.dcae.dmaapbc.dbcapp.service.DmaapAccessService;
+import org.onap.dcae.dmaapbc.dbcapp.util.DbcappProperties;
+import org.onap.dcae.dmaapbc.model.DR_Pub;
+import org.onap.dcae.dmaapbc.model.DR_Sub;
+import org.onap.dcae.dmaapbc.model.DcaeLocation;
+import org.onap.dcae.dmaapbc.model.Dmaap;
+import org.onap.dcae.dmaapbc.model.DmaapObject;
+import org.onap.dcae.dmaapbc.model.ErrorResponse;
+import org.onap.dcae.dmaapbc.model.Feed;
+import org.onap.dcae.dmaapbc.model.MR_Client;
+import org.onap.dcae.dmaapbc.model.Topic;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java
index 5f81a74..bd5c420 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/DmaapAccessController.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.controller;
+package org.onap.dcae.dmaapbc.dbcapp.controller;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -7,11 +7,11 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.openecomp.dcae.dmaapbc.client.DmaapBcRestClient;
-import org.openecomp.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
-import org.openecomp.dcae.dmaapbc.model.Dmaap;
-import org.openecomp.dcae.dmaapbc.model.DmaapObject;
-import org.openecomp.dcae.dmaapbc.model.ErrorResponse;
+import org.onap.dcae.dmaapbc.client.DmaapBcRestClient;
+import org.onap.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
+import org.onap.dcae.dmaapbc.model.Dmaap;
+import org.onap.dcae.dmaapbc.model.DmaapObject;
+import org.onap.dcae.dmaapbc.model.ErrorResponse;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.util.SystemProperties;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/HealthCheckController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/HealthCheckController.java
index 5754244..820cd5b 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/HealthCheckController.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/HealthCheckController.java
@@ -1,10 +1,10 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.controller;
+package org.onap.dcae.dmaapbc.dbcapp.controller;
 
 import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.openecomp.dcae.dmaapbc.dbcapp.service.DmaapAccessService;
+import org.onap.dcae.dmaapbc.dbcapp.service.DmaapAccessService;
 import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.util.SystemProperties;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/MessageRouterController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/MessageRouterController.java
index 9d889dd..70bc90a 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/MessageRouterController.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/controller/MessageRouterController.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.controller;
+package org.onap.dcae.dmaapbc.dbcapp.controller;
 
 import java.util.Date;
 
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java
index 3edd3ba..31b0fdd 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/domain/DmaapAccess.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.domain;
+package org.onap.dcae.dmaapbc.dbcapp.domain;
 
 import org.openecomp.portalsdk.core.domain.support.DomainVo;
 import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/domain/ManifestTransportModel.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/domain/ManifestTransportModel.java
index a98f14d..24ba1ff 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/domain/ManifestTransportModel.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/domain/ManifestTransportModel.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.domain;
+package org.onap.dcae.dmaapbc.dbcapp.domain;
 
 import java.util.Map;
 
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/rest/DbcUsvcRestClient.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/rest/DbcUsvcRestClient.java
index 3700c3d..b252858 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/rest/DbcUsvcRestClient.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/rest/DbcUsvcRestClient.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.rest;
+package org.onap.dcae.dmaapbc.dbcapp.rest;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -11,9 +11,9 @@ import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.openecomp.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
-import org.openecomp.dcae.dmaapbc.dbcapp.domain.ManifestTransportModel;
-import org.openecomp.dcae.dmaapbc.dbcapp.service.DmaapAccessService;
+import org.onap.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
+import org.onap.dcae.dmaapbc.dbcapp.domain.ManifestTransportModel;
+import org.onap.dcae.dmaapbc.dbcapp.service.DmaapAccessService;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/rest/DbcUsvcRestResponse.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/rest/DbcUsvcRestResponse.java
index 98cfc20..e9284a6 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/rest/DbcUsvcRestResponse.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/rest/DbcUsvcRestResponse.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.rest;
+package org.onap.dcae.dmaapbc.dbcapp.rest;
 
 /**
  * Models the responses sent by the micro service in JSON format.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
index 432d61c..14ddd93 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.rest;
+package org.onap.dcae.dmaapbc.dbcapp.rest;
 
 import java.net.URI;
 
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/service/DmaapAccessService.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/service/DmaapAccessService.java
index c4d85bf..38124a2 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/service/DmaapAccessService.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/service/DmaapAccessService.java
@@ -1,9 +1,9 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.service;
+package org.onap.dcae.dmaapbc.dbcapp.service;
 
 import java.util.List;
 
-import org.openecomp.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
-import org.openecomp.dcae.dmaapbc.dbcapp.domain.ManifestTransportModel;
+import org.onap.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
+import org.onap.dcae.dmaapbc.dbcapp.domain.ManifestTransportModel;
 
 /**
  * Defines methods to manipulate the database table with DmaapAccess domain
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java
index bca8458..96fb152 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/service/DmaapAccessServiceImpl.java
@@ -1,12 +1,12 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.service;
+package org.onap.dcae.dmaapbc.dbcapp.service;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
-import org.openecomp.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
-import org.openecomp.dcae.dmaapbc.dbcapp.domain.ManifestTransportModel;
+import org.onap.dcae.dmaapbc.dbcapp.domain.DmaapAccess;
+import org.onap.dcae.dmaapbc.dbcapp.domain.ManifestTransportModel;
 import org.openecomp.portalsdk.core.service.DataAccessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,7 +32,7 @@ public class DmaapAccessServiceImpl implements DmaapAccessService {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.dmaapbc.dbcapp.service.DmaapAccessService#getManifest()
+	 * @see org.onap.dmaapbc.dbcapp.service.DmaapAccessService#getManifest()
 	 */
 	@Override
 	public ManifestTransportModel getManifest() {
@@ -41,7 +41,7 @@ public class DmaapAccessServiceImpl implements DmaapAccessService {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.dmaapbc.dbcapp.service.DmaapAccessService#getDmaapAccessCount()
+	 * @see org.onap.dmaapbc.dbcapp.service.DmaapAccessService#getDmaapAccessCount()
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
@@ -52,7 +52,7 @@ public class DmaapAccessServiceImpl implements DmaapAccessService {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.dmaapbc.dbcapp.service.DmaapAccessService#getDmaapAccessList(java.lang.String)
+	 * @see org.onap.dmaapbc.dbcapp.service.DmaapAccessService#getDmaapAccessList(java.lang.String)
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
@@ -67,7 +67,7 @@ public class DmaapAccessServiceImpl implements DmaapAccessService {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.dmaapbc.dbcapp.service.DmaapAccessService#getDmaapAccess(java.lang.Long)
+	 * @see org.onap.dmaapbc.dbcapp.service.DmaapAccessService#getDmaapAccess(java.lang.Long)
 	 */
 	@Override
 	public DmaapAccess getDmaapAccess(Long dmaapId) {
@@ -76,7 +76,7 @@ public class DmaapAccessServiceImpl implements DmaapAccessService {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.dmaapbc.dbcapp.service.DmaapAccessService#saveDmaapAccess(org.openecomp.dmaapbc.dbcapp.domain.DmaapAccess)
+	 * @see org.onap.dmaapbc.dbcapp.service.DmaapAccessService#saveDmaapAccess(org.onap.dmaapbc.dbcapp.domain.DmaapAccess)
 	 */
 	@Override
 	public void saveDmaapAccess(DmaapAccess dmaap) {
@@ -85,7 +85,7 @@ public class DmaapAccessServiceImpl implements DmaapAccessService {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.dmaapbc.dbcapp.service.DmaapAccessService#deleteDmaapAccess(java.lang.Long)
+	 * @see org.onap.dmaapbc.dbcapp.service.DmaapAccessService#deleteDmaapAccess(java.lang.Long)
 	 */
 	@Override
 	public void deleteDmaapAccess(Long dmaapId) {
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/util/DbcappProperties.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/util/DbcappProperties.java
index b08e007..c6db620 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/util/DbcappProperties.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/dbcapp/util/DbcappProperties.java
@@ -1,4 +1,4 @@
-package org.openecomp.dcae.dmaapbc.dbcapp.util;
+package org.onap.dcae.dmaapbc.dbcapp.util;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DR_Node.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DR_Node.java
index 87ad86e..66e6a21 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DR_Node.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DR_Node.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 /**
  * Bean that models a DMaaP Data Router node.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DR_Pub.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DR_Pub.java
index fe0aeca..cce2ae7 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DR_Pub.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DR_Pub.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 /**
  * Bean that models a DMaaP Data Router publisher.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DR_Sub.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DR_Sub.java
index 45adf9c..b74b4ee 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DR_Sub.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DR_Sub.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 /**
  * Bean that models a DMaaP Data Router subscriber.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DcaeLocation.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DcaeLocation.java
index c0a79c1..400044d 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DcaeLocation.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DcaeLocation.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 /**
  * Bean that models a DMaaP DCAE location.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/Dmaap.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/Dmaap.java
index fd00557..f30a843 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/Dmaap.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/Dmaap.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 /**
  * Bean that models a DMaaP instance.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DmaapObject.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DmaapObject.java
index 977bf78..15fdd1f 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/DmaapObject.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/DmaapObject.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 /**
  * Parent class for all DMaaP BC models.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/ErrorResponse.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/ErrorResponse.java
index 2cdb182..9ac67d2 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/ErrorResponse.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/ErrorResponse.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 /**
  * Bean that models a DMaaP Bus Controller error response.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/Feed.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/Feed.java
index f56aa54..9d58228 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/Feed.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/Feed.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/MR_Client.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/MR_Client.java
index a1abc70..7fcee37 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/MR_Client.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/MR_Client.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 /**
  * Bean that models a DMaaP Message Router client.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/MR_Cluster.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/MR_Cluster.java
index 6b213b6..90327ab 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/MR_Cluster.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/MR_Cluster.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 import java.util.List;
 
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/Topic.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/Topic.java
index 229ae3f..d2965fd 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/model/Topic.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/dcae/dmaapbc/model/Topic.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/fusionapp/model/Result.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/model/Result.java
index d23ed72..22b50a8 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/fusionapp/model/Result.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/model/Result.java
@@ -1,4 +1,4 @@
-package org.openecomp.fusionapp.model;
+package org.onap.fusionapp.model;
 
 public class Result {
 	private String result;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/fusionapp/service/AdminAuthExtension.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java
index 5d71602..1892553 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/fusionapp/service/AdminAuthExtension.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java
@@ -1,4 +1,4 @@
-package org.openecomp.fusionapp.service;
+package org.onap.fusionapp.service;
 
 import org.openecomp.portalsdk.core.domain.User;
 
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/fusionapp/util/CustomLoggingFilter.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java
index 4562584..9dc77c4 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/fusionapp/util/CustomLoggingFilter.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java
@@ -1,4 +1,4 @@
-package org.openecomp.fusionapp.util;
+package org.onap.fusionapp.util;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/openecomp/dcae/dmaapbc/model/DcaeLocationTest.java b/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/onap/dcae/dmaapbc/model/DcaeLocationTest.java
index 9cc3350..ebd0244 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/openecomp/dcae/dmaapbc/model/DcaeLocationTest.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/onap/dcae/dmaapbc/model/DcaeLocationTest.java
@@ -1,8 +1,8 @@
-package org.openecomp.dcae.dmaapbc.model;
+package org.onap.dcae.dmaapbc.model;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.dcae.dmaapbc.model.DmaapObject.Dmaap_Status;
+import org.onap.dcae.dmaapbc.model.DmaapObject.Dmaap_Status;
 
 /**
  * Trivial POJO test.
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/openecomp/fusion/core/MockApplicationContextTestSuite.java b/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
index e828c88..a7271f5 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/openecomp/fusion/core/MockApplicationContextTestSuite.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
@@ -1,4 +1,4 @@
-package org.openecomp.fusion.core;
+package org.onap.fusion.core;
 
 import java.io.IOException;
 
@@ -73,7 +73,7 @@ public class MockApplicationContextTestSuite {
 }
 
 @Configuration
-@ComponentScan(basePackages = "org.openecomp", excludeFilters = {
+@ComponentScan(basePackages = "org.onap", excludeFilters = {
 		// see AppConfig class
 })
 @Profile("test")
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/openecomp/fusionapp/SanityTest.java b/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/onap/fusionapp/SanityTest.java
index a5022f9..b5205a9 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/openecomp/fusionapp/SanityTest.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/onap/fusionapp/SanityTest.java
@@ -1,8 +1,8 @@
-package org.openecomp.fusionapp;
+package org.onap.fusionapp;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.fusion.core.MockApplicationContextTestSuite;
+import org.onap.fusion.core.MockApplicationContextTestSuite;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
diff --git a/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java b/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
index 1e6d78c..406a2e2 100644
--- a/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java
+++ b/dcae_dmaapbc_webapp/dbca-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
@@ -1,10 +1,10 @@
-package org.openecomp.fusionapp.service;
+package org.onap.fusionapp.service;
 
 import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.fusion.core.MockApplicationContextTestSuite;
+import org.onap.fusion.core.MockApplicationContextTestSuite;
 import org.openecomp.portalsdk.core.domain.Profile;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.service.ProfileService;
diff --git a/dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql b/dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql
index 5bd6014..0081c52 100644
--- a/dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql
+++ b/dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql
@@ -451,7 +451,7 @@ Insert into fn_user
 
 -- fn_app
 -- Use name "DMAAP-BC-APP" (originally "Default")
-Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_URL,APP_ALTERNATE_URL,APP_REST_ENDPOINT,ML_APP_NAME,ML_APP_ADMIN_ID,MOTS_ID,APP_PASSWORD,OPEN,ENABLED,THUMBNAIL,APP_USERNAME,UEB_KEY,UEB_SECRET,UEB_TOPIC_NAME) VALUES (1,'DMAAP-BC-APP','assets/images/tmp/portal1.png','Some Default Description','Some Default Note','http://www.openecomp.org','http://www.openecomp.org',null,'ECPP','?','1','okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX');
+Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_URL,APP_ALTERNATE_URL,APP_REST_ENDPOINT,ML_APP_NAME,ML_APP_ADMIN_ID,MOTS_ID,APP_PASSWORD,OPEN,ENABLED,THUMBNAIL,APP_USERNAME,UEB_KEY,UEB_SECRET,UEB_TOPIC_NAME) VALUES (1,'DMAAP-BC-APP','assets/images/tmp/portal1.png','Some Default Description','Some Default Note','http://www.onap.org','http://www.onap.org',null,'ECPP','?','1','okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX');
 
 -- fn_user_role
 Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,1,null,1);
diff --git a/dcae_dmaapbc_webapp/dbca-os/pom.xml b/dcae_dmaapbc_webapp/dbca-os/pom.xml
index adeceac..472848b 100644
--- a/dcae_dmaapbc_webapp/dbca-os/pom.xml
+++ b/dcae_dmaapbc_webapp/dbca-os/pom.xml
@@ -3,9 +3,9 @@
 	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>
 
-	<groupId>org.openecomp.ui.dmaapbc</groupId>
+	<groupId>org.onap.ui.dmaapbc</groupId>
 	<artifactId>dmaap-bc-app-os</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>DCAE DMaaP Bus Controller Webapp for ONAP</name>
 	<description>DMaaP Bus Controller Web Application for open-source release</description>
@@ -17,12 +17,12 @@
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<epsdk.version>1.1.0</epsdk.version>
-		<dbca.version>1.1.0-SNAPSHOT</dbca.version>
+		<dbca.version>1.2.0-SNAPSHOT</dbca.version>
 		<sonar.exclusions>**.js</sonar.exclusions>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-		<sitePath>/content/sites/site/org/openecomp/ui/dmaapbc/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org/onap/ui/dmaapbc/${project.version}</sitePath>
 	</properties>
 
 	<repositories>
@@ -71,7 +71,7 @@
 					</archive>
 					<overlays>
 						<overlay>
-							<groupId>org.openecomp.ui.dmaapbc</groupId>
+							<groupId>org.onap.ui.dmaapbc</groupId>
 							<artifactId>dmaap-bc-app-overlay</artifactId>
 							<excludes>
 								<exclude>META-INF/MANIFEST.MF</exclude>
@@ -137,14 +137,14 @@
 	<dependencies>
 		<!-- DMaaP webapp controllers -->
 		<dependency>
-			<groupId>org.openecomp.ui.dmaapbc</groupId>
+			<groupId>org.onap.ui.dmaapbc</groupId>
 			<artifactId>dmaap-bc-app-common</artifactId>
 			<version>${dbca.version}</version>
 			<type>jar</type>
 		</dependency>
 		<!-- DMaaP webapp overlay -->
 		<dependency>
-			<groupId>org.openecomp.ui.dmaapbc</groupId>
+			<groupId>org.onap.ui.dmaapbc</groupId>
 			<artifactId>dmaap-bc-app-overlay</artifactId>
 			<version>${dbca.version}</version>
 			<type>war</type>
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index ddb4bc2..c827e84 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.portalapp.lm.FusionLicenseManagerImpl;
-import org.openecomp.portalapp.login.LoginStrategyImpl;
+import org.onap.portalapp.lm.FusionLicenseManagerImpl;
+import org.onap.portalapp.login.LoginStrategyImpl;
 import org.openecomp.portalapp.scheduler.LogRegistry;
 import org.openecomp.portalsdk.core.auth.LoginStrategy;
 import org.openecomp.portalsdk.core.conf.AppConfig;
@@ -55,7 +55,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
  */
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages = "org.openecomp",
+@ComponentScan(basePackages = "org.openecomp, org.onap",
 		// Exclude unused annotated classes with heavy dependencies.
 		excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
 				// EPSDK-Analytics
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index 6d7c72d..347bb51 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
 
 import org.openecomp.portalsdk.core.conf.AppInitializer;
 
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
index ce77960..cbff8a9 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.ClassPathResource;
@@ -54,7 +54,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable {
 	 */
 	@Override
 	public String[] getPackagesToScan() {
-		return new String[] { "org.openecomp" };
+		return new String[] { "org.onap", "org.openecomp" };
 	}
 
 }
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
index abbf926..49a6070 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
@@ -18,7 +18,7 @@
  * ================================================================================
  */
 
-package org.openecomp.portalapp.lm;
+package org.onap.portalapp.lm;
 
 import java.util.Date;
 import java.util.List;
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
index 270e69f..1dd7abc 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
@@ -18,7 +18,7 @@
  * ================================================================================
  */
 
-package org.openecomp.portalapp.login;
+package org.onap.portalapp.login;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java
index 2b9b60e..cbc6af2 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java
@@ -17,10 +17,11 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.service;
+package org.onap.portalapp.service;
 
 import java.util.Set;
 
+import org.openecomp.portalapp.service.IAdminAuthExtension; 
 import org.openecomp.portalsdk.core.domain.Role;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml b/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml
index 869b349..4766277 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml
@@ -80,7 +80,7 @@
     <encoder>
       <pattern>${applicationLoggerPattern}</pattern>
     </encoder>
-    <filter class="org.openecomp.fusionapp.util.CustomLoggingFilter" />
+    <filter class="org.onap.fusionapp.util.CustomLoggingFilter" />
   </appender>
   
   <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/pom.xml b/dcae_dmaapbc_webapp/dbca-overlay/pom.xml
index 2675727..6e70f31 100644
--- a/dcae_dmaapbc_webapp/dbca-overlay/pom.xml
+++ b/dcae_dmaapbc_webapp/dbca-overlay/pom.xml
@@ -3,9 +3,9 @@
 	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>
 
-	<groupId>org.openecomp.ui.dmaapbc</groupId>
+	<groupId>org.onap.ui.dmaapbc</groupId>
 	<artifactId>dmaap-bc-app-overlay</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>DCAE DMaaP Bus Controller Webapp Common Web Files</name>
 	<description>Web resource overlay for the DCAE DMaaP Bus Controller GUI</description>
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/WEB-INF/dbcapp/dbcapp.hbm.xml b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/WEB-INF/dbcapp/dbcapp.hbm.xml
index 87bf9c2..93d1dd4 100644
--- a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/WEB-INF/dbcapp/dbcapp.hbm.xml
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/WEB-INF/dbcapp/dbcapp.hbm.xml
@@ -3,7 +3,7 @@
         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping package="org.openecomp.dcae.dmaapbc.dbcapp.domain">
+<hibernate-mapping package="org.onap.dcae.dmaapbc.dbcapp.domain">
 
      <!-- class mapping details -->
     <class name="DmaapAccess" table="DBCA_DMAAP_ACCESS ">
diff --git a/dcae_dmaapbc_webapp/pom.xml b/dcae_dmaapbc_webapp/pom.xml
index bc50aa0..79ca5bb 100644
--- a/dcae_dmaapbc_webapp/pom.xml
+++ b/dcae_dmaapbc_webapp/pom.xml
@@ -3,9 +3,9 @@
         <modelVersion>4.0.0</modelVersion>
 
         <!-- DMAAP-BC webapp parent project for developer convenience of building and cleaning -->
-        <groupId>org.openecomp.dcae.dmaapbc</groupId>
+        <groupId>org.onap.dcae.dmaapbc</groupId>
         <artifactId>dmaap-bc-app-parent</artifactId>
-        <version>0</version>
+        <version>1</version>
         <packaging>pom</packaging>
         <name>DCAE DMaaP Bus Controller Webapp projects (parent)</name>
 
diff --git a/pom.xml b/pom.xml
index b4a04ec..086a6d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
 <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>
 
-        <groupId>org.openecomp.dcae.dmaapbc</groupId>
+        <groupId>org.onap.dcae.dmaapbc</groupId>
         <artifactId>dcae_dmaapbc_webapp</artifactId>
-        <version>0</version>
+        <version>1</version>
         <packaging>pom</packaging>
         <name>ui-dmaapbc</name>