From 76706005ee07da01fc3e00ed44ada720e29855b1 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 4 Sep 2017 21:37:25 -0700 Subject: Change to CCSDK and ODL Carbon Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc Signed-off-by: Patrick Brady Issue-Id: [APPC-91] Issue-Id: [APPC-158] --- appc-config/appc-config-generator/provider/pom.xml | 4 ++-- .../org/openecomp/sdnc/config/generator/convert/ConvertNode.java | 6 +++--- .../java/org/openecomp/sdnc/config/generator/merge/MergeNode.java | 6 +++--- .../org/openecomp/sdnc/config/generator/pattern/PatternNode.java | 6 +++--- .../java/org/openecomp/sdnc/config/generator/reader/ReaderNode.java | 6 +++--- .../org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java | 4 ++-- .../sdnc/config/generator/transform/XSLTTransformerNode.java | 6 +++--- .../org/openecomp/sdnc/config/generator/writer/FileWriterNode.java | 6 +++--- .../openecomp/sdnc/config/generator/convert/TestConvertNode.java | 4 ++-- .../org/openecomp/sdnc/config/generator/merge/TestMergeNode.java | 4 ++-- .../openecomp/sdnc/config/generator/pattern/TestPatternNode.java | 2 +- .../org/openecomp/sdnc/config/generator/reader/TestReaderNode.java | 4 ++-- .../sdnc/config/generator/transform/TestXSLTTransformerNode.java | 2 +- .../openecomp/sdnc/config/generator/writer/TestFileWriterNode.java | 2 +- 14 files changed, 31 insertions(+), 31 deletions(-) (limited to 'appc-config/appc-config-generator') diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index 1ed7ca3fc..c70e3a996 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -20,7 +20,7 @@ ${equinox.osgi.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider @@ -67,7 +67,7 @@ org.powermock powermock-api-mockito - 1.6.2 + 1.6.4 test diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/convert/ConvertNode.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/convert/ConvertNode.java index 60566a40d..f6a9043b1 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/convert/ConvertNode.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/convert/ConvertNode.java @@ -31,15 +31,15 @@ import org.apache.commons.lang3.StringUtils; import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; import org.openecomp.sdnc.config.generator.tool.EscapeUtils; import org.openecomp.sdnc.config.generator.tool.JSONTool; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; public class ConvertNode implements SvcLogicJavaPlugin { diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/merge/MergeNode.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/merge/MergeNode.java index 67b21ae5f..b7dd32893 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/merge/MergeNode.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/merge/MergeNode.java @@ -31,9 +31,9 @@ import org.openecomp.sdnc.config.generator.tool.MergeTool; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; public class MergeNode implements SvcLogicJavaPlugin { diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/pattern/PatternNode.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/pattern/PatternNode.java index 04b62687f..67a5d2cc7 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/pattern/PatternNode.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/pattern/PatternNode.java @@ -29,9 +29,9 @@ import org.openecomp.sdnc.config.generator.tool.LogParserTool; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; public class PatternNode implements SvcLogicJavaPlugin { diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/reader/ReaderNode.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/reader/ReaderNode.java index 301e5d701..379b7c769 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/reader/ReaderNode.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/reader/ReaderNode.java @@ -30,9 +30,9 @@ import org.openecomp.sdnc.config.generator.merge.MergeNode; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; public class ReaderNode implements SvcLogicJavaPlugin { diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java index 80db36816..5881e7f0b 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java @@ -31,8 +31,8 @@ import javax.sql.rowset.CachedRowSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openecomp.sdnc.sli.resource.dblib.DBResourceManager; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; +import org.onap.ccsdk.sli.core.dblib.DBResourceManager; +import org.onap.ccsdk.sli.core.dblib.DbLibService; public class DbServiceUtil { diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/transform/XSLTTransformerNode.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/transform/XSLTTransformerNode.java index bdcf37339..682b3f2c1 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/transform/XSLTTransformerNode.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/transform/XSLTTransformerNode.java @@ -32,9 +32,9 @@ import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/writer/FileWriterNode.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/writer/FileWriterNode.java index 81202777c..e383476c2 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/writer/FileWriterNode.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/writer/FileWriterNode.java @@ -30,9 +30,9 @@ import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; public class FileWriterNode implements SvcLogicJavaPlugin { diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/convert/TestConvertNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/convert/TestConvertNode.java index 79dc27745..0bfb80cf1 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/convert/TestConvertNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/convert/TestConvertNode.java @@ -28,8 +28,8 @@ import org.apache.commons.io.IOUtils; import org.junit.Test; import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; import org.openecomp.sdnc.config.generator.merge.TestMergeNode; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.powermock.reflect.Whitebox; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/merge/TestMergeNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/merge/TestMergeNode.java index ac505982c..cd7bb9e9a 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/merge/TestMergeNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/merge/TestMergeNode.java @@ -24,8 +24,8 @@ import org.apache.commons.io.IOUtils; import org.junit.Test; import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; import org.openecomp.sdnc.config.generator.merge.MergeNode; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.Map; diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/pattern/TestPatternNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/pattern/TestPatternNode.java index ff63931f8..db3fa7149 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/pattern/TestPatternNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/pattern/TestPatternNode.java @@ -27,7 +27,7 @@ import org.apache.commons.io.IOUtils; import org.junit.Test; import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; import org.openecomp.sdnc.config.generator.pattern.PatternNode; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestPatternNode { diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/reader/TestReaderNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/reader/TestReaderNode.java index 0d352c8ab..cda966b60 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/reader/TestReaderNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/reader/TestReaderNode.java @@ -32,8 +32,8 @@ import org.junit.Test; import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; import org.openecomp.sdnc.config.generator.merge.TestMergeNode; import org.openecomp.sdnc.config.generator.reader.ReaderNode; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; public class TestReaderNode { @Test(expected = Exception.class) diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/transform/TestXSLTTransformerNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/transform/TestXSLTTransformerNode.java index fc12a60a9..e2e808192 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/transform/TestXSLTTransformerNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/transform/TestXSLTTransformerNode.java @@ -30,7 +30,7 @@ import org.openecomp.sdnc.config.generator.merge.TestMergeNode; import org.openecomp.sdnc.config.generator.transform.XSLTTransformerNode; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestXSLTTransformerNode { diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/writer/TestFileWriterNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/writer/TestFileWriterNode.java index 1797adc05..74c17bdc6 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/writer/TestFileWriterNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/openecomp/sdnc/config/generator/writer/TestFileWriterNode.java @@ -26,7 +26,7 @@ import java.util.Map; import org.junit.Test; import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; import org.openecomp.sdnc.config.generator.writer.FileWriterNode; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestFileWriterNode { -- cgit 1.2.3-korg