From ba229230144f00d35d55e31a80ca2576bd831448 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Mon, 7 Aug 2017 17:59:54 +0300
Subject: [SDC] sync

Change-Id: I150c22c816c52cc142e8d0f3c92e5df7ecea4e3c
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 .../config/ValidationToolConfiguration.java        |  7 -------
 asdctool/src/main/resources/config/logback.xml     | 24 ----------------------
 2 files changed, 31 deletions(-)

(limited to 'asdctool')

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java
index 80e80ab472..0e6b2c7d16 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java
@@ -16,8 +16,6 @@ import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
 import org.openecomp.sdc.be.dao.titan.TitanGraphClient;
 import org.openecomp.sdc.be.model.DerivedNodeTypeResolver;
 import org.openecomp.sdc.be.model.jsontitan.operations.*;
-import org.openecomp.sdc.be.model.operations.api.ToscaDefinitionPathCalculator;
-import org.openecomp.sdc.be.model.operations.impl.ToscaDefinitionPathCalculatorImpl;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -114,11 +112,6 @@ public class ValidationToolConfiguration {
         return new CategoryOperation();
     }
 
-    @Bean(name = "tosca-path-calculator")
-    public ToscaDefinitionPathCalculator pathCalculator() {
-        return new ToscaDefinitionPathCalculatorImpl();
-    }
-
     @Bean(name = "artifacts-operation")
     public ArtifactsOperations artifactsOperation() {
         return new ArtifactsOperations();
diff --git a/asdctool/src/main/resources/config/logback.xml b/asdctool/src/main/resources/config/logback.xml
index dadc5254a5..603d894317 100644
--- a/asdctool/src/main/resources/config/logback.xml
+++ b/asdctool/src/main/resources/config/logback.xml
@@ -45,34 +45,10 @@
 		</encoder>
 	</appender>
 
-	<appender name="MALFORMED_DATA"
-			  class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${HOME}/asdctool/logs/${ECOMP-component-name}/${ECOMP-subcomponent-name}/malformed-data.log</file>
-
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${HOME}/asdctool/logs/${ECOMP-component-name}/${ECOMP-subcomponent-name}/malformed-data.log.%i
-			</fileNamePattern>
-			<minIndex>1</minIndex>
-			<maxIndex>10</maxIndex>
-		</rollingPolicy>
-
-		<triggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>20MB</maxFileSize>
-		</triggeringPolicy>
-		<encoder>
-			<pattern>${default-log-pattern}</pattern>
-		</encoder>
-	</appender>
-
-
 	<root level="INFO">
 		<appender-ref ref="DEBUG_ROLLING" />
 	</root>
 	<logger name="org.openecomp.sdc" level="INFO" />
-	<logger name="org.openecomp.sdc.be.model.operations.migration" level="ERROR" >
-		<appender-ref ref="MALFORMED_DATA"/>
-	</logger>
 
 	<logger name="org.openecomp.sdc.asdctool.migration" level="INFO" >
 		<appender-ref ref="STDOUT"/>
-- 
cgit 1.2.3-korg