[POLICY-71] replace openecomp for policy-common

Change-Id: I3241f5d1f0234043b4dff718eda1ffdc48052276
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

20 files changed, 84 insertions, 84 deletions

diff --git a/integrity-audit/pom.xml b/integrity-audit/pom.xml
index 51e2cca0..0e6fbb1e 100644
--- a/integrity-audit/pom.xml
+++ b/integrity-audit/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Common Modules
+  ONAP Policy Engine - Common Modules
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -28,7 +28,7 @@
 	<packaging>jar</packaging>
 
 	<parent>
-		<groupId>org.openecomp.policy.common</groupId>
+		<groupId>org.onap.policy.common</groupId>
 		<artifactId>common-modules</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -68,8 +68,8 @@
 			 <version>3.4</version>
 		</dependency>
 		<dependency>
-			 <groupId>org.openecomp.policy.common</groupId>
-			 <artifactId>ECOMP-Logging</artifactId>
+			 <groupId>org.onap.policy.common</groupId>
+			 <artifactId>ONAP-Logging</artifactId>
 			 <version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/AuditThread.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java
index 2319f211..e7e16a64 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/AuditThread.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia;
+package org.onap.policy.common.ia;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,10 +29,10 @@ import java.util.Properties;
 //import org.apache.log4j.Logger;
 
 
-import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.ia.jpa.IntegrityAuditEntity;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * AuditThread is the main thread for the IntegrityAudit
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbAudit.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbAudit.java
index b509d563..8312daa3 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbAudit.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia;
+package org.onap.policy.common.ia;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -39,10 +39,10 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 
 
