Switch to MariaDB connector

Change-Id: Id1528890cef60da6e1c4ace760550aad8116a40b
Issue-ID: VID-83
Signed-off-by: Ofir Sonsino <os0695@att.com>

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties
index b64869f..0332a1c 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties
@@ -28,8 +28,8 @@ org.quartz.jobStore.clusterCheckinInterval = 20000
 # Configure Datasources  \r
 #============================================================================\r
 \r
-org.quartz.dataSource.myDS.driver = com.mysql.jdbc.Driver\r
-org.quartz.dataSource.myDS.URL = jdbc:mysql://${VID_MYSQL_HOST}:${VID_MYSQL_PORT}/${VID_MYSQL_DBNAME}\r
+org.quartz.dataSource.myDS.driver = org.mariadb.jdbc.Driver\r
+org.quartz.dataSource.myDS.URL = jdbc:mariadb://${VID_MYSQL_HOST}:${VID_MYSQL_PORT}/${VID_MYSQL_DBNAME}\r
 org.quartz.dataSource.myDS.user = ${VID_MYSQL_USER}\r
 org.quartz.dataSource.myDS.password = ${VID_MYSQL_PASS}\r
 org.quartz.dataSource.myDS.maxConnections = ${VID_MYSQL_MAXCONNECTIONS}\r

diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/quartz.properties b/vid-app-common/src/test/resources/WEB-INF/conf/quartz.properties
index 81f2bbc..bbbb497 100644 (file)
--- a/vid-app-common/src/test/resources/WEB-INF/conf/quartz.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/conf/quartz.properties
@@ -28,8 +28,8 @@ org.quartz.jobStore.clusterCheckinInterval = 20000
 # Configure Datasources  
 #============================================================================
 
-org.quartz.dataSource.myDS.driver = com.mysql.jdbc.Driver
-org.quartz.dataSource.myDS.URL = jdbc:mysql://localhost:3306/vid_portal
+org.quartz.dataSource.myDS.driver = org.mariadb.jdbc.Driver
+org.quartz.dataSource.myDS.URL = jdbc:mariadb://localhost:3306/vid_openecomp_epsdk
 org.quartz.dataSource.myDS.user = euser
 org.quartz.dataSource.myDS.password = euser
 org.quartz.dataSource.myDS.maxConnections = 5

diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties.cml b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties.cml
index bc4040e..9c8b03c 100644 (file)
--- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties.cml
+++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties.cml
@@ -42,15 +42,11 @@ decryption_key                                = AGLDdG4D04BKm2IxIWEr8o==
 #hb.dialect=org.hibernate.dialect.PostgreSQLDialect
 #hb.show_sql=true
 
-       db.connectionURL = jdbc:mysql://demeter.homer.att.com:3306/ecomp_sdk_1707_att
-       db.userName = portal
-       db.password = P0rt@l
-
 
 
 #Mysql
-db.driver = com.mysql.jdbc.Driver
-#db.connectionURL = jdbc:mysql://localhost:3306/ecomp_sdk
+db.driver = org.mariadb.jdbc.Driver
+#db.connectionURL = jdbc:mariadb://localhost:3306/vid_openecomp_epsdk
 #db.userName = ecomp_sdk_user
 #db.password = ecomp_sdk_pass
 db.hib.dialect = org.hibernate.dialect.MySQLDialect