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-ansible-adapter-bundle/pom.xml | 12 +++++------- .../openecomp/appc/adapter/ansible/AnsibleAdapter.java | 6 +++--- .../appc/adapter/ansible/impl/AnsibleAdapterImpl.java | 4 ++-- .../appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java | 4 ++-- .../java/org/openecomp/appc/test/ExecutorHarness.java | 4 ++-- .../src/main/resources/features.xml | 2 +- .../appc-chef-adapter/appc-chef-adapter-bundle/pom.xml | 10 +++++----- .../org/openecomp/appc/adapter/chef/ChefActivator.java | 1 - .../java/org/openecomp/appc/adapter/chef/ChefAdapter.java | 4 ++-- .../openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java | 2 +- .../openecomp/appc/adapter/chef/impl/RequestContext.java | 2 +- .../appc/adapter/chef/impl/TestChefAdapterImpl.java | 2 +- .../java/org/openecomp/appc/test/ExecutorHarness.java | 4 ++-- .../src/main/resources/features.xml | 2 +- .../appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml | 14 +++++--------- .../messaging/dmaap/impl/EventSenderDmaapImpl.java | 2 +- .../adapter/messaging/dmaap/TestDmaapEventSender.java | 2 +- .../src/main/resources/features.xml | 4 ++-- .../appc-dmaap-adapter/appc-message-adapter-api/pom.xml | 15 +++++---------- .../org/openecomp/appc/adapter/message/EventSender.java | 4 ++-- .../appc-message-adapter-factory/pom.xml | 15 +++++---------- .../appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml | 14 +++++++------- .../org/openecomp/appc/adapter/iaas/ProviderAdapter.java | 4 ++-- .../appc/adapter/iaas/impl/ProviderAdapterImpl.java | 2 +- .../openecomp/appc/adapter/iaas/impl/RequestContext.java | 2 +- .../iaas/provider/operation/api/IProviderOperation.java | 2 +- .../iaas/provider/operation/impl/CreateSnapshot.java | 2 +- .../iaas/provider/operation/impl/EvacuateServer.java | 2 +- .../iaas/provider/operation/impl/LookupServer.java | 2 +- .../iaas/provider/operation/impl/MigrateServer.java | 2 +- .../iaas/provider/operation/impl/RebuildServer.java | 2 +- .../iaas/provider/operation/impl/RestartServer.java | 2 +- .../iaas/provider/operation/impl/RestoreStack.java | 2 +- .../iaas/provider/operation/impl/SnapshotStack.java | 2 +- .../adapter/iaas/provider/operation/impl/StartServer.java | 2 +- .../adapter/iaas/provider/operation/impl/StopServer.java | 2 +- .../iaas/provider/operation/impl/TerminateServer.java | 2 +- .../iaas/provider/operation/impl/TerminateStack.java | 2 +- .../iaas/provider/operation/impl/VmStatuschecker.java | 2 +- .../provider/operation/impl/base/ProviderOperation.java | 2 +- .../operation/impl/base/ProviderStackOperation.java | 2 +- .../appc/adapter/iaas/impl/TestProviderAdapterImpl.java | 2 +- .../appc/adapter/iaas/impl/TestProviderOperation.java | 2 +- .../java/org/openecomp/appc/test/ExecutorHarness.java | 4 ++-- .../src/main/resources/features.xml | 2 +- .../appc-netconf-adapter-bundle/pom.xml | 10 +++++----- .../appc/adapter/netconf/AppcNetconfAdapterActivator.java | 7 +++++-- .../appc/adapter/netconf/NetconfDataAccessService.java | 2 +- .../netconf/internal/NetconfDataAccessServiceImpl.java | 2 +- .../appc-netconf-adapter-features/pom.xml | 2 +- .../src/main/resources/features.xml | 4 ++-- .../appc-rest-adapter/appc-rest-adapter-bundle/pom.xml | 10 +++++----- .../org/openecomp/appc/adapter/rest/RestActivator.java | 2 -- .../java/org/openecomp/appc/adapter/rest/RestAdapter.java | 4 ++-- .../openecomp/appc/adapter/rest/impl/RequestContext.java | 2 +- .../openecomp/appc/adapter/rest/impl/RestAdapterImpl.java | 2 +- .../appc/adapter/rest/impl/TestRestAdapterImpl.java | 2 +- .../java/org/openecomp/appc/test/ExecutorHarness.java | 4 ++-- .../src/main/resources/features.xml | 2 +- .../appc-rest-healthcheck-adapter-bundle/pom.xml | 10 +++++----- .../adapter/restHealthcheck/RestHealthcheckAdapter.java | 4 ++-- .../appc/adapter/restHealthcheck/impl/RequestContext.java | 2 +- .../restHealthcheck/impl/RestHealthcheckAdapterImpl.java | 2 +- .../impl/TestRestHealthcheckAdapterImpl.java | 2 +- .../java/org/openecomp/appc/test/ExecutorHarness.java | 4 ++-- .../src/main/resources/features.xml | 2 +- .../appc-ssh-adapter/appc-ssh-adapter-api/pom.xml | 2 +- .../openecomp/appc/adapter/ssh/SshDataAccessService.java | 2 +- .../appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml | 2 +- .../appc/adapter/ssh/sshd/SshdDataAccessService.java | 2 +- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- 71 files changed, 127 insertions(+), 143 deletions(-) (limited to 'appc-adapters') diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml index 73ddb06c7..70f76d6f7 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml @@ -117,26 +117,26 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -200,12 +200,10 @@ appc-ansible-adapter org.openecomp.appc.adapter.ansible.AnsibleActivator org.openecomp.appc.adapter.ansible - org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*, javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*, javax.security.* + org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*, javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*, javax.security.* *;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis true - - ${project.basedir}/src/main/resources/META-INF diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java index 55b9b6c34..da710f34f 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java @@ -27,9 +27,9 @@ package org.openecomp.appc.adapter.ansible; import java.util.Map; import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; -import org.openecomp.sdnc.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; /** * This interface defines the operations that the Ansible adapter exposes. diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java index 757a2ed76..4edca7b78 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java @@ -46,8 +46,8 @@ import org.openecomp.appc.pool.PoolExtensionException; import org.openecomp.appc.util.StructuredPropertyHelper; import org.openecomp.appc.util.StructuredPropertyHelper.Node; -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.slf4j.MDC; diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java index 32f2b034e..a4e49643a 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java @@ -45,8 +45,8 @@ import org.junit.Test; import org.openecomp.appc.Constants; import org.openecomp.appc.configuration.ConfigurationFactory; import org.openecomp.appc.exceptions.APPCException; -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.slf4j.MDC; import org.openecomp.appc.adapter.ansible.AnsibleAdapter; diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java index 8ac3746e2..62470cc01 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java @@ -33,8 +33,8 @@ import java.util.List; import java.util.Map; import org.openecomp.appc.test.InterceptLogger; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; /** * This class is used as a test harness to wrap the call to an executor node. diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml index a92c83494..64587b5c2 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml @@ -31,7 +31,7 @@ mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features - odl-mdsal-broker + odl-mdsal-broker sdnc-sli mvn:org.openecomp.appc/appc-common/${project.version} mvn:org.openecomp.appc/appc-ansible-adapter-bundle/${project.version} diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index 0fb55af49..7742c5cb7 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -148,26 +148,26 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -224,7 +224,7 @@ org.openecomp.appc.adapter.chef.ChefActivator org.openecomp.appc.adapter.chef - org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* + org.onap.ccsdk.sli.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* *;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java index fb1ae6788..c6f4c6589 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java @@ -93,7 +93,6 @@ public class ChefActivator implements BundleActivator { @Override public void start(BundleContext context) throws Exception { logger.info("Starting bundle " + getName()); - configuration = ConfigurationFactory.getConfiguration(); String appName = configuration.getProperty(Constants.PROPERTY_APPLICATION_NAME); logger.info(Msg.COMPONENT_INITIALIZING, appName, "chef adapter"); diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java index 3af963731..4793ee708 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java @@ -28,8 +28,8 @@ import java.util.Map; import org.openecomp.appc.exceptions.APPCException; import com.att.cdp.zones.model.Server; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; /** * This interface defines the operations that the provider adapter exposes. diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java index 1b6b93b4c..b81c10bc8 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java @@ -40,7 +40,7 @@ import org.openecomp.appc.adapter.chef.chefapi.ApiMethod; import org.openecomp.appc.adapter.chef.chefclient.ChefApiClient; import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; -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-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java index 836f6aaff..a3ecf857c 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java @@ -27,7 +27,7 @@ package org.openecomp.appc.adapter.chef.impl; import org.openecomp.appc.Constants; import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; /** * This class is used to track and maintain recovery and time-to-live information for a request as it is being diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java index 744f84722..d0eb060a7 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java @@ -54,7 +54,7 @@ import com.att.cdp.zones.Context; import com.att.cdp.zones.ContextFactory; import com.att.cdp.zones.model.Server; import com.att.cdp.zones.model.Server.Status; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; @Ignore diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java index 8ac3746e2..62470cc01 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java @@ -33,8 +33,8 @@ import java.util.List; import java.util.Map; import org.openecomp.appc.test.InterceptLogger; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; /** * This class is used as a test harness to wrap the call to an executor node. diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml index 923e6b8a9..81795cf70 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml @@ -32,7 +32,7 @@ - odl-mdsal-broker + odl-mdsal-broker sdnc-sli mvn:org.openecomp.appc/appc-common/${project.version} mvn:org.openecomp.appc/appc-chef-adapter-bundle/${project.version} diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml index 449ce92d2..7824ad598 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml @@ -80,10 +80,6 @@ objenesis 2.2 - - org.mockito - mockito-all - org.powermock @@ -100,13 +96,13 @@ jcl-over-slf4j - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -117,13 +113,13 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -160,7 +156,7 @@ org.openecomp.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator org.openecomp.appc.adapter.messaging.* - !org.slf4j.event,org.openecomp.appc.adapter.message.*,org.openecomp.appc.metricservice.*,com.att.nsa.*,org.openecomp.sdnc.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets + !org.slf4j.event,org.openecomp.appc.adapter.message.*,org.openecomp.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets *;scope=compile|runtime;artifactId=!appc-metric-bundle|appc-message-adapter-api|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis|pax-* true OSGI-INF/blueprint/blueprint.xml diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java index b3cc2e509..ee491d227 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java @@ -26,7 +26,7 @@ package org.openecomp.appc.adapter.messaging.dmaap.impl; 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; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java index d4d9f729f..e12da25ef 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java @@ -24,7 +24,7 @@ package org.openecomp.appc.adapter.messaging.dmaap; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml index a0d8cf483..afa1d31e3 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml @@ -33,8 +33,8 @@ - - odl-mdsal-broker + + odl-mdsal-broker mvn:org.openecomp.appc/appc-dmaap-adapter-bundle/${project.version} mvn:org.openecomp.appc/appc-message-adapter-factory/${project.version} diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml index 5e2e6c6b2..459f3951b 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml @@ -76,11 +76,6 @@ objenesis 2.2 - - org.mockito - mockito-all - test - org.powermock @@ -89,26 +84,26 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -128,7 +123,7 @@ ${project.version} org.openecomp.appc.adapter.message.* - org.openecomp.appc.metricservice.*,com.att.nsa.*,org.openecomp.sdnc.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets + org.openecomp.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets *;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|sli-provider|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis|pax-* true diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java index ef929612f..2b96396dd 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java @@ -25,8 +25,8 @@ package org.openecomp.appc.adapter.message; import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; import java.util.Map; diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml index 21cba8179..75640b7e1 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml @@ -85,11 +85,6 @@ objenesis 2.2 - - org.mockito - mockito-all - test - org.powermock @@ -98,26 +93,26 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -138,7 +133,7 @@ org.openecomp.appc.adapter.factory org.openecomp.appc.adapter.factory.DmaapMessageAdapterFactoryActivator org.openecomp.appc.adapter.message.MessageAdapterFactory - org.openecomp.appc.adapter.messaging.*,org.openecomp.appc.adapter.message.*,org.openecomp.appc.metricservice.*,com.att.nsa.*org.openecomp.sdnc.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets + org.openecomp.appc.adapter.messaging.*,org.openecomp.appc.adapter.message.*,org.openecomp.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets *;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis|pax-* true OSGI-INF/blueprint/blueprint.xml diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml index 061ec5a09..27a5e5cf1 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml @@ -105,26 +105,26 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common provided - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider provided - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -219,9 +219,9 @@ org.openecomp.appc.adapter.iaas.AppcProviderAdapterActivator org.openecomp.appc.adapter.iaas,com.att.cdp.zones.model javax.* - org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax - - + org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax + + *;scope=compile|runtime;artifactId=!org.eclipse.osgi|slf4j-api|jcl-over-slf4j| true diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java index 749f85c2d..513524370 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java @@ -31,8 +31,8 @@ import org.openecomp.appc.exceptions.UnknownProviderException; import com.att.cdp.zones.model.Image; import com.att.cdp.zones.model.Server; import com.att.cdp.zones.model.Stack; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; /** * This interface defines the operations that the provider adapter exposes. diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java index 1888861c6..37ff3d767 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java @@ -42,7 +42,7 @@ import com.att.cdp.zones.model.Server; import com.att.cdp.zones.model.Stack; 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; import java.util.HashMap; import java.util.List; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java index 03a1158bc..f96002f89 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java @@ -28,7 +28,7 @@ package org.openecomp.appc.adapter.iaas.impl; import org.openecomp.appc.Constants; import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; /** * This class is used to track and maintain recovery and time-to-live information for a request as it is being diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java index e05aebc06..349fa1935 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java @@ -27,7 +27,7 @@ package org.openecomp.appc.adapter.iaas.provider.operation.api; import org.openecomp.appc.adapter.iaas.impl.ProviderCache; import org.openecomp.appc.exceptions.APPCException; import com.att.cdp.zones.model.ModelObject; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java index 4a5d8ea16..e54ed86a5 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java @@ -36,6 +36,7 @@ import com.att.cdp.zones.model.Server; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import org.openecomp.appc.Constants; import org.openecomp.appc.adapter.iaas.ProviderAdapter; @@ -49,7 +50,6 @@ import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; import org.openecomp.appc.exceptions.APPCException; import org.openecomp.appc.i18n.Msg; -import org.openecomp.sdnc.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java index 2902ea7e0..f2466d377 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java @@ -52,7 +52,7 @@ import com.att.cdp.zones.model.Server; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import org.slf4j.MDC; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java index 3d9bc0e39..0152fc650 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java @@ -42,7 +42,7 @@ import com.att.cdp.zones.model.Server; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import java.io.IOException; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java index 2ca9e3e4e..e45bdfa61 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java @@ -47,7 +47,7 @@ import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; import org.openecomp.appc.exceptions.APPCException; import org.openecomp.appc.i18n.Msg; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java index ed219ac67..0f089b108 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java @@ -52,7 +52,7 @@ import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; import org.openecomp.appc.exceptions.APPCException; import org.openecomp.appc.i18n.Msg; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java index b57d076e7..33c4c6b20 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java @@ -43,7 +43,7 @@ import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome; import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; import org.openecomp.appc.exceptions.UnknownProviderException; import org.openecomp.appc.i18n.Msg; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java index 24b2471f8..83dfb92d1 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java @@ -49,7 +49,7 @@ import org.openecomp.appc.adapter.openstack.heat.SnapshotResource; import org.openecomp.appc.adapter.openstack.heat.StackResource; import org.openecomp.appc.exceptions.APPCException; import org.openecomp.appc.i18n.Msg; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java index 07053961a..c53b9c194 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java @@ -51,7 +51,7 @@ import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams; import org.openecomp.appc.adapter.openstack.heat.model.Snapshot; import org.openecomp.appc.exceptions.APPCException; import org.openecomp.appc.i18n.Msg; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java index be30a8c46..b5379b8ad 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java @@ -41,7 +41,7 @@ import com.att.cdp.zones.model.Server; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java index fcffa12ce..ae6109995 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java @@ -41,7 +41,7 @@ import com.att.cdp.zones.model.Server; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java index 3f3749a6d..b3d34bc45 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java @@ -46,7 +46,7 @@ import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome; import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; import org.openecomp.appc.exceptions.UnknownProviderException; import org.openecomp.appc.i18n.Msg; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java index 7400877e5..a8987bbe1 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java @@ -41,7 +41,7 @@ import com.att.cdp.zones.model.Stack; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java index 5a3e92cf3..68fa454fd 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java @@ -45,7 +45,7 @@ import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; import org.openecomp.appc.exceptions.UnknownProviderException; import org.openecomp.appc.i18n.Msg; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java index 710d38c68..8ae075365 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java @@ -41,7 +41,7 @@ import com.att.cdp.zones.model.Server; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import org.slf4j.MDC; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java index 46c98d9d1..28d8e3d4d 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java @@ -42,7 +42,7 @@ import com.att.cdp.zones.spi.RequestState; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.woorea.openstack.base.client.OpenStackBaseException; import org.glassfish.grizzly.http.util.HttpStatus; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java index 46adf18d1..1e827b7e4 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java @@ -60,7 +60,7 @@ import com.att.cdp.zones.ContextFactory; import com.att.cdp.zones.model.Image; import com.att.cdp.zones.model.Server; import com.att.cdp.zones.model.Server.Status; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.woorea.openstack.keystone.model.Access.Service.Endpoint; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java index 7cba5fe52..a954a70a6 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java @@ -36,7 +36,7 @@ import org.junit.Test; import org.slf4j.MDC; import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java index 81351245f..9dc3938e6 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java @@ -35,8 +35,8 @@ import java.util.Map; import org.openecomp.appc.test.InterceptLogger; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; /** * This class is used as a test harness to wrap the call to an executor node. diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml index e66c9c8dd..158d67b5a 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml @@ -36,7 +36,7 @@ - odl-mdsal-broker + odl-mdsal-broker sdnc-sli mvn:org.openecomp.appc/appc-iaas-adapter-bundle/${project.version} diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml index b09e5593c..41af30ae4 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml @@ -93,13 +93,13 @@ 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 @@ -115,7 +115,7 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -169,9 +169,9 @@ org.openecomp.appc.adapter.netconf.AppcNetconfAdapterActivator org.openecomp.appc.adapter.netconf,org.openecomp.appc.adapter.netconf.dao,org.openecomp.appc.adapter.netconf.util,org.openecomp.appc.adapter.netconf.exception - !org.slf4j.event,org.w3c.dom.*,com.sun.org.apache.xerces.*,javax.sql.*,javax.sql.rowset.*,javax.xml.*,org.openecomp.appc.adapter.messaging.*,javax.crypto.*,org.openecomp.appc.common.exception.*,com.mysql.*,org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* + !org.slf4j.event,org.w3c.dom.*,com.sun.org.apache.xerces.*,javax.sql.*,javax.sql.rowset.*,javax.xml.*,org.openecomp.appc.adapter.messaging.*,javax.crypto.*,org.openecomp.appc.common.exception.*,com.mysql.*,org.onap.ccsdk.sli.core.sli.*,org.onap.ccsdk.sli.core.dblib,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* - *;scope=compile|runtime;artifactId=!sli-common|dblib-provider|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis|appc-dmaap-adapter-bundle + *;scope=compile|runtime;artifactId=!dblib-provider|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis|appc-dmaap-adapter-bundle true diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java index 3081b6b8b..c64fe8c80 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java @@ -25,7 +25,7 @@ package org.openecomp.appc.adapter.netconf; import org.openecomp.appc.adapter.netconf.internal.NetconfDataAccessServiceImpl; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; +import org.onap.ccsdk.sli.core.dblib.DbLibService; import org.openecomp.appc.i18n.Msg; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -72,7 +72,6 @@ public class AppcNetconfAdapterActivator implements BundleActivator { */ @Override public void start(BundleContext context) throws Exception { - if (registration == null) { clientFactory = new NetconfClientFactory(); factoryRegistration = context.registerService(NetconfClientFactory.class, clientFactory, null); @@ -81,7 +80,11 @@ public class AppcNetconfAdapterActivator implements BundleActivator { //set dblib service DbLibService dblibSvc = null; ServiceReference sref = context.getServiceReference(DbLibService.class.getName()); + try{ dblibSvc = (DbLibService)context.getService(sref); + }catch(Exception e){ + logger.error(e.getMessage()); + } DAService.setDbLibService(dblibSvc); /////////////////////////////////// factoryRegistration = context.registerService(NetconfDataAccessService.class, DAService, null); diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java index 00182d380..2167c9289 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java @@ -25,7 +25,7 @@ package org.openecomp.appc.adapter.netconf; import org.openecomp.appc.adapter.netconf.exception.DataAccessException; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; +import org.onap.ccsdk.sli.core.dblib.DbLibService; @SuppressWarnings("JavaDoc") diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java index 04088166d..a85ac13c8 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java @@ -31,7 +31,7 @@ import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails; import org.openecomp.appc.adapter.netconf.NetconfDataAccessService; import org.openecomp.appc.adapter.netconf.exception.DataAccessException; import org.openecomp.appc.adapter.netconf.util.Constants; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; +import org.onap.ccsdk.sli.core.dblib.DbLibService; import javax.sql.rowset.CachedRowSet; import java.sql.SQLException; diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml index 6a74bf2ef..9d46c8be0 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml @@ -24,7 +24,7 @@ - org.opendaylight.controller + org.opendaylight.mdsal features-mdsal features xml diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml index a3396db3d..9c878839a 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml @@ -32,10 +32,10 @@ - odl-mdsal-broker + odl-mdsal-broker mvn:org.openecomp.appc/appc-common/${project.version} - mvn:org.openecomp.sdnc.core/dblib-provider/${sdnctl.dblib.version} + mvn:org.onap.ccsdk.sli.core/dblib-provider/${sdnctl.dblib.version} mvn:org.openecomp.appc/appc-netconf-adapter-bundle/${project.version} diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml index d93e34bd4..8e26f5fb0 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml @@ -124,26 +124,26 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -199,7 +199,7 @@ appc-rest-adapter org.openecomp.appc.adapter.rest.RestActivator org.openecomp.appc.adapter.rest - org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* + org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* *;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis|jaxp-api true diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java index e39ef50b2..3cabd959d 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java @@ -101,8 +101,6 @@ public class RestActivator implements BundleActivator { logger.info(Msg.COMPONENT_INITIALIZING, appName, "rest adapter"); adapter = new RestAdapterImpl(); if (registration == null) { - logger.info(Msg.REGISTERING_SERVICE, appName, adapter.getAdapterName(), - RestAdapter.class.getSimpleName()); registration = context.registerService(RestAdapter.class, adapter, null); } diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java index 833b6c3f1..3acab7bc5 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java @@ -28,8 +28,8 @@ import java.util.Map; import org.openecomp.appc.exceptions.APPCException; import com.att.cdp.zones.model.Server; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; /** * This interface defines the operations that the provider adapter exposes. diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java index 6332658bd..38c1238cc 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java @@ -29,7 +29,7 @@ package org.openecomp.appc.adapter.rest.impl; import org.openecomp.appc.Constants; import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; /** * This class is used to track and maintain recovery and time-to-live information for a request as it is being diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java index 006e22a0a..772000518 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java @@ -42,7 +42,7 @@ import org.openecomp.appc.Constants; import org.openecomp.appc.adapter.rest.RestAdapter; import org.openecomp.appc.configuration.Configuration; import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Iterator; import java.util.Map; diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java index 754a4719f..205e772d1 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java @@ -54,7 +54,7 @@ import com.att.cdp.zones.Context; import com.att.cdp.zones.ContextFactory; import com.att.cdp.zones.model.Server; import com.att.cdp.zones.model.Server.Status; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; /** diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java index 2d3fd0edd..a9da29b99 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java @@ -34,8 +34,8 @@ import java.util.Map; import org.openecomp.appc.test.InterceptLogger; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; /** * This class is used as a test harness to wrap the call to an executor node. diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml index 76389abf9..2148dbb16 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml @@ -32,7 +32,7 @@ - odl-mdsal-broker + odl-mdsal-broker sdnc-sli mvn:org.openecomp.appc/appc-rest-adapter-bundle/${project.version} diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml index b8fdf9a4a..f45945d5b 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml @@ -119,26 +119,26 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common provided - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider provided - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider @@ -194,7 +194,7 @@ appc-rest-healthcheck-adapter org.openecomp.appc.adapter.restHealthcheck.RestHealthcheckActivator org.openecomp.appc.adapter.restHealthcheck - org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.security.auth.* + org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.security.auth.* *;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|xml-apis diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java index 433c22fea..201315caa 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java @@ -27,8 +27,8 @@ import java.util.Map; import org.openecomp.appc.exceptions.APPCException; import com.att.cdp.zones.model.Server; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; public interface RestHealthcheckAdapter extends SvcLogicJavaPlugin { diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java index b591c1f11..b7bb47640 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java @@ -28,7 +28,7 @@ package org.openecomp.appc.adapter.restHealthcheck.impl; import org.openecomp.appc.Constants; import org.openecomp.appc.configuration.Configuration; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class RequestContext { /** diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java index 1adb11243..094ef3ebe 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java @@ -62,7 +62,7 @@ import com.att.cdp.zones.model.ServerBootSource; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import org.slf4j.MDC; diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java index de18956de..106c44db9 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java @@ -53,7 +53,7 @@ import com.att.cdp.zones.Context; import com.att.cdp.zones.ContextFactory; import com.att.cdp.zones.model.Server; import com.att.cdp.zones.model.Server.Status; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java index 2d3fd0edd..a9da29b99 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java @@ -34,8 +34,8 @@ import java.util.Map; import org.openecomp.appc.test.InterceptLogger; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; /** * This class is used as a test harness to wrap the call to an executor node. diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml index 0342b2310..e60076de3 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml @@ -32,7 +32,7 @@ - odl-mdsal-broker + odl-mdsal-broker sdnc-sli mvn:org.openecomp.appc/appc-rest-healthcheck-adapter-bundle/${project.version} diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml index 6862eef49..99a1d71a4 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml @@ -12,7 +12,7 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java index 35781a8ac..08d66aaa6 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java @@ -24,7 +24,7 @@ package org.openecomp.appc.adapter.ssh; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; +import org.onap.ccsdk.sli.core.dblib.DbLibService; @SuppressWarnings("JavaDoc") diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml index 76601450e..abd52bd95 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml @@ -38,7 +38,7 @@ ${project.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java index 60d0907ac..87d85faef 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java @@ -30,7 +30,7 @@ import org.openecomp.appc.adapter.ssh.Constants; import org.openecomp.appc.adapter.ssh.SshConnectionDetails; import org.openecomp.appc.adapter.ssh.SshDataAccessException; import org.openecomp.appc.adapter.ssh.SshDataAccessService; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; +import org.onap.ccsdk.sli.core.dblib.DbLibService; import java.sql.SQLException; import java.util.ArrayList; diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml index d6fe397de..2482c6828 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -31,7 +31,7 @@ - + -- cgit 1.2.3-korg