From f9f112f5fd5b193e79e38442cc566b7b437f87d2 Mon Sep 17 00:00:00 2001 From: noahs Date: Wed, 6 Dec 2017 13:11:38 +0200 Subject: Duplicate logging frameworks merging There was two copies of the SDC logging framework Change-Id: I55c94c9817a83162c6d90e504dfd91e4858c7269 Issue-ID: SDC-703 Signed-off-by: noahs --- .../openecomp-sdc-artifact-generator-core/pom.xml | 19 ++++++++++++------- .../org/openecomp/sdc/generator/GeneratorManager.java | 4 ++-- .../org/openecomp/sdc/generator/GeneratorTask.java | 4 ++-- .../sdc/generator/aai/AaiArtifactGenerator.java | 4 ++-- .../sdc/generator/aai/AaiModelGeneratorImpl.java | 4 ++-- .../openecomp/sdc/generator/aspect/AuditAspect.java | 4 ++-- .../openecomp/sdc/generator/aspect/MetricsAspect.java | 4 ++-- .../generator/impl/ArtifactGenerationServiceImpl.java | 4 ++-- .../sdc/generator/util/ArtifactGeneratorUtil.java | 4 ++-- 9 files changed, 28 insertions(+), 23 deletions(-) (limited to 'common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core') diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml index 624df5dfc7..43fb6f1648 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml @@ -3,7 +3,6 @@ 4.0.0 openecomp-sdc-artifact-generator-core - org.openecomp.sdc.common openecomp-sdc-artifact-generator-core @@ -14,10 +13,15 @@ + + org.aspectj + aspectjrt + ${aspectj.version} + org.slf4j slf4j-api - 1.7.10 + ${slf4j.version} ch.qos.logback @@ -47,14 +51,15 @@ ${commons.codec.version} - org.openecomp.sdc.common - openecomp-logging-api + org.openecomp.sdc + openecomp-sdc-logging-api ${project.version} - org.openecomp.sdc.common - openecomp-logging-core + org.openecomp.sdc + openecomp-sdc-logging-core ${project.version} + runtime org.openecomp.sdc.common @@ -65,7 +70,7 @@ org.testng testng test - 6.8.5 + ${testng.version} commons-io diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorManager.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorManager.java index 2d50826dee..90c1c332d3 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorManager.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorManager.java @@ -24,8 +24,8 @@ import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERRO import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.logError; import com.fasterxml.jackson.databind.ObjectMapper; -import org.openecomp.core.logging.api.Logger; -import org.openecomp.core.logging.api.LoggerFactory; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.generator.data.ArtifactType; import org.openecomp.sdc.generator.data.GeneratorConfiguration; import org.openecomp.sdc.generator.intf.ArtifactGenerator; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorTask.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorTask.java index beb8f2d576..661aec4188 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorTask.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorTask.java @@ -20,8 +20,8 @@ package org.openecomp.sdc.generator; -import org.openecomp.core.logging.api.Logger; -import org.openecomp.core.logging.api.LoggerFactory; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.generator.data.Artifact; import org.openecomp.sdc.generator.data.GenerationData; import org.openecomp.sdc.generator.intf.ArtifactGenerator; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java index f4dd4d476c..26b884e465 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java @@ -28,8 +28,8 @@ import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ import static org.openecomp.sdc.generator.data.GeneratorConstants.ID_LENGTH; import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.logError; -import org.openecomp.core.logging.api.Logger; -import org.openecomp.core.logging.api.LoggerFactory; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.generator.aai.model.AllotedResource; import org.openecomp.sdc.generator.aai.model.ProvidingService; import org.openecomp.sdc.generator.aai.model.L3NetworkWidget; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java index ddddfed2e6..7f4471c4c0 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java @@ -20,8 +20,8 @@ package org.openecomp.sdc.generator.aai; -import org.openecomp.core.logging.api.Logger; -import org.openecomp.core.logging.api.LoggerFactory; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.generator.aai.model.Resource; import org.openecomp.sdc.generator.aai.model.Service; import org.openecomp.sdc.generator.aai.model.Widget; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aspect/AuditAspect.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aspect/AuditAspect.java index 19166df522..170a9c229e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aspect/AuditAspect.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aspect/AuditAspect.java @@ -44,8 +44,8 @@ import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.resetLoggin import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import org.openecomp.core.logging.api.Logger; -import org.openecomp.core.logging.api.LoggerFactory; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.generator.data.GenerationData; import org.openecomp.sdc.generator.logging.CategoryLogLevel; import org.openecomp.sdc.generator.logging.StatusCode; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aspect/MetricsAspect.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aspect/MetricsAspect.java index d226b00b05..d8c2251aff 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aspect/MetricsAspect.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aspect/MetricsAspect.java @@ -46,8 +46,8 @@ import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.resetLoggin import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import org.openecomp.core.logging.api.Logger; -import org.openecomp.core.logging.api.LoggerFactory; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.generator.data.GenerationData; import org.openecomp.sdc.generator.logging.CategoryLogLevel; import org.openecomp.sdc.generator.logging.StatusCode; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/impl/ArtifactGenerationServiceImpl.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/impl/ArtifactGenerationServiceImpl.java index 38e1b4c64e..3f6148f0e7 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/impl/ArtifactGenerationServiceImpl.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/impl/ArtifactGenerationServiceImpl.java @@ -24,8 +24,8 @@ import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERRO import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_INVOCATION_ERROR_CODE; import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.logError; -import org.openecomp.core.logging.api.Logger; -import org.openecomp.core.logging.api.LoggerFactory; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.generator.GeneratorManager; import org.openecomp.sdc.generator.GeneratorTask; import org.openecomp.sdc.generator.data.Artifact; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java index 94c332da54..aa3ce46013 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java @@ -78,8 +78,8 @@ import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCo import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.SERVICE_TOSCA_MISSING; import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.UNABLE_TO_GENERATE_ARTIFACT; -import org.openecomp.core.logging.api.Logger; -import org.openecomp.core.logging.api.LoggerFactory; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.generator.data.Artifact; import org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode; import org.openecomp.sdc.generator.logging.CategoryLogLevel; -- cgit 1.2.3-korg