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>

36 files changed, 86 insertions, 86 deletions

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;