summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-07-28 08:21:14 +0000
committerPamela Dragosh <pdragosh@research.att.com>2017-07-31 08:31:07 -0400
commitf8a620d1ff2b0d33b08a22279058f3e0253bdde1 (patch)
tree9092df7a6c57a46d36988245f60db0c29a7b1404
parente7bd0934d383c811b0b7302c42991aa1d61941c4 (diff)
[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>
-rw-r--r--README.md2
-rw-r--r--common-logging/config/policyLogger.properties2
-rw-r--r--common-logging/policyLogger.properties2
-rw-r--r--common-logging/pom.xml14
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/ONAPLoggingContext.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/ECOMPLoggingContext.java)30
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/ONAPLoggingUtils.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/ECOMPLoggingUtils.java)14
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/Configuration.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/Configuration.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfo.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/DroolsPDPMDCInfo.java)22
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/ErrorCodeMap.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/ErrorCodeMap.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventData.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventData.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfo.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventTrackInfo.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventTrackInfoHandler.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/MDCInfo.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/MDCInfo.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/MessageCodes.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/MessageCodes.java)6
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/PolicyLogger.java)10
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/EelfLogger.java)10
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/FlexLogger.java)8
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTester.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/FlexLoggerTester.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/Logger.java)6
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/Logger4J.java)10
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/LoggerType.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/LoggerType.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/PropertyUtil.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/PropertyUtil.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/SystemOutLogger.java)8
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/nsa/LoggingContext.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/LoggingContext.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/nsa/LoggingContextFactory.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/LoggingContextFactory.java)8
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/nsa/SharedLoggingContext.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/SharedLoggingContext.java)4
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/nsa/impl/SharedContext.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/impl/SharedContext.java)8
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/nsa/impl/Slf4jLoggingContext.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/impl/Slf4jLoggingContext.java)6
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/nsa/package-info.java (renamed from common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/package-info.java)4
-rw-r--r--common-logging/src/main/resources/org/onap/policy/common/logging/eelf/Resources.properties (renamed from common-logging/src/main/resources/org/openecomp/policy/common/logging/eelf/Resources.properties)2
-rw-r--r--integrity-audit/pom.xml8
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/AuditThread.java)10
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/DbAudit.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbAudit.java)10
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/DbAuditException.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbAuditException.java)2
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/DbDAO.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbDAO.java)8
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/DbDaoTransactionException.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbDaoTransactionException.java)2
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAudit.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAudit.java)8
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAuditProperties.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAuditProperties.java)2
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAuditPropertiesException.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/IntegrityAuditPropertiesException.java)2
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/jpa/IntegrityAuditEntity.java (renamed from integrity-audit/src/main/java/org/openecomp/policy/common/ia/jpa/IntegrityAuditEntity.java)2
-rw-r--r--integrity-audit/src/main/resources/META-INF/persistence.xml6
-rw-r--r--integrity-audit/src/main/resources/logback.xml2
-rw-r--r--integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java (renamed from integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/AuditPeriodTest.java)12
-rw-r--r--integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditCompareEntriesTest.java (renamed from integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbAuditCompareEntriesTest.java)28
-rw-r--r--integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditTest.java (renamed from integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbAuditTest.java)20
-rw-r--r--integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbDAOTest.java (renamed from integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbDAOTest.java)24
-rw-r--r--integrity-audit/src/test/java/org/onap/policy/common/ia/test/IntegrityAuditDesignationTest.java (renamed from integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/IntegrityAuditDesignationTest.java)16
-rw-r--r--integrity-audit/src/test/java/org/onap/policy/common/ia/test/jpa/IaTestEntity.java (renamed from integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/jpa/IaTestEntity.java)2
-rw-r--r--integrity-audit/src/test/java/org/onap/policy/common/ia/test/jpa/PersonTest.java (renamed from integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/jpa/PersonTest.java)2
-rw-r--r--integrity-audit/src/test/resources/logback.xml2
-rw-r--r--integrity-monitor/pom.xml8
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/AdministrativeStateException.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/AdministrativeStateException.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/ForwardProgressException.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/ForwardProgressException.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitor.java)18
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitorProperties.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitorProperties.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitorPropertiesException.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitorPropertiesException.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/StandbyStatusException.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/StandbyStatusException.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateChangeNotifier.java)6
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/StateElement.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateElement.java)6
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateManagement.java)12
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateTransition.java)10
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/ComponentAdmin.java)10
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdminMBean.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/ComponentAdminMBean.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/JmxAgentConnection.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/JmxAgentConnection.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ForwardProgressEntity.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ImTestEntity.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ResourceRegistrationEntity.java)2
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/StateManagementEntity.java (renamed from integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/StateManagementEntity.java)2
-rw-r--r--integrity-monitor/src/main/resources/META-INF/persistence.xml16
-rw-r--r--integrity-monitor/src/main/resources/logback.xml2
-rw-r--r--integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java (renamed from integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/IntegrityMonitorTest.java)18
-rw-r--r--integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java (renamed from integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateManagementEntityTest.java)10
-rw-r--r--integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java (renamed from integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateManagementTest.java)12
-rw-r--r--integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java (renamed from integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateTransitionTest.java)10
-rw-r--r--integrity-monitor/src/test/resources/logback.xml2
-rw-r--r--pom.xml28
-rw-r--r--project-configs/maven/conf/settings.xml2
-rw-r--r--site-manager/pom.xml6
-rw-r--r--site-manager/src/main/files/siteManager2
-rw-r--r--site-manager/src/main/java/org/onap/policy/common/sitemanager/Main.java (renamed from site-manager/src/main/java/org/openecomp/policy/common/sitemanager/Main.java)10
80 files changed, 298 insertions, 296 deletions
diff --git a/README.md b/README.md
index d356e246..75d4b4e1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-This source repository contains OpenECOMP common code, which is shared by 'policy-drools-pdp' and 'policy-engine'. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
+This source repository contains ONAP common code, which is shared by 'policy-drools-pdp' and 'policy-engine'. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
To build it using Maven 3, run: mvn clean install
diff --git a/common-logging/config/policyLogger.properties b/common-logging/config/policyLogger.properties
index 6aaa6a91..1feed375 100644
--- a/common-logging/config/policyLogger.properties
+++ b/common-logging/config/policyLogger.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP-Logging
+# ONAP-Logging
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/common-logging/policyLogger.properties b/common-logging/policyLogger.properties
index 7f160b6d..e2335df6 100644
--- a/common-logging/policyLogger.properties
+++ b/common-logging/policyLogger.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP-Logging
+# ONAP-Logging
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index 73810465..3352d4f6 100644
--- a/common-logging/pom.xml
+++ b/common-logging/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.
================================================================================
@@ -23,13 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.policy.common</groupId>
+ <groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>ECOMP-Logging</artifactId>
- <description>ECOMP Logging Framework</description>
+ <artifactId>ONAP-Logging</artifactId>
+ <description>ONAP Logging Framework</description>
<packaging>jar</packaging>
<dependencies>
@@ -75,8 +75,8 @@
<!-- We need to include the dependency of the project so that its include
in classpath when running plugin -->
<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>
@@ -85,7 +85,7 @@
<outputFile>messages.html</outputFile>
<resources>
<resource>
- <messageClass>org.openecomp.policy.common.logging.eelf.MessageCodes</messageClass>
+ <messageClass>org.onap.policy.common.logging.eelf.MessageCodes</messageClass>
This needs to be replaced with your Enum class name .which
implements EELFResolvableErrorEnum and have your defined error
codes.
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/ECOMPLoggingContext.java b/common-logging/src/main/java/org/onap/policy/common/logging/ONAPLoggingContext.java
index 606e872d..bbaf2e0e 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/ECOMPLoggingContext.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/ONAPLoggingContext.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging;
+package org.onap.policy.common.logging;
-//import static org.openecomp.policy.common.logging.eelf.Configuration.TRANSACTION_BEGIN_TIME_STAMP;
-//import static org.openecomp.policy.common.logging.eelf.Configuration.TRANSACTION_ELAPSED_TIME;
-//import static org.openecomp.policy.common.logging.eelf.Configuration.TRANSACTION_END_TIME_STAMP;
+//import static org.onap.policy.common.logging.eelf.Configuration.TRANSACTION_BEGIN_TIME_STAMP;
+//import static org.onap.policy.common.logging.eelf.Configuration.TRANSACTION_ELAPSED_TIME;
+//import static org.onap.policy.common.logging.eelf.Configuration.TRANSACTION_END_TIME_STAMP;
import java.text.SimpleDateFormat;
import java.time.Duration;
@@ -30,11 +30,11 @@ import java.time.Instant;
import java.util.Date;
import org.slf4j.MDC;
-import org.openecomp.policy.common.logging.nsa.LoggingContextFactory;
-import org.openecomp.policy.common.logging.nsa.SharedLoggingContext;
+import org.onap.policy.common.logging.nsa.LoggingContextFactory;
+import org.onap.policy.common.logging.nsa.SharedLoggingContext;
/**
- * A facade over the org.openecomp.policy.common.logging.nsa.SharedLoggingContext interface/implementation that makes it
+ * A facade over the org.onap.policy.common.logging.nsa.SharedLoggingContext interface/implementation that makes it
* more convenient to use. SharedLoggingContext builds on the SLF4J/log4j Mapped Diagnostic Context (MDC)
* feature, which provides a hashmap-based context for data items that need to be logged, where the
* hashmap is kept in ThreadLocal storage. The data items can be referenced in the log4j configuration
@@ -47,20 +47,20 @@ import org.openecomp.policy.common.logging.nsa.SharedLoggingContext;
*
* The notable functionality the SharedLoggingContext adds over MDC is that it maintains its own copy
* of the MDC data items in a hashmap (not in ThreadLocal storage), which allows more control of the data.
- * The ECOMPLoggingContext constructor that takes another ECOMPLoggingContext object as a parameter makes
+ * The ONAPLoggingContext constructor that takes another ONAPLoggingContext object as a parameter makes
* use of this feature. For example if there is a thread pulling requests from a queue for processing, it
* can keep a base logging context with data that is common to all requests, and for each request, create a
* new logging context with that base context as a parameter; this will create a new logging context with
* those initial values and none of the request-specific values from the previous request such as a request ID.
* The setter methods in this class set corresponding items in the SharedLoggingContext/MDC hashmaps.
- * These items correspond to the fields defined in the "ECOMP platform application logging guidelines"
+ * These items correspond to the fields defined in the "ONAP platform application logging guidelines"
* document. In addition, there is a pair of convenience functions, transactionStarted() and
* transactionEnded(), that can be called at the beginning and end of transaction processing to calculate
* the duration of the transaction and record that value in the "timer" item.
*
*/
-public class ECOMPLoggingContext {
+public class ONAPLoggingContext {
private static final String REQUEST_ID = "requestId";
private static final String SERVICE_INSTANCE_ID = "serviceInstanceId";
@@ -93,14 +93,14 @@ public class ECOMPLoggingContext {
private Instant metricStartTime;
/**
- * Create a new ECOMPLoggingContext with no base context.
+ * Create a new ONAPLoggingContext with no base context.
*/
- public ECOMPLoggingContext() {
+ public ONAPLoggingContext() {
context = (SharedLoggingContext) loggingContextBuilder.forSharing().build();
}
/**
- * Create a new ECOMPLoggingContext initially populated with the values
+ * Create a new ONAPLoggingContext initially populated with the values
* in the given base context. This can be used for example in a servlet
* where each incoming request may be processed by a separate thread, but
* there may be some logging data items that will be unchanging and common
@@ -109,7 +109,7 @@ public class ECOMPLoggingContext {
* base context to populate the common data in the new one.
* @param baseContext
*/
- public ECOMPLoggingContext(ECOMPLoggingContext baseContext) {
+ public ONAPLoggingContext(ONAPLoggingContext baseContext) {
context = (SharedLoggingContext) loggingContextBuilder.forSharing().build();
// a logging context could be passed into a thread (e.g. one that is servicing a queue)
// that already had a logging context established, so the MDC hashmap could contain
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/ECOMPLoggingUtils.java b/common-logging/src/main/java/org/onap/policy/common/logging/ONAPLoggingUtils.java
index 5e6aa909..b4d4d8d2 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/ECOMPLoggingUtils.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/ONAPLoggingUtils.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,16 +18,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging;
+package org.onap.policy.common.logging;
import javax.servlet.http.HttpServletRequest;
-public class ECOMPLoggingUtils {
+public class ONAPLoggingUtils {
- public static ECOMPLoggingContext getLoggingContextForRequest(HttpServletRequest request,
- ECOMPLoggingContext baseContext)
+ public static ONAPLoggingContext getLoggingContextForRequest(HttpServletRequest request,
+ ONAPLoggingContext baseContext)
{
- ECOMPLoggingContext requestContext = new ECOMPLoggingContext(baseContext);
+ ONAPLoggingContext requestContext = new ONAPLoggingContext(baseContext);
if (request.getLocalAddr() != null) { // may be null in junit tests
requestContext.setServerIPAddress(request.getLocalAddr());
}
@@ -41,6 +41,8 @@ public class ECOMPLoggingUtils {
requestContext.setClientIPAddress(request.getRemoteAddr());
}
// RequestID
+ // This needs to be renamed to ONAP when the other components in ONAP
+ // rename to this.
String requestId = request.getHeader("X-ECOMP-RequestID");
if (requestId != null && requestId.trim().length() > 0) {
requestContext.setRequestID(requestId);
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/Configuration.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/Configuration.java
index a839ea16..4cbe63af 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/Configuration.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/Configuration.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
public interface Configuration extends com.att.eelf.configuration.Configuration{
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/DroolsPDPMDCInfo.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfo.java
index ad502475..01fc0ddd 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/DroolsPDPMDCInfo.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfo.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
import java.util.concurrent.ConcurrentHashMap;
@@ -28,15 +28,15 @@ public class DroolsPDPMDCInfo implements MDCInfo{
static {
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.MDC_REMOTE_HOST, "");
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.MDC_SERVICE_NAME, "Policy.droolsPdp");
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.MDC_SERVICE_INSTANCE_ID, "Policy.droolsPdp.event");
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.MDC_INSTANCE_UUID, "");
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.MDC_ALERT_SEVERITY, "");
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.PARTNER_NAME, "N/A");
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.STATUS_CODE, "N/A");
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.RESPONSE_CODE, "N/A");
- mdcMap.put(org.openecomp.policy.common.logging.eelf.Configuration.RESPONSE_DESCRIPTION, "N/A");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.MDC_REMOTE_HOST, "");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.MDC_SERVICE_NAME, "Policy.droolsPdp");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.MDC_SERVICE_INSTANCE_ID, "Policy.droolsPdp.event");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.MDC_INSTANCE_UUID, "");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.MDC_ALERT_SEVERITY, "");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.PARTNER_NAME, "N/A");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.STATUS_CODE, "N/A");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.RESPONSE_CODE, "N/A");
+ mdcMap.put(org.onap.policy.common.logging.eelf.Configuration.RESPONSE_DESCRIPTION, "N/A");
}
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/ErrorCodeMap.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/ErrorCodeMap.java
index abd972e1..cbb8c7a3 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/ErrorCodeMap.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/ErrorCodeMap.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
import java.util.HashMap;
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventData.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventData.java
index d26a4977..2aaa1146 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventData.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventData.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
import java.time.Instant;
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventTrackInfo.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfo.java
index f1b7afb5..7e4d45d8 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventTrackInfo.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfo.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventTrackInfoHandler.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java
index e45f8998..d0a7cc16 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventTrackInfoHandler.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
import java.time.Duration;
import java.time.Instant;
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/MDCInfo.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MDCInfo.java
index 6b5e395f..fc44dcff 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/MDCInfo.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MDCInfo.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/MessageCodes.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MessageCodes.java
index 6f1437eb..a9920aec 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/MessageCodes.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MessageCodes.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
import com.att.eelf.i18n.EELFResolvableErrorEnum;
import com.att.eelf.i18n.EELFResourceManager;
@@ -152,7 +152,7 @@ public enum MessageCodes implements EELFResolvableErrorEnum {
* Here this application loads messages from three bundles
*/
static {
- EELFResourceManager.loadMessageBundle("org/openecomp/policy/common/logging/eelf/Resources");
+ EELFResourceManager.loadMessageBundle("org.onap.policy/common/logging/eelf/Resources");
String id = EELFResourceManager.getIdentifier(RULE_AUDIT_EXEC_INFO);
String value = EELFResourceManager.getMessage(RULE_AUDIT_EXEC_INFO);
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/PolicyLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java
index 8cc73743..d0cc9c1e 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/PolicyLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,14 +18,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.eelf;
+package org.onap.policy.common.logging.eelf;
import org.slf4j.MDC;
-import static org.openecomp.policy.common.logging.eelf.Configuration.*;
+import static org.onap.policy.common.logging.eelf.Configuration.*;
-import org.openecomp.policy.common.logging.flexlogger.LoggerType;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.LoggerType;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFLogger.Level;
import com.att.eelf.configuration.EELFManager;
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/EelfLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java
index 106c734c..fbc0ae1d 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/EelfLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,14 +18,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.flexlogger;
+package org.onap.policy.common.logging.flexlogger;
import java.io.Serializable;
import java.util.UUID;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
import com.att.eelf.configuration.EELFLogger.Level;
/**
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/FlexLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java
index 3db40f1e..797f857b 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/FlexLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLogger.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.flexlogger;
+package org.onap.policy.common.logging.flexlogger;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -28,8 +28,8 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.PropertyUtil.Listener;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.PropertyUtil.Listener;
/**
*
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/FlexLoggerTester.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTester.java
index 3e0d558a..eddece12 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/FlexLoggerTester.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTester.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.flexlogger;
+package org.onap.policy.common.logging.flexlogger;
import java.util.UUID;
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/Logger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger.java
index 8cfee16c..d3113d31 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/Logger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.flexlogger;
+package org.onap.policy.common.logging.flexlogger;
import java.util.UUID;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.MessageCodes;
/**
*
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/Logger4J.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java
index 506e1ea7..2e67a735 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/Logger4J.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.flexlogger;
+package org.onap.policy.common.logging.flexlogger;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -29,8 +29,8 @@ import java.util.UUID;
import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
import com.att.eelf.configuration.EELFLogger.Level;
/**
@@ -38,7 +38,7 @@ import com.att.eelf.configuration.EELFLogger.Level;
* Logger4J implements all the methods of interface Logger by calling org.apache.log4j.Logger
*
*/
-public class Logger4J implements org.openecomp.policy.common.logging.flexlogger.Logger, Serializable {
+public class Logger4J implements org.onap.policy.common.logging.flexlogger.Logger, Serializable {
/**
*
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/LoggerType.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/LoggerType.java
index 8fe55b29..ed2029e6 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/LoggerType.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/LoggerType.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.flexlogger;
+package org.onap.policy.common.logging.flexlogger;
/**
*
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/PropertyUtil.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/PropertyUtil.java
index 462e10cb..598dd09b 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/PropertyUtil.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/PropertyUtil.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.flexlogger;
+package org.onap.policy.common.logging.flexlogger;
import java.io.File;
import java.io.FileInputStream;
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/SystemOutLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java
index 596914a2..f1acc042 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/SystemOutLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,13 +18,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.flexlogger;
+package org.onap.policy.common.logging.flexlogger;
import java.io.Serializable;
import java.util.UUID;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
import com.att.eelf.configuration.EELFLogger.Level;
/**
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/LoggingContext.java b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/LoggingContext.java
index 56f6686a..0786febd 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/LoggingContext.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/LoggingContext.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.nsa;
+package org.onap.policy.common.logging.nsa;
/**
* An interface for providing data into the underlying logging context. Systems should use
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/LoggingContextFactory.java b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/LoggingContextFactory.java
index b8fce10c..78fffefe 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/LoggingContextFactory.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/LoggingContextFactory.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.nsa;
+package org.onap.policy.common.logging.nsa;
-import org.openecomp.policy.common.logging.nsa.impl.SharedContext;
-import org.openecomp.policy.common.logging.nsa.impl.Slf4jLoggingContext;
+import org.onap.policy.common.logging.nsa.impl.SharedContext;
+import org.onap.policy.common.logging.nsa.impl.Slf4jLoggingContext;
/**
* A factory for setting up a LoggingContext
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/SharedLoggingContext.java b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/SharedLoggingContext.java
index 2ecbcb0a..af0cc393 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/SharedLoggingContext.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/SharedLoggingContext.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.nsa;
+package org.onap.policy.common.logging.nsa;
/**
* A logging context must be thread-specific. Contexts that implement SharedLoggingContext
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/impl/SharedContext.java b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/impl/SharedContext.java
index 96ffbf64..715edfab 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/impl/SharedContext.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/impl/SharedContext.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,13 +18,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.nsa.impl;
+package org.onap.policy.common.logging.nsa.impl;
import java.util.HashMap;
import java.util.Map.Entry;
-import org.openecomp.policy.common.logging.nsa.LoggingContext;
-import org.openecomp.policy.common.logging.nsa.SharedLoggingContext;
+import org.onap.policy.common.logging.nsa.LoggingContext;
+import org.onap.policy.common.logging.nsa.SharedLoggingContext;
/**
* A shared logging context for SLF4J
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/impl/Slf4jLoggingContext.java b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/impl/Slf4jLoggingContext.java
index de31af98..187b2954 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/impl/Slf4jLoggingContext.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/impl/Slf4jLoggingContext.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.logging.nsa.impl;
+package org.onap.policy.common.logging.nsa.impl;
import org.slf4j.MDC;
-import org.openecomp.policy.common.logging.nsa.LoggingContext;
+import org.onap.policy.common.logging.nsa.LoggingContext;
/**
* A logging context for SLF4J
diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/package-info.java b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/package-info.java
index e1ef710b..6f58bb0f 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/nsa/package-info.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/nsa/package-info.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * ECOMP-Logging
+ * ONAP-Logging
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@ -23,5 +23,5 @@
* implementation based on the SLF4J/Log4j "MDC" (Mapped Diagnostic Context) feature.
*
*/
-package org.openecomp.policy.common.logging.nsa;
+package org.onap.policy.common.logging.nsa;
diff --git a/common-logging/src/main/resources/org/openecomp/policy/common/logging/eelf/Resources.properties b/common-logging/src/main/resources/org/onap/policy/common/logging/eelf/Resources.properties
index c79061b4..b41dbb26 100644
--- a/common-logging/src/main/resources/org/openecomp/policy/common/logging/eelf/Resources.properties
+++ b/common-logging/src/main/resources/org/onap/policy/common/logging/eelf/Resources.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP-Logging
+# ONAP-Logging
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
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>
diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml
index af87572f..4a31a522 100644
--- a/integrity-monitor/pom.xml
+++ b/integrity-monitor/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>
@@ -69,8 +69,8 @@
<version>[1.4.186,)</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-monitor/src/main/java/org/openecomp/policy/common/im/AdministrativeStateException.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/AdministrativeStateException.java
index 1115c177..048124ba 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/AdministrativeStateException.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/AdministrativeStateException.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
public class AdministrativeStateException extends Exception{
private static final long serialVersionUID = 1L;
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/ForwardProgressException.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/ForwardProgressException.java
index 982f71aa..6f54cc9a 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/ForwardProgressException.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/ForwardProgressException.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
public class ForwardProgressException extends Exception{
private static final long serialVersionUID = 1L;
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitor.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java
index 4e573d8c..06e9b3de 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitor.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
import java.net.InetAddress;
import java.util.ArrayList;
@@ -38,15 +38,15 @@ import javax.persistence.LockModeType;
import javax.persistence.Persistence;
import javax.persistence.Query;
-import org.openecomp.policy.common.im.jpa.ForwardProgressEntity;
-import org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity;
-import org.openecomp.policy.common.im.jpa.StateManagementEntity;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.im.jpa.ForwardProgressEntity;
+import org.onap.policy.common.im.jpa.ResourceRegistrationEntity;
+import org.onap.policy.common.im.jpa.StateManagementEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
//import org.apache.log4j.Logger;
-import org.openecomp.policy.common.im.jmx.ComponentAdmin;
-import org.openecomp.policy.common.im.jmx.ComponentAdminMBean;
-import org.openecomp.policy.common.im.jmx.JmxAgentConnection;
+import org.onap.policy.common.im.jmx.ComponentAdmin;
+import org.onap.policy.common.im.jmx.ComponentAdminMBean;
+import org.onap.policy.common.im.jmx.JmxAgentConnection;
/**
* IntegrityMonitor
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitorProperties.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitorProperties.java
index 1a901ba6..a6a7da1f 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitorProperties.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitorProperties.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
public class IntegrityMonitorProperties {
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitorPropertiesException.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitorPropertiesException.java
index 07737e14..1d56e28a 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitorPropertiesException.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitorPropertiesException.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
public class IntegrityMonitorPropertiesException extends Exception{
private static final long serialVersionUID = 1L;
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StandbyStatusException.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StandbyStatusException.java
index 1de08b0e..787030d4 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StandbyStatusException.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StandbyStatusException.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
public class StandbyStatusException extends Exception {
/**
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateChangeNotifier.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java
index 8906bb77..ee148159 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateChangeNotifier.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
import java.util.Observable;
import java.util.Observer;
@@ -36,8 +36,8 @@ import java.util.Observer;
*/
//import org.apache.log4j.Logger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
/**
*
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateElement.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateElement.java
index ad60b46d..58cdde1e 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateElement.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateElement.java
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
//import org.apache.log4j.Logger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
public class StateElement {
private static final Logger logger = FlexLogger.getLogger(StateElement.class);
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateManagement.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java
index d86cfcfb..4ed5d35a 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateManagement.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
import java.util.*;
@@ -31,11 +31,11 @@ import javax.persistence.Query;
//import org.apache.log4j.Logger;
-import org.openecomp.policy.common.im.jpa.StateManagementEntity;
-import org.openecomp.policy.common.im.StateElement;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.im.jpa.StateManagementEntity;
+import org.onap.policy.common.im.StateElement;
+import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
/**
*
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateTransition.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java
index c3805340..746e0cef 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateTransition.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java
@@ -18,16 +18,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im;
+package org.onap.policy.common.im;
import java.util.*;
//import org.apache.log4j.Logger;
-import org.openecomp.policy.common.im.StateElement;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.im.StateElement;
+import org.onap.policy.common.im.StateManagement;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
/**
* The StateTransition class coordinates all state transitions.
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/ComponentAdmin.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java
index 4d8399a1..551e1b09 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/ComponentAdmin.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.jmx;
+package org.onap.policy.common.im.jmx;
import java.util.ArrayList;
import java.util.Iterator;
@@ -34,8 +34,8 @@ import javax.management.ObjectName;
import org.apache.log4j.Logger;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.StateManagement;
+import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.StateManagement;
/**
* Base class for component MBeans.
@@ -62,7 +62,7 @@ public class ComponentAdmin implements ComponentAdminMBean {
throw new NullPointerException("null input");
}
- this.name = "ECOMP_POLICY_COMP:name=" + name;
+ this.name = "ONAP_POLICY_COMP:name=" + name;
this.integrityMonitor = integrityMonitor;
this.stateManager = stateManager;
@@ -183,7 +183,7 @@ public class ComponentAdmin implements ComponentAdminMBean {
*/
public static ObjectName getObjectName(String componentName)
throws MalformedObjectNameException {
- return new ObjectName("ECOMP_POLICY_COMP:name=" + componentName);
+ return new ObjectName("ONAP_POLICY_COMP:name=" + componentName);
}
@Override
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/ComponentAdminMBean.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdminMBean.java
index 5cf24b6b..d61add59 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/ComponentAdminMBean.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdminMBean.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.jmx;
+package org.onap.policy.common.im.jmx;
/**
* Provides operations to test health, lock and unlock components.
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/JmxAgentConnection.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/JmxAgentConnection.java
index bc28c485..7a7e9a80 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/JmxAgentConnection.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/JmxAgentConnection.java
@@ -21,7 +21,7 @@
/**
*
*/
-package org.openecomp.policy.common.im.jmx;
+package org.onap.policy.common.im.jmx;
import java.io.IOException;
import java.util.HashMap;
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ForwardProgressEntity.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java
index 99a0d0ad..1dc71a65 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ForwardProgressEntity.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ForwardProgressEntity.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.jpa;
+package org.onap.policy.common.im.jpa;
import java.io.Serializable;
import java.util.Date;
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ImTestEntity.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java
index c7ae0abc..be4470e7 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ImTestEntity.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ImTestEntity.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.jpa;
+package org.onap.policy.common.im.jpa;
import java.io.Serializable;
import java.util.Date;
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ResourceRegistrationEntity.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java
index 29443088..c4d4aa68 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ResourceRegistrationEntity.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/ResourceRegistrationEntity.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.jpa;
+package org.onap.policy.common.im.jpa;
import java.io.Serializable;
import java.util.Date;
diff --git a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/StateManagementEntity.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/StateManagementEntity.java
index 737daec3..2dd18853 100644
--- a/integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/StateManagementEntity.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jpa/StateManagementEntity.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.jpa;
+package org.onap.policy.common.im.jpa;
import java.io.Serializable;
import java.util.Date;
diff --git a/integrity-monitor/src/main/resources/META-INF/persistence.xml b/integrity-monitor/src/main/resources/META-INF/persistence.xml
index 94360109..7fbec098 100644
--- a/integrity-monitor/src/main/resources/META-INF/persistence.xml
+++ b/integrity-monitor/src/main/resources/META-INF/persistence.xml
@@ -23,10 +23,10 @@
<persistence-unit name="schemaPU" transaction-type="RESOURCE_LOCAL">
<!-- Limited use for generating the DB and schema files for imtest DB - uses eclipselink -->
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.openecomp.policy.common.im.jpa.ImTestEntity</class>
- <class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
- <class>org.openecomp.policy.common.im.jpa.ForwardProgressEntity</class>
- <class>org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity</class>
+ <class>org.onap.policy.common.im.jpa.ImTestEntity</class>
+ <class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
+ <class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
+ <class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
@@ -39,10 +39,10 @@
<persistence-unit name="operationalPU" transaction-type="RESOURCE_LOCAL">
<!-- For operational use -->
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.openecomp.policy.common.im.jpa.ImTestEntity</class>
- <class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
- <class>org.openecomp.policy.common.im.jpa.ForwardProgressEntity</class>
- <class>org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity</class>
+ <class>org.onap.policy.common.im.jpa.ImTestEntity</class>
+ <class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
+ <class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
+ <class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<!-- none -->
diff --git a/integrity-monitor/src/main/resources/logback.xml b/integrity-monitor/src/main/resources/logback.xml
index 1c888097..2fa92a09 100644
--- a/integrity-monitor/src/main/resources/logback.xml
+++ b/integrity-monitor/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-monitor"></property>
diff --git a/integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/IntegrityMonitorTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java
index 8e8720da..afa2ca94 100644
--- a/integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/IntegrityMonitorTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.test;
+package org.onap.policy.common.im.test;
import static org.junit.Assert.*;
@@ -45,14 +45,14 @@ import org.junit.Test;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.IntegrityMonitorProperties;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.im.jpa.ForwardProgressEntity;
-import org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity;
-import org.openecomp.policy.common.im.jpa.StateManagementEntity;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.IntegrityMonitorProperties;
+import org.onap.policy.common.im.StateManagement;
+import org.onap.policy.common.im.jpa.ForwardProgressEntity;
+import org.onap.policy.common.im.jpa.ResourceRegistrationEntity;
+import org.onap.policy.common.im.jpa.StateManagementEntity;
+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-monitor/src/test/java/org/openecomp/policy/common/im/test/StateManagementEntityTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java
index 6116ef07..ec5efc02 100644
--- a/integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateManagementEntityTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.test;
+package org.onap.policy.common.im.test;
import java.util.List;
import java.util.Properties;
@@ -38,10 +38,10 @@ import org.junit.Test;
//import org.apache.commons.logging.Log;
//import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.im.jpa.StateManagementEntity;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.im.StateManagement;
+import org.onap.policy.common.im.jpa.StateManagementEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
public class StateManagementEntityTest {
private static Logger logger = FlexLogger.getLogger(StateManagementEntityTest.class);
diff --git a/integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateManagementTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java
index 92fc225c..98ee0645 100644
--- a/integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateManagementTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.test;
+package org.onap.policy.common.im.test;
import java.util.Properties;
import javax.persistence.EntityManagerFactory;
@@ -29,11 +29,11 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.im.StateChangeNotifier;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.im.StateManagement;
+import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.im.StateChangeNotifier;
+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-monitor/src/test/java/org/openecomp/policy/common/im/test/StateTransitionTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java
index d90e27bc..80e393ee 100644
--- a/integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateTransitionTest.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.im.test;
+package org.onap.policy.common.im.test;
import java.util.Properties;
import javax.persistence.EntityManagerFactory;
@@ -31,10 +31,10 @@ import org.junit.Test;
//import org.apache.commons.logging.Log;
//import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.im.StateTransition;
-import org.openecomp.policy.common.im.StateElement;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.im.StateTransition;
+import org.onap.policy.common.im.StateElement;
+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
* where they have write privileges and can execute time-sensitive
diff --git a/integrity-monitor/src/test/resources/logback.xml b/integrity-monitor/src/test/resources/logback.xml
index 3a879008..544162f3 100644
--- a/integrity-monitor/src/test/resources/logback.xml
+++ b/integrity-monitor/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-monitor"></property>
diff --git a/pom.xml b/pom.xml
index 289fdd5c..d16039df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- ECOMP Policy Engine - Drools PDP
+ ONAP Policy Engine - Drools PDP
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.policy.common</groupId>
+ <groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
<version>1.1.0-SNAPSHOT</version>
@@ -52,35 +52,35 @@
<repositories>
<repository>
- <id>ecomp-snapshots</id>
- <name>OpenECOMP Snapshots Repository</name>
+ <id>onap-snapshots</id>
+ <name>ONAP Snapshots Repository</name>
<url>${nexusproxy}/${snapshots.path}</url>
</repository>
<repository>
- <id>ecomp-releases</id>
- <name>OpenECOMP Release Repository</name>
+ <id>onap-releases</id>
+ <name>ONAP Release Repository</name>
<url>${nexusproxy}/${releases.path}</url>
</repository>
<repository>
- <id>ecomp-staging</id>
- <name>OpenECOMP Staging Repository</name>
+ <id>onap-staging</id>
+ <name>ONAP Staging Repository</name>
<url>${nexusproxy}/${staging.path}</url>
</repository>
</repositories>
<distributionManagement>
<repository>
- <id>ecomp-releases</id>
- <name>OpenECOMP Release Repository</name>
+ <id>onap-releases</id>
+ <name>ONAP Release Repository</name>
<url>${nexusproxy}/${releases.path}</url>
</repository>
<snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>OpenECOMP Snapshot Repository</name>
+ <id>onap-snapshots</id>
+ <name>ONAP Snapshot Repository</name>
<url>${nexusproxy}/${snapshots.path}</url>
</snapshotRepository>
<site>
- <id>ecomp-site</id>
+ <id>onap-site</id>
<url>dav:${nexusproxy}${sitePath}</url>
</site>
</distributionManagement>
@@ -95,7 +95,7 @@
<configuration>
<nexusUrl>${nexusproxy}</nexusUrl>
<stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
+ <serverId>onap-staging</serverId>
</configuration>
</plugin>
<plugin>
diff --git a/project-configs/maven/conf/settings.xml b/project-configs/maven/conf/settings.xml
index 87c27441..a1afa635 100644
--- a/project-configs/maven/conf/settings.xml
+++ b/project-configs/maven/conf/settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- ECOMP Policy Engine - Common Modules
+ ONAP Policy Engine - Common Modules
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
diff --git a/site-manager/pom.xml b/site-manager/pom.xml
index 2671a848..da0fa471 100644
--- a/site-manager/pom.xml
+++ b/site-manager/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- ECOMP Policy Engine - Common Modules
+ ONAP Policy Engine - Common Modules
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
@@ -29,7 +29,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>
@@ -111,7 +111,7 @@
<version>2.1.0</version>
</dependency>
<dependency>
- <groupId>org.openecomp.policy.common</groupId>
+ <groupId>org.onap.policy.common</groupId>
<artifactId>integrity-monitor</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/site-manager/src/main/files/siteManager b/site-manager/src/main/files/siteManager
index 02e7c33c..233959c9 100644
--- a/site-manager/src/main/files/siteManager
+++ b/site-manager/src/main/files/siteManager
@@ -3,5 +3,5 @@
dir="${0%/*}"
CLASSPATH="${dir}/site-manager-${project.version}.jar" java \
-DsiteManager.properties=${dir}/siteManager.properties \
- org.openecomp.policy.common.sitemanager.Main "$@" | \
+ org.onap.policy.common.sitemanager.Main "$@" | \
grep -v "^\[EL Info\]"
diff --git a/site-manager/src/main/java/org/openecomp/policy/common/sitemanager/Main.java b/site-manager/src/main/java/org/onap/policy/common/sitemanager/Main.java
index 5bb8474e..df843f3d 100644
--- a/site-manager/src/main/java/org/openecomp/policy/common/sitemanager/Main.java
+++ b/site-manager/src/main/java/org/onap/policy/common/sitemanager/Main.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.policy.common.sitemanager;
+package org.onap.policy.common.sitemanager;
/*
* Site Manager argument list:
@@ -50,9 +50,9 @@ import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
-import org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity;
-import org.openecomp.policy.common.im.jpa.StateManagementEntity;
-import org.openecomp.policy.common.im.jmx.ComponentAdminMBean;
+import org.onap.policy.common.im.jpa.ResourceRegistrationEntity;
+import org.onap.policy.common.im.jpa.StateManagementEntity;
+import org.onap.policy.common.im.jmx.ComponentAdminMBean;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
@@ -459,7 +459,7 @@ public class Main
connector = JMXConnectorFactory.connect(new JMXServiceURL(jmxUrl));
ComponentAdminMBean admin = JMX.newMXBeanProxy
(connector.getMBeanServerConnection(),
- new ObjectName("ECOMP_POLICY_COMP:name=" + resourceName),
+ new ObjectName("ONAP_POLICY_COMP:name=" + resourceName),
ComponentAdminMBean.class);
if ("lock".equals(arg0))