From 76706005ee07da01fc3e00ed44ada720e29855b1 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Mon, 4 Sep 2017 21:37:25 -0700
Subject: Change to CCSDK and ODL Carbon

Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-Id: [APPC-91]
Issue-Id: [APPC-158]
---
 .../appc/adapter/netconf/AppcNetconfAdapterActivator.java          | 7 +++++--
 .../openecomp/appc/adapter/netconf/NetconfDataAccessService.java   | 2 +-
 .../adapter/netconf/internal/NetconfDataAccessServiceImpl.java     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src')

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;
-- 
cgit 1.2.3-korg