From 7587e5e0e38af6fef1a63d143965bf98339d1752 Mon Sep 17 00:00:00 2001 From: "Arul.Nambi" Date: Mon, 25 Sep 2017 13:07:51 -0400 Subject: [PATCH] Renaming openecomp to onap Issue-ID: AAI-208 Change-Id: I5cd512429d779f97fe2b2c77ba80437a373c8616 Signed-off-by: Arul.Nambi --- pom.xml | 8 ++++---- .../java/org/openecomp/datarouter/logging/DataRouterMsgs.java | 2 +- .../openecomp/datarouter/logging/EntityEventPolicyMsgs.java | 2 +- .../org/openecomp/datarouter/policy/EntityEventPolicy.java | 6 +++--- .../search/filters/config/UiFiltersSchemaUtility.java | 4 ++-- .../java/org/openecomp/datarouter/service/EchoService.java | 10 +++++----- .../java/org/openecomp/datarouter/util/OxmModelLoader.java | 4 ++-- .../java/org/openecomp/datarouter/util/RouterServiceUtil.java | 2 +- .../java/org/openecomp/datarouter/util/SearchServiceAgent.java | 4 ++-- .../org/openecomp/datarouter/util/client/NoAuthRestClient.java | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index e5d6ba6..958e7aa 100644 --- a/pom.xml +++ b/pom.xml @@ -121,10 +121,10 @@ - org.onap.aai.logging-service - common-logging - 1.1.0-SNAPSHOT - + org.onap.aai.logging-service + common-logging + 1.1.0-SNAPSHOT + org.onap.aai diff --git a/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java b/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java index b59721c..a312d46 100644 --- a/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java +++ b/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java @@ -24,7 +24,7 @@ package org.openecomp.datarouter.logging; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.cl.eelf.LogMessageEnum; +import org.onap.aai.cl.eelf.LogMessageEnum; public enum DataRouterMsgs implements LogMessageEnum { diff --git a/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java b/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java index d95903d..1a59ab1 100644 --- a/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java +++ b/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java @@ -24,7 +24,7 @@ package org.openecomp.datarouter.logging; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.cl.eelf.LogMessageEnum; +import org.onap.aai.cl.eelf.LogMessageEnum; public enum EntityEventPolicyMsgs implements LogMessageEnum { diff --git a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java b/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java index cee12da..a5fcbc3 100644 --- a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java +++ b/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java @@ -47,9 +47,9 @@ import org.onap.aai.datarouter.entity.OxmEntityDescriptor; import org.onap.aai.datarouter.entity.SuggestionSearchEntity; import org.onap.aai.datarouter.entity.TopographicalEntity; import org.onap.aai.datarouter.entity.UebEventHeader; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.cl.mdc.MdcContext; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.aai.cl.mdc.MdcContext; import org.openecomp.datarouter.logging.EntityEventPolicyMsgs; import org.openecomp.datarouter.util.CrossEntityReference; import org.openecomp.datarouter.util.EntityOxmReferenceHelper; diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java index dcd8de0..48b4135 100644 --- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java +++ b/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java @@ -25,8 +25,8 @@ package org.openecomp.datarouter.search.filters.config; import java.io.File; import java.io.IOException; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; import org.openecomp.datarouter.logging.DataRouterMsgs; import org.openecomp.datarouter.util.DataRouterConstants; diff --git a/src/main/java/org/openecomp/datarouter/service/EchoService.java b/src/main/java/org/openecomp/datarouter/service/EchoService.java index 09dbd0e..2339060 100644 --- a/src/main/java/org/openecomp/datarouter/service/EchoService.java +++ b/src/main/java/org/openecomp/datarouter/service/EchoService.java @@ -22,11 +22,11 @@ */ package org.openecomp.datarouter.service; -import org.openecomp.cl.api.LogFields; -import org.openecomp.cl.api.LogLine; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.cl.mdc.MdcContext; +import org.onap.aai.cl.api.LogFields; +import org.onap.aai.cl.api.LogLine; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.aai.cl.mdc.MdcContext; import org.openecomp.datarouter.logging.DataRouterMsgs; import org.openecomp.datarouter.util.DataRouterConstants; import org.slf4j.MDC; diff --git a/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java b/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java index 4fb1ca7..799b61c 100644 --- a/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java +++ b/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java @@ -40,7 +40,7 @@ import javax.xml.bind.JAXBException; import org.eclipse.persistence.jaxb.JAXBContextProperties; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory; -import org.openecomp.cl.eelf.LoggerFactory; +import org.onap.aai.cl.eelf.LoggerFactory; import org.openecomp.datarouter.logging.DataRouterMsgs; import org.openecomp.datarouter.util.ExternalOxmModelProcessor; @@ -56,7 +56,7 @@ public class OxmModelLoader { - private static org.openecomp.cl.api.Logger logger = LoggerFactory.getInstance() + private static org.onap.aai.cl.api.Logger logger = LoggerFactory.getInstance() .getLogger(OxmModelLoader.class.getName()); public synchronized static void loadModels() throws FileNotFoundException { diff --git a/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java b/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java index 216b591..1af7564 100644 --- a/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java +++ b/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java @@ -28,7 +28,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.cxf.message.Message; import org.json.JSONObject; -import org.openecomp.cl.mdc.MdcContext; +import org.onap.aai.cl.mdc.MdcContext; import org.onap.aai.restclient.client.Headers; import java.util.ArrayList; diff --git a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java b/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java index 3aa8f12..0fa50c2 100644 --- a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java +++ b/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java @@ -36,8 +36,8 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response.Status; import org.eclipse.jetty.util.security.Password; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.mdc.MdcContext; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.mdc.MdcContext; import org.openecomp.datarouter.logging.DataRouterMsgs; import org.openecomp.datarouter.policy.EntityEventPolicy; import org.onap.aai.restclient.client.Headers; diff --git a/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java b/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java index 13406a7..da985fd 100644 --- a/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java +++ b/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java @@ -32,9 +32,9 @@ import javax.ws.rs.core.MediaType; import org.apache.camel.Exchange; import org.apache.camel.component.http.HttpMessage; import org.apache.camel.Message; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.cl.mdc.MdcContext; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.aai.cl.mdc.MdcContext; import org.openecomp.datarouter.logging.DataRouterMsgs; import org.openecomp.datarouter.util.AaiUiSvcPolicyUtil; import org.openecomp.datarouter.util.NodeUtils; -- 2.16.6