Remove mysql dependencies in sli/core

Remove lingering mysql dependencies in sli/core, which prevented odlsli
container from starting up clean.  Note: tested this using bareodl container
and verified that these changes install clean AFTER changing incorrect
driver property name in dblib.properties.  This patch is fine, but a second
patch to ccsdk/distribution is needed to fix that property file.

Change-Id: I6a900d1c29998867bfbae29d5e113c4e392a8bb9
Issue-ID: CCSDK-95
Signed-off-by: Dan Timoney <dtimoney@att.com>

3 files changed, 24 insertions, 26 deletions

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java
index 71926e41..1e4b71cd 100644
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java
@@ -73,7 +73,7 @@ public class SvcLogicJdbcStore implements SvcLogicStore {
 		jdbcProps.setProperty("password", dbPasswd);
 
 		try {
-			Driver dvr = new com.mysql.jdbc.Driver();
+			Driver dvr = new org.mariadb.jdbc.Driver();
 			if (dvr.acceptsURL(dbUrl))
 			{
 				LOG.debug("Driver com.mysql.jdbc.Driver accepts {}", dbUrl);
diff --git a/sli/features/src/main/resources/features.xml b/sli/features/src/main/resources/features.xml
index 692d9ff0..1f17c1a9 100644
--- a/sli/features/src/main/resources/features.xml
+++ b/sli/features/src/main/resources/features.xml
@@ -33,7 +33,7 @@
         <bundle>mvn:org.onap.ccsdk.sli.core/sli-provider/${project.version}</bundle>
         <bundle>mvn:org.onap.ccsdk.sli.core/sli-recording/${project.version}</bundle>
         <feature>sdnc-dblib</feature>
-        <bundle>mvn:org/mariadb/jdbc/mariadb-java-client/${mariadb.connector.version}</bundle>
+        <bundle>mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version}</bundle>
     </feature>
 
 </features>
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicActivator.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicActivator.java
index 4a13000a..a578dc6a 100644
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicActivator.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicActivator.java
@@ -8,9 +8,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,7 +41,6 @@ import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mysql.jdbc.Driver;
 
 public class SvcLogicActivator implements BundleActivator {
 
@@ -76,47 +75,47 @@ public class SvcLogicActivator implements BundleActivator {
 	private static LinkedList<ServiceRegistration> registrations = new LinkedList<ServiceRegistration>();
 
 	private static HashMap<String, SvcLogicAdaptor> adaptorMap = null;
-	
+
 	private static final Logger LOG = LoggerFactory
 			.getLogger(SvcLogicActivator.class);
-	
+
 	private static Properties props = null;
 
 	private static BundleContext bundleCtx = null;
-	
+
 	private static SvcLogicService svcLogicServiceImpl = null;
-	
+
 	@Override
 	public void start(BundleContext ctx) throws Exception {
 
 		LOG.info("Activating SLI");
-		
+
 		bundleCtx = ctx;
 
 		// Read properties
 		props = new Properties();
 		String propPath = System.getenv(SVCLOGIC_PROP_VAR);
-		
+
 		if (propPath == null) {
 			String propDir = System.getenv(SDNC_CONFIG_DIR);
 			if (propDir == null) {
-				
+
 				propDir = "/opt/sdnc/data/properties";
 			}
 			propPath = propDir + "/svclogic.properties";
 			LOG.warn("Environment variable "+SVCLOGIC_PROP_VAR+" unset - defaulting to "+propPath);
 		}
-		
+
 		File propFile = new File(propPath);
-		
+
 		if (!propFile.exists()) {
-			
+
 			throw new ConfigurationException(
 					"Missing configuration properties file : "
 							+ propFile);
 		}
 		try {
-			
+
 			props.load(new FileInputStream(propFile));
 		} catch (Exception e) {
 			throw new ConfigurationException(
@@ -168,15 +167,14 @@ public class SvcLogicActivator implements BundleActivator {
 			registrations = null;
 		}
 	}
-	
+
 	public static SvcLogicStore getStore() throws SvcLogicException {
 		// Create and initialize SvcLogicStore object - used to access
 		// saved service logic.
-		
+
 		SvcLogicStore store = null;
-		
+
 		try {
-			Driver dvr = new Driver();
 			store = SvcLogicStoreFactory.getSvcLogicStore(props);
 		} catch (Exception e) {
 			throw new ConfigurationException(
@@ -190,12 +188,12 @@ public class SvcLogicActivator implements BundleActivator {
 			throw new ConfigurationException(
 					"Could not get service logic store", e);
 		}
-		
+
 		return(store);
 	}
-	
+
 	private static void registerNodeTypes(SvcLogicStore store) throws SvcLogicException {
-		
+
 		if (store == null) {
 			return;
 		}
@@ -213,13 +211,13 @@ public class SvcLogicActivator implements BundleActivator {
 			registrations.add(reg);
 
 			store.registerNodeType(nodeType);
-			
+
 			LOG.info("SLI - registering node executor");
-			
+
 			((SvcLogicServiceImpl)svcLogicServiceImpl).registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
 
 		}
-		
+
 	}
 
 }