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-adaptor/provider/pom.xml | 4 ++-- .../java/org/openecomp/appc/ccadaptor/CCAActivator.java | 2 +- .../openecomp/appc/ccadaptor/ConfigComponentAdaptor.java | 4 ++-- .../appc/ccadaptor/TestConfigComponentAdaptor.java | 2 +- .../appc/ccadaptor/ConfigComponentAdaptorTest.java | 2 +- appc-config/appc-config-audit/provider/pom.xml | 2 +- .../org/openecomp/sdnc/config/audit/SliAuditActivator.java | 2 +- .../org/openecomp/sdnc/config/audit/node/CompareNode.java | 6 +++--- .../sdnc/config/audit/node/TestCompareNodeCli.java | 4 ++-- .../sdnc/config/audit/node/TestCompareNodeJson.java | 4 ++-- .../sdnc/config/audit/node/TestCompareNodeXml.java | 4 ++-- appc-config/appc-config-generator/provider/pom.xml | 4 ++-- .../sdnc/config/generator/convert/ConvertNode.java | 6 +++--- .../openecomp/sdnc/config/generator/merge/MergeNode.java | 6 +++--- .../sdnc/config/generator/pattern/PatternNode.java | 6 +++--- .../openecomp/sdnc/config/generator/reader/ReaderNode.java | 6 +++--- .../openecomp/sdnc/config/generator/tool/DbServiceUtil.java | 4 ++-- .../config/generator/transform/XSLTTransformerNode.java | 6 +++--- .../sdnc/config/generator/writer/FileWriterNode.java | 6 +++--- .../sdnc/config/generator/convert/TestConvertNode.java | 4 ++-- .../sdnc/config/generator/merge/TestMergeNode.java | 4 ++-- .../sdnc/config/generator/pattern/TestPatternNode.java | 2 +- .../sdnc/config/generator/reader/TestReaderNode.java | 4 ++-- .../config/generator/transform/TestXSLTTransformerNode.java | 2 +- .../sdnc/config/generator/writer/TestFileWriterNode.java | 2 +- appc-config/appc-config-params/provider/pom.xml | 2 +- .../sdnc/config/params/parser/PropertyDefinitionNode.java | 6 +++--- .../config/params/parser/TestPropertyDefinitionNode.java | 2 +- appc-config/appc-data-services/provider/pom.xml | 6 +++--- .../openecomp/appc/data/services/db/DGGeneralDBService.java | 10 +++++----- .../openecomp/appc/data/services/db/GeneralDataService.java | 10 +++++----- .../appc/data/services/node/ConfigResourceNode.java | 8 ++++---- .../appc/data/services/db/TestConfigResourceNode.java | 4 ++-- .../appc/data/services/db/TestDGGeneralDBService.java | 6 +++--- .../openecomp/appc/data/services/db/TestSQLSaveQuery.java | 2 +- appc-config/appc-encryption-tool/provider/pom.xml | 5 +++-- .../appc/encryptiontool/wrapper/DbServiceUtil.java | 4 ++-- .../encryptiontool/wrapper/EncryptionToolDGWrapper.java | 6 +++--- .../appc/encryptiontool/wrapper/WrapperEncryptionTool.java | 2 +- .../openecomp/appc/encryptiontool/TestEncryptionTool.java | 2 +- appc-config/appc-flow-controller/provider/pom.xml | 13 +++++++------ .../flow/controller/dbervices/FlowControlDBService.java | 10 +++++----- .../appc/flow/controller/executorImpl/GraphExecutor.java | 8 ++++---- .../appc/flow/controller/executorImpl/NodeExecutor.java | 6 +++--- .../appc/flow/controller/executorImpl/RestExecutor.java | 2 +- .../flow/controller/interfaces/FlowExecutorInterface.java | 2 +- .../appc/flow/controller/node/FlowControlNode.java | 6 +++--- .../openecomp/appc/flow/controller/node/FlowGenerator.java | 2 +- .../appc/flow/controller/node/JsonParsingNode.java | 6 +++--- .../appc/flow/controller/node/RestServiceNode.java | 6 +++--- .../appc/flow/executor/node/FlowControlDBServiceTest.java | 12 ++++++------ .../appc/flow/executor/node/FlowControlNodeTest.java | 4 ++-- .../appc/flow/executor/node/TestFlowExecutorNode.java | 2 +- .../openecomp/appc/flow/executor/node/TestParsingNode.java | 2 +- .../appc/flow/executor/node/TestRestServiceNode.java | 2 +- appc-config/pom.xml | 4 ++-- 56 files changed, 131 insertions(+), 129 deletions(-) (limited to 'appc-config') diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml index f21d5516c..51e900cb0 100644 --- a/appc-config/appc-config-adaptor/provider/pom.xml +++ b/appc-config/appc-config-adaptor/provider/pom.xml @@ -50,12 +50,12 @@ test - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java index 32119f00c..5863c1d7d 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java +++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java @@ -25,7 +25,7 @@ import java.io.FileInputStream; import java.io.InputStream; import java.util.Properties; -import org.openecomp.sdnc.sli.ConfigurationException; +import org.onap.ccsdk.sli.core.sli.ConfigurationException; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptor.java index 3158bd6fc..02644ac92 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptor.java +++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptor.java @@ -37,8 +37,8 @@ import java.util.NoSuchElementException; import java.io.StringReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openecomp.sdnc.sli.SvcLogicAdaptor; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicAdaptor; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; diff --git a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestConfigComponentAdaptor.java index d5d6f754d..7290dd2e2 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestConfigComponentAdaptor.java +++ b/appc-config/appc-config-adaptor/provider/src/main/test/org/openecomp/appc/ccadaptor/TestConfigComponentAdaptor.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Properties; import org.junit.Test; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestConfigComponentAdaptor { diff --git a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptorTest.java b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptorTest.java index 17331eea4..2f5cd1a31 100644 --- a/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptorTest.java +++ b/appc-config/appc-config-adaptor/provider/src/test/java/org/openecomp/appc/ccadaptor/ConfigComponentAdaptorTest.java @@ -30,7 +30,7 @@ import java.util.Properties; import org.junit.Assert; import org.junit.Test; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.powermock.reflect.Whitebox; public class ConfigComponentAdaptorTest { diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml index 8ea4e11e9..3404ef398 100644 --- a/appc-config/appc-config-audit/provider/pom.xml +++ b/appc-config/appc-config-audit/provider/pom.xml @@ -19,7 +19,7 @@ ${equinox.osgi.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider diff --git a/appc-config/appc-config-audit/provider/src/main/java/org/openecomp/sdnc/config/audit/SliAuditActivator.java b/appc-config/appc-config-audit/provider/src/main/java/org/openecomp/sdnc/config/audit/SliAuditActivator.java index f4cfe1b37..648d8ea86 100644 --- a/appc-config/appc-config-audit/provider/src/main/java/org/openecomp/sdnc/config/audit/SliAuditActivator.java +++ b/appc-config/appc-config-audit/provider/src/main/java/org/openecomp/sdnc/config/audit/SliAuditActivator.java @@ -30,7 +30,7 @@ import org.osgi.framework.ServiceRegistration; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.ConfigurationException; +import org.onap.ccsdk.sli.core.sli.ConfigurationException; public class SliAuditActivator implements BundleActivator{ diff --git a/appc-config/appc-config-audit/provider/src/main/java/org/openecomp/sdnc/config/audit/node/CompareNode.java b/appc-config/appc-config-audit/provider/src/main/java/org/openecomp/sdnc/config/audit/node/CompareNode.java index 4ef5e269f..710b5ffd1 100644 --- a/appc-config/appc-config-audit/provider/src/main/java/org/openecomp/sdnc/config/audit/node/CompareNode.java +++ b/appc-config/appc-config-audit/provider/src/main/java/org/openecomp/sdnc/config/audit/node/CompareNode.java @@ -27,9 +27,9 @@ import java.util.Map; 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 CompareNode implements SvcLogicJavaPlugin { diff --git a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java index 337bc6508..a35b08632 100644 --- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java +++ b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java @@ -27,8 +27,8 @@ import org.openecomp.sdnc.config.audit.node.CompareNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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 TestCompareNodeCli { private static final Logger log = LoggerFactory.getLogger(TestCompareNodeCli.class); diff --git a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java index 19e386558..aa819dffc 100644 --- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java +++ b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java @@ -27,8 +27,8 @@ import org.openecomp.sdnc.config.audit.node.CompareNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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 TestCompareNodeJson { private static final Logger log = LoggerFactory.getLogger(TestCompareNodeJson.class); diff --git a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java index 0c3825bff..ed82da83a 100644 --- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java +++ b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java @@ -27,8 +27,8 @@ import org.openecomp.sdnc.config.audit.node.CompareNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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 TestCompareNodeXml { private static final Logger log = LoggerFactory.getLogger(TestCompareNodeXml.class); 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 { diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml index 2619ca34a..047f9ad4b 100644 --- a/appc-config/appc-config-params/provider/pom.xml +++ b/appc-config/appc-config-params/provider/pom.xml @@ -18,7 +18,7 @@ ${equinox.osgi.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider diff --git a/appc-config/appc-config-params/provider/src/main/java/org/openecomp/sdnc/config/params/parser/PropertyDefinitionNode.java b/appc-config/appc-config-params/provider/src/main/java/org/openecomp/sdnc/config/params/parser/PropertyDefinitionNode.java index 714d01c6e..8948e02e1 100644 --- a/appc-config/appc-config-params/provider/src/main/java/org/openecomp/sdnc/config/params/parser/PropertyDefinitionNode.java +++ b/appc-config/appc-config-params/provider/src/main/java/org/openecomp/sdnc/config/params/parser/PropertyDefinitionNode.java @@ -34,9 +34,9 @@ import org.apache.commons.lang3.StringUtils; import org.openecomp.sdnc.config.params.ParamsHandlerConstant; import org.openecomp.sdnc.config.params.data.Parameter; import org.openecomp.sdnc.config.params.data.PropertyDefinition; -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 com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java index c6d58c09a..be11384c4 100644 --- a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java +++ b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java @@ -44,7 +44,7 @@ import org.openecomp.sdnc.config.params.data.PropertyDefinition; import org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode; import org.openecomp.sdnc.config.params.transformer.ArtificatTransformer; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml index 9de2e7bfb..c4a442c1f 100644 --- a/appc-config/appc-data-services/provider/pom.xml +++ b/appc-config/appc-data-services/provider/pom.xml @@ -21,14 +21,14 @@ ${equinox.osgi.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile - org.openecomp.sdnc.adaptors + org.onap.ccsdk.sli.adaptors sql-resource-provider - ${openecomp.sdnc.sql-resource.version} + ${ccsdk.sli.adaptors.version} compile diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java index 98fd50cc9..87995fe85 100644 --- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java +++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java @@ -24,11 +24,11 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicResource; -import org.openecomp.sdnc.sli.SvcLogicResource.QueryStatus; -import org.openecomp.sdnc.sli.resource.sql.SqlResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; +import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/GeneralDataService.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/GeneralDataService.java index 1f920beb0..bb6d89539 100644 --- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/GeneralDataService.java +++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/GeneralDataService.java @@ -25,11 +25,11 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicResource; -import org.openecomp.sdnc.sli.SvcLogicResource.QueryStatus; -import org.openecomp.sdnc.sli.resource.sql.SqlResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; +import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource; import org.openecomp.appc.data.services.AppcDataServiceConstant; import org.openecomp.appc.data.services.utils.EscapeUtils; diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java index 4676d37cb..3c958df38 100644 --- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java +++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java @@ -28,15 +28,15 @@ import com.att.eelf.configuration.EELFManager; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -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 org.openecomp.appc.data.services.AppcDataServiceConstant; import org.openecomp.appc.data.services.db.DGGeneralDBService; import org.openecomp.appc.data.services.utils.EscapeUtils; -import org.openecomp.sdnc.sli.SvcLogicResource.QueryStatus; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; public class ConfigResourceNode implements SvcLogicJavaPlugin { diff --git a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java index 781c43f43..edfc76f93 100644 --- a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java +++ b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestConfigResourceNode.java @@ -29,8 +29,8 @@ import java.util.Map; import org.junit.Test; import org.openecomp.appc.data.services.AppcDataServiceConstant; import org.openecomp.appc.data.services.node.ConfigResourceNode; -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 TestConfigResourceNode { diff --git a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestDGGeneralDBService.java b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestDGGeneralDBService.java index e064406fb..d64f15cbe 100644 --- a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestDGGeneralDBService.java +++ b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestDGGeneralDBService.java @@ -31,9 +31,9 @@ import java.util.Properties; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringEscapeUtils; import org.junit.Test; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicResource.QueryStatus; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; import org.openecomp.appc.data.services.db.DGGeneralDBService; public class TestDGGeneralDBService { diff --git a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestSQLSaveQuery.java b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestSQLSaveQuery.java index fd0f3da85..dfb481486 100644 --- a/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestSQLSaveQuery.java +++ b/appc-config/appc-data-services/provider/src/test/java/org/openecomp/appc/data/services/db/TestSQLSaveQuery.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestSQLSaveQuery { diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml index 6c48ada8b..0daa10a5c 100644 --- a/appc-config/appc-encryption-tool/provider/pom.xml +++ b/appc-config/appc-encryption-tool/provider/pom.xml @@ -21,12 +21,13 @@ ${equinox.osgi.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider - org.openecomp.sdnc.adaptors + org.onap.ccsdk.sli.adaptors sql-resource-provider + ${openecomp.sdnc.sql-resource.version} commons-io diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java index 4f7630478..0174d477a 100644 --- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java +++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/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-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java index 3dde4e5c0..7a187d166 100644 --- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java +++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java @@ -27,9 +27,9 @@ import org.apache.commons.lang.StringUtils; 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 EncryptionToolDGWrapper implements SvcLogicJavaPlugin { diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java index aa86149aa..a0472e6aa 100644 --- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java +++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java @@ -31,7 +31,7 @@ import javax.sql.rowset.CachedRowSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.commons.configuration.PropertiesConfiguration; -import org.openecomp.sdnc.sli.resource.dblib.DBResourceManager; +import org.onap.ccsdk.sli.core.dblib.DBResourceManager; public class WrapperEncryptionTool { diff --git a/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java index 36024ee96..640c989e3 100644 --- a/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java +++ b/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.openecomp.appc.encryptiontool.wrapper.DbServiceUtil; import org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper; import org.openecomp.appc.encryptiontool.wrapper.WrapperEncryptionTool; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestEncryptionTool { diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml index 0eeb4f86c..4f75dbf6f 100644 --- a/appc-config/appc-flow-controller/provider/pom.xml +++ b/appc-config/appc-flow-controller/provider/pom.xml @@ -19,7 +19,7 @@ ${equinox.osgi.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider @@ -47,16 +47,17 @@ eelf-core - org.openecomp.sdnc.adaptors + org.onap.ccsdk.sli.adaptors sql-resource-provider + ${ccsdk.sli.adaptors.version} compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common @@ -84,13 +85,13 @@ org.powermock powermock-api-mockito - 1.6.2 + 1.6.4 test org.powermock powermock-module-junit4 - 1.6.2 + 1.6.4 test diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java index 528be3263..34ba743d2 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java @@ -26,11 +26,11 @@ import java.util.Map; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.utils.EscapeUtils; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicResource; -import org.openecomp.sdnc.sli.SvcLogicResource.QueryStatus; -import org.openecomp.sdnc.sli.resource.sql.SqlResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; +import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/GraphExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/GraphExecutor.java index 9c8a37c0a..e4481fba6 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/GraphExecutor.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/GraphExecutor.java @@ -28,10 +28,10 @@ import org.openecomp.appc.flow.controller.data.Parameters; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.interfaces.FlowExecutorInterface; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicGraph; -import org.openecomp.sdnc.sli.provider.SvcLogicService; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; +import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/NodeExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/NodeExecutor.java index 54c627ef7..3c78caa1e 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/NodeExecutor.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/NodeExecutor.java @@ -25,9 +25,9 @@ import java.util.Properties; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.interfaces.FlowExecutorInterface; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.provider.SvcLogicService; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/RestExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/RestExecutor.java index ff1ba6195..4b0aa66f8 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/RestExecutor.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/executorImpl/RestExecutor.java @@ -38,7 +38,7 @@ import org.openecomp.appc.flow.controller.data.Response; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.interfaces.FlowExecutorInterface; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaces/FlowExecutorInterface.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaces/FlowExecutorInterface.java index 690191015..18b535eb5 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaces/FlowExecutorInterface.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/interfaces/FlowExecutorInterface.java @@ -24,7 +24,7 @@ import java.util.HashMap; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowControlNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowControlNode.java index 6a125af22..42f9903da 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowControlNode.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowControlNode.java @@ -54,9 +54,9 @@ import org.openecomp.appc.flow.controller.interfaceData.Vnfcs; import org.openecomp.appc.flow.controller.interfaceData.Vnfcslist; import org.openecomp.appc.flow.controller.interfaces.FlowExecutorInterface; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -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 com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowGenerator.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowGenerator.java index 8d81858fc..94fc425d9 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowGenerator.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/FlowGenerator.java @@ -29,7 +29,7 @@ import org.openecomp.appc.flow.controller.data.ResponseAction; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.data.Transactions; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/JsonParsingNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/JsonParsingNode.java index b1f31285b..dc638760a 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/JsonParsingNode.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/JsonParsingNode.java @@ -33,9 +33,9 @@ import org.apache.commons.lang3.StringUtils; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.executorImpl.RestExecutor; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -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 com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/RestServiceNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/RestServiceNode.java index 246f7a4e9..d157d9fac 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/RestServiceNode.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/node/RestServiceNode.java @@ -32,9 +32,9 @@ import org.apache.commons.lang3.StringUtils; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.executorImpl.RestExecutor; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -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 com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java index 33413e247..9b8624303 100644 --- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java +++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlDBServiceTest.java @@ -13,12 +13,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.openecomp.appc.flow.controller.data.Transaction; import org.openecomp.appc.flow.controller.dbervices.FlowControlDBService; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicResource; -import org.openecomp.sdnc.sli.SvcLogicResource.QueryStatus; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; -import org.openecomp.sdnc.sli.resource.sql.SqlResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; +import org.onap.ccsdk.sli.core.dblib.DbLibService; +import org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java index f5b0e14a2..8f66fd9a8 100644 --- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java +++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/FlowControlNodeTest.java @@ -22,8 +22,8 @@ import org.openecomp.appc.flow.controller.data.Transactions; import org.openecomp.appc.flow.controller.dbervices.FlowControlDBService; import org.openecomp.appc.flow.controller.node.FlowControlNode; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -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.api.mockito.PowerMockito; import org.powermock.reflect.Whitebox; diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java index d38d772f0..ba1cd67a2 100644 --- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java +++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestFlowExecutorNode.java @@ -29,7 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.openecomp.appc.flow.controller.node.FlowControlNode; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestParsingNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestParsingNode.java index 8097a05dc..ae4f90cbc 100644 --- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestParsingNode.java +++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestParsingNode.java @@ -31,7 +31,7 @@ import org.openecomp.appc.flow.controller.node.FlowControlNode; import org.openecomp.appc.flow.controller.node.JsonParsingNode; import org.openecomp.appc.flow.controller.node.RestServiceNode; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestParsingNode { diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestRestServiceNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestRestServiceNode.java index da5e61d62..41b6bbb2c 100644 --- a/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestRestServiceNode.java +++ b/appc-config/appc-flow-controller/provider/src/test/java/org/openecomp/appc/flow/executor/node/TestRestServiceNode.java @@ -38,7 +38,7 @@ import org.openecomp.appc.flow.controller.interfaceData.Vnfcslist; import org.openecomp.appc.flow.controller.node.FlowControlNode; import org.openecomp.appc.flow.controller.node.RestServiceNode; import org.openecomp.appc.flow.controller.utils.FlowControllerConstants; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestRestServiceNode { diff --git a/appc-config/pom.xml b/appc-config/pom.xml index 3250f689f..d9f3b2f89 100644 --- a/appc-config/pom.xml +++ b/appc-config/pom.xml @@ -23,7 +23,7 @@ 2.5 1.1.0 - 1.1.2 + 0.0.1-SNAPSHOT 1.1.0 1.1.0 @@ -32,7 +32,7 @@ - org.openecomp.sdnc.adaptors + org.onap.ccsdk.sli.adaptors sql-resource-provider ${openecomp.sdnc.sql-resource.version} -- cgit 1.2.3-korg