-import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.ia.jpa.IntegrityAuditEntity;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * class DbAudit does actual auditing of DB tables.
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbAuditException.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbAuditException.java
index 956dd431..f5cd183f 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbAuditException.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbAuditException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia;
+package org.onap.policy.common.ia;
 
 public class DbAuditException extends Exception{
 	private static final long serialVersionUID = 1L;
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbDAO.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbDAO.java
index 5ab16d58..64c01931 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbDAO.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbDAO.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia;
+package org.onap.policy.common.ia;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -42,9 +42,9 @@ import javax.persistence.metamodel.Metamodel;
 
 //import org.apache.log4j.Logger;
 
-import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.ia.jpa.IntegrityAuditEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * class DbDAO provides the inteface to the DBs for the purpose of audits.
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbDaoTransactionException.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbDaoTransactionException.java
index fc2fea03..4ad8521a 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbDaoTransactionException.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbDaoTransactionException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia;
+package org.onap.policy.common.ia;
 
 public class DbDaoTransactionException extends Exception{
 	private static final long serialVersionUID = 1L;
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAudit.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAudit.java
index 1dd260de..5ec6229c 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAudit.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAudit.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia;
+package org.onap.policy.common.ia;
 
 import java.util.Properties;
 
 //import org.apache.log4j.Logger;
 
-import org.openecomp.policy.common.ia.IntegrityAuditProperties.NodeTypeEnum;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger; 
+import org.onap.policy.common.ia.IntegrityAuditProperties.NodeTypeEnum;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger; 
 
 /**
  * class IntegrityAudit
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAuditProperties.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAuditProperties.java
index 5a87c9cc..3f87cf26 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAuditProperties.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAuditProperties.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia;
+package org.onap.policy.common.ia;
 
 public class IntegrityAuditProperties {
 
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAuditPropertiesException.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAuditPropertiesException.java
index 77c85585..b62e9064 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAuditPropertiesException.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAuditPropertiesException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia;
+package org.onap.policy.common.ia;
 
 public class IntegrityAuditPropertiesException extends Exception{
 	private static final long serialVersionUID = 1L;
diff --git a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/jpa/IntegrityAuditEntity.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/jpa/IntegrityAuditEntity.java
index 21b200c8..2b68a51d 100644
--- a/integrity-audit/src/main/java/org/openecomp/policy/common/ia/jpa/IntegrityAuditEntity.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/jpa/IntegrityAuditEntity.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia.jpa;
+package org.onap.policy.common.ia.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/integrity-audit/src/main/resources/META-INF/persistence.xml b/integrity-audit/src/main/resources/META-INF/persistence.xml
index 31ffb4de..9e4880fa 100644
--- a/integrity-audit/src/main/resources/META-INF/persistence.xml
+++ b/integrity-audit/src/main/resources/META-INF/persistence.xml
@@ -23,8 +23,8 @@
 	<persistence-unit name="testPU" transaction-type="RESOURCE_LOCAL">
 	<!-- Limited use for generating the DB and schema files for iatest DB - uses eclipselink -->
 		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-		<class>org.openecomp.policy.common.ia.test.jpa.IaTestEntity</class>
+		<class>org.onap.policy.common.ia.jpa.IntegrityAuditEntity</class>
+		<class>org.onap.policy.common.ia.test.jpa.IaTestEntity</class>
 		<shared-cache-mode>NONE</shared-cache-mode>
 		<properties>
 			<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
@@ -37,7 +37,7 @@
 	<persistence-unit name="integrityAuditPU" transaction-type="RESOURCE_LOCAL">
 	<!-- For operational use -->
 		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>		
+		<class>org.onap.policy.common.ia.jpa.IntegrityAuditEntity</class>		
 		<shared-cache-mode>NONE</shared-cache-mode>	
 		<properties>
 			<!-- none -->
diff --git a/integrity-audit/src/main/resources/logback.xml b/integrity-audit/src/main/resources/logback.xml
index 426adf9e..c3b2f9f6 100644
--- a/integrity-audit/src/main/resources/logback.xml
+++ b/integrity-audit/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
   <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="common-modules"></property>
   <property name="subComponentName" value="integrity-audit"></property>
   
diff --git a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/AuditPeriodTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java
index d0c64065..52f847cf 100644
--- a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/AuditPeriodTest.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia.test;
+package org.onap.policy.common.ia.test;
 
 
 import static org.junit.Assert.*;
@@ -43,11 +43,11 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.openecomp.policy.common.ia.AuditThread;
-import org.openecomp.policy.common.ia.IntegrityAudit;
-import org.openecomp.policy.common.ia.IntegrityAuditProperties;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.ia.AuditThread;
+import org.onap.policy.common.ia.IntegrityAudit;
+import org.onap.policy.common.ia.IntegrityAuditProperties;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /*
  * All JUnits are designed to run in the local development environment
diff --git a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbAuditCompareEntriesTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditCompareEntriesTest.java
index e2fd922d..8a811366 100644
--- a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbAuditCompareEntriesTest.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditCompareEntriesTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia.test;
+package org.onap.policy.common.ia.test;
 
 import static org.junit.Assert.*;
 
@@ -41,15 +41,15 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.openecomp.policy.common.ia.DbAudit;
-import org.openecomp.policy.common.ia.DbDAO;
-import org.openecomp.policy.common.ia.IntegrityAudit;
-import org.openecomp.policy.common.ia.IntegrityAuditProperties;
-import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
-import org.openecomp.policy.common.ia.test.jpa.IaTestEntity;
-import org.openecomp.policy.common.ia.test.jpa.PersonTest;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.ia.DbAudit;
+import org.onap.policy.common.ia.DbDAO;
+import org.onap.policy.common.ia.IntegrityAudit;
+import org.onap.policy.common.ia.IntegrityAuditProperties;
+import org.onap.policy.common.ia.jpa.IntegrityAuditEntity;
+import org.onap.policy.common.ia.test.jpa.IaTestEntity;
+import org.onap.policy.common.ia.test.jpa.PersonTest;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /*
  * All JUnits are designed to run in the local development environment
@@ -128,7 +128,7 @@ public class DbAuditCompareEntriesTest {
 		//There is only one entry IntegrityAuditEntity, but we will check anyway
 		HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
 		for(String c : classNameSet){
-			if (c.equals("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity")){
+			if (c.equals("org.onap.policy.common.ia.jpa.IntegrityAuditEntity")){
 				className = c;
 			}
 		}
@@ -343,7 +343,7 @@ public class DbAuditCompareEntriesTest {
 		HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
 		HashSet<Object> mismatchResult = new HashSet<Object>();
 		for(String c : classNameSet) {
-			if (c.equals("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity")){
+			if (c.equals("org.onap.policy.common.ia.jpa.IntegrityAuditEntity")){
 				String resourceName1 = resourceName;
 				String resourceName2 = resourceName;
 				
@@ -389,7 +389,7 @@ public class DbAuditCompareEntriesTest {
 				 */
 				assertTrue(mismatchResult.isEmpty());
 			}
-			else if (c.equals("org.openecomp.policy.common.ia.test.jpa.IaTestEntity")) {
+			else if (c.equals("org.onap.policy.common.ia.test.jpa.IaTestEntity")) {
 				IaTestEntity iate = new IaTestEntity();
 				IaTestEntity iate2 = new IaTestEntity();
 				IaTestEntity iate3 = new IaTestEntity();
@@ -571,7 +571,7 @@ public class DbAuditCompareEntriesTest {
 		//There is only one entry IntegrityAuditEntity, but we will check anyway
 		HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
 		for(String c : classNameSet){
-			if (c.equals("org.openecomp.policy.common.ia.test.jpa.IaTestEntity")){
+			if (c.equals("org.onap.policy.common.ia.test.jpa.IaTestEntity")){
 				className = c;
 			}
 		}
diff --git a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbAuditTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditTest.java
index 82ea8669..fd1172a8 100644
--- a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbAuditTest.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia.test;
+package org.onap.policy.common.ia.test;
 
 import static org.junit.Assert.*;
 
@@ -44,15 +44,15 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.openecomp.policy.common.ia.DbAudit;
-import org.openecomp.policy.common.ia.DbAuditException;
-import org.openecomp.policy.common.ia.DbDAO;
-import org.openecomp.policy.common.ia.DbDaoTransactionException;
-import org.openecomp.policy.common.ia.IntegrityAudit;
-import org.openecomp.policy.common.ia.IntegrityAuditProperties;
-import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.ia.DbAudit;
+import org.onap.policy.common.ia.DbAuditException;
+import org.onap.policy.common.ia.DbDAO;
+import org.onap.policy.common.ia.DbDaoTransactionException;
+import org.onap.policy.common.ia.IntegrityAudit;
+import org.onap.policy.common.ia.IntegrityAuditProperties;
+import org.onap.policy.common.ia.jpa.IntegrityAuditEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /*
  * All JUnits are designed to run in the local development environment
diff --git a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbDAOTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbDAOTest.java
index 3bd847c2..983e8911 100644
--- a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbDAOTest.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbDAOTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia.test;
+package org.onap.policy.common.ia.test;
 
 import static org.junit.Assert.*;
 
@@ -49,10 +49,10 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.openecomp.policy.common.ia.DbDAO;
-import org.openecomp.policy.common.ia.DbDaoTransactionException;
-import org.openecomp.policy.common.ia.IntegrityAuditProperties;
-import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
+import org.onap.policy.common.ia.DbDAO;
+import org.onap.policy.common.ia.DbDaoTransactionException;
+import org.onap.policy.common.ia.IntegrityAuditProperties;
+import org.onap.policy.common.ia.jpa.IntegrityAuditEntity;
 
 /*
  * All JUnits are designed to run in the local development environment
@@ -483,7 +483,7 @@ public class DbDAOTest {
 		
 		try {
 			// Obtain a hash with the persisted objects
-			HashMap<Object, Object> entries = d.getAllMyEntries("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity");
+			HashMap<Object, Object> entries = d.getAllMyEntries("org.onap.policy.common.ia.jpa.IntegrityAuditEntity");
 			
 			// Assert there were 3 entries for that class
 			assertEquals(3, entries.size());
@@ -527,7 +527,7 @@ public class DbDAOTest {
 			// Obtain all entity keys
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			CriteriaQuery<Object> cq = cb.createQuery();
-			Root<?> rootEntry = cq.from(Class.forName("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity"));
+			Root<?> rootEntry = cq.from(Class.forName("org.onap.policy.common.ia.jpa.IntegrityAuditEntity"));
 			CriteriaQuery<Object> all = cq.select(rootEntry);
 			TypedQuery<Object> allQuery = em.createQuery(all);
 			List<Object> objectList = allQuery.getResultList();
@@ -539,7 +539,7 @@ public class DbDAOTest {
 			}
 			
 			// Obtain a hash with the persisted objects
-			HashMap<Object, Object> entries = d.getAllMyEntries("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity", resultSet);
+			HashMap<Object, Object> entries = d.getAllMyEntries("org.onap.policy.common.ia.jpa.IntegrityAuditEntity", resultSet);
 			
 			// Assert there were 3 entries for that class
 			assertEquals(3, entries.size());
@@ -587,7 +587,7 @@ public class DbDAOTest {
 		
 		try {
 			// Obtain a hash with the persisted objects
-			HashMap<Object, Object> entries = d.getAllEntries("integrityAuditPU", properties, "org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity");
+			HashMap<Object, Object> entries = d.getAllEntries("integrityAuditPU", properties, "org.onap.policy.common.ia.jpa.IntegrityAuditEntity");
 			
 			// Assert there were 3 entries for that class
 			assertEquals(3, entries.size());
@@ -631,7 +631,7 @@ public class DbDAOTest {
 			// Obtain all entity keys
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			CriteriaQuery<Object> cq = cb.createQuery();
-			Root<?> rootEntry = cq.from(Class.forName("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity"));
+			Root<?> rootEntry = cq.from(Class.forName("org.onap.policy.common.ia.jpa.IntegrityAuditEntity"));
 			CriteriaQuery<Object> all = cq.select(rootEntry);
 			TypedQuery<Object> allQuery = em.createQuery(all);
 			List<Object> objectList = allQuery.getResultList();
@@ -643,7 +643,7 @@ public class DbDAOTest {
 			}
 			
 			// Obtain a hash with the persisted objects
-			HashMap<Object, Object> entries = d.getAllEntries("integrityAuditPU", properties, "org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity", resultSet);
+			HashMap<Object, Object> entries = d.getAllEntries("integrityAuditPU", properties, "org.onap.policy.common.ia.jpa.IntegrityAuditEntity", resultSet);
 			
 			// Assert there were 3 entries for that class
 			assertEquals(3, entries.size());
@@ -691,7 +691,7 @@ public class DbDAOTest {
 		
 		try {
 			// Obtain a hash with the persisted objects
-			HashMap<Object, Object> entries = d.getAllEntries(persistenceUnit, properties, "org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity");
+			HashMap<Object, Object> entries = d.getAllEntries(persistenceUnit, properties, "org.onap.policy.common.ia.jpa.IntegrityAuditEntity");
 			
 			// Assert there were 3 entries for that class
 			assertEquals(3, entries.size());
diff --git a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/IntegrityAuditDesignationTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/IntegrityAuditDesignationTest.java
index 69936bfe..f74b354b 100644
--- a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/IntegrityAuditDesignationTest.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/IntegrityAuditDesignationTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia.test;
+package org.onap.policy.common.ia.test;
 
 import static org.junit.Assert.*;
 
@@ -44,12 +44,12 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.openecomp.policy.common.ia.AuditThread;
-import org.openecomp.policy.common.ia.DbDAO;
-import org.openecomp.policy.common.ia.IntegrityAudit;
-import org.openecomp.policy.common.ia.IntegrityAuditProperties;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.ia.AuditThread;
+import org.onap.policy.common.ia.DbDAO;
+import org.onap.policy.common.ia.IntegrityAudit;
+import org.onap.policy.common.ia.IntegrityAuditProperties;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /*
  * All JUnits are designed to run in the local development environment
@@ -180,7 +180,7 @@ public class IntegrityAuditDesignationTest {
 		fstream.close();
 		
 		/*
-		 * Test fix for ECOMPD2TD-783: Audit fails to run when application is restarted.
+		 * Test fix for ONAPD2TD-783: Audit fails to run when application is restarted.
 		 */
 		integrityAudit.startAuditThread();
 		
diff --git a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/jpa/IaTestEntity.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/jpa/IaTestEntity.java
index 21b09460..53289e50 100644
--- a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/jpa/IaTestEntity.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/jpa/IaTestEntity.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia.test.jpa;
+package org.onap.policy.common.ia.test.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/jpa/PersonTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/jpa/PersonTest.java
index 7ec5e294..0ca986bc 100644
--- a/integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/jpa/PersonTest.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/jpa/PersonTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.common.ia.test.jpa;
+package org.onap.policy.common.ia.test.jpa;
 
 import java.io.Serializable;
 
diff --git a/integrity-audit/src/test/resources/logback.xml b/integrity-audit/src/test/resources/logback.xml
index 78de63a3..9086aa9d 100644
--- a/integrity-audit/src/test/resources/logback.xml
+++ b/integrity-audit/src/test/resources/logback.xml
@@ -29,7 +29,7 @@
   <property name="debugDir" value="testingLogs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="common-modules"></property>
   <property name="subComponentName" value="integrity-audit"></property>