3 files changed, 2 insertions, 80 deletions
diff --git a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/config/JndiConfiguration.java b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/config/JndiConfiguration.java
deleted file mode 100644
index 292372b..0000000
--- a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/config/JndiConfiguration.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openecomp
- * ================================================================================
- * Copyright (C) 2016 - 2017 AT&T
- * ================================================================================
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdnc.sli.resource.dblib.config;
-
-import java.util.Properties;
-
-public class JndiConfiguration extends BaseDBConfiguration{
-
-	public JndiConfiguration(Properties xmlElem) {
-		super(xmlElem);
-		// TODO Auto-generated constructor stub
-	}
-
-	public String getJndiConnectionName() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getJndiContextFactory() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getJndiURL() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getJndiSource() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void setJndiContextFactory(String jndiContextFactoryStr) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setJndiURL(String jndiURLStr) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/dblib/provider/src/main/resources/dblib.properties b/dblib/provider/src/main/resources/dblib.properties
index 0f28f1f..ac295c7 100755
--- a/dblib/provider/src/main/resources/dblib.properties
+++ b/dblib/provider/src/main/resources/dblib.properties
@@ -2,7 +2,7 @@ org.openecomp.sdnc.sli.dbtype=jdbc
 org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01,sdnctldb02
 org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://DBHOST:3306/sdnctl
 org.openecomp.sdnc.sli.jdbc.database=sdnctl
-org.openecomp.sdnc.sli.jdbc.user=sdnctl
+org.openecomp.sdnc.sli.jdbc.user={user for sdnctl}
 org.openecomp.sdnc.sli.jdbc.password={password for sdnctl}
 org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01
 
@@ -10,4 +10,4 @@ org.openecomp.sdnc.sli.jdbc.connection.timeout=50
 org.openecomp.sdnc.sli.jdbc.request.timeout=100
 org.openecomp.sdnc.sli.jdbc.limit.init=10
 org.openecomp.sdnc.sli.jdbc.limit.min=10
-org.openecomp.sdnc.sli.jdbc.limit.max=20
-\ No newline at end of file
+org.openecomp.sdnc.sli.jdbc.limit.max=20
diff --git a/dblib/provider/src/test/resources/dblib.properties b/dblib/provider/src/test/resources/dblib.properties
deleted file mode 100755
index e15e37a..0000000
--- a/dblib/provider/src/test/resources/dblib.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-org.openecomp.sdnc.sli.dbtype=jdbc
-
-org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01
-org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.database=sdnctl
-org.openecomp.sdnc.sli.jdbc.user=user
-org.openecomp.sdnc.sli.jdbc.password=password
-org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01
-
-org.openecomp.sdnc.sli.jdbc.connection.timeout=50
-org.openecomp.sdnc.sli.jdbc.request.timeout=100
-org.openecomp.sdnc.sli.jdbc.limit.init=10
-org.openecomp.sdnc.sli.jdbc.limit.min=10
-org.openecomp.sdnc.sli.jdbc.limit.max=20
-
-org.openecomp.dblib.connection.recovery=false
-\ No newline at end of file