aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali <murali.p@huawei.com>2017-09-15 11:32:06 +0000
committerMurali <murali.p@huawei.com>2017-09-15 11:32:06 +0000
commitb81571ff1e882f02072cf8fae59e6578596e8f22 (patch)
tree867e2d4f11424e4dfa4d6ba01ba748e408efa4f9
parent9c047bd6d85476e5cf1d7f2b2c22c72f5894d5e5 (diff)
Move the configuration from sql to postgres
Change the JDBC configuration from mysql to postgres Change-Id: Id07fb33f4e986d946a40cfb7b605648e12eaee35 Jira:VNFSDK-78 Signed-off-by: Murali <murali.p@huawei.com>
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration postgres.xml35
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration.xml10
2 files changed, 5 insertions, 40 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration postgres.xml b/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration postgres.xml
deleted file mode 100644
index bb358546..00000000
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration postgres.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2017 Huawei Technologies Co., Ltd.
-
- 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.
--->
-<!DOCTYPE configuration
-PUBLIC "//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
- <environments default="development">
- <environment id="development">
- <transactionManager type="JDBC" />
- <dataSource type="UNPOOLED">
- <property name="driver" value="org.postgresql.Driver" />
- <property name="url" value="jdbc:postgresql://127.0.0.1:5432/marketplaceDB" />
- <property name="username" value="postgres" />
- <property name="password" value="postgres" />
- </dataSource>
- </environment>
- </environments>
- <mappers>
- <mapper resource="mybatis/sql/MarketplaceMapper.xml" />
- </mappers>
-</configuration> \ No newline at end of file
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration.xml b/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration.xml
index 76da57c8..bb358546 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration.xml
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/configuration/configuration.xml
@@ -21,11 +21,11 @@ PUBLIC "//mybatis.org//DTD Config 3.0//EN"
<environments default="development">
<environment id="development">
<transactionManager type="JDBC" />
- <dataSource type="POOLED">
- <property name="driver" value="com.mysql.jdbc.Driver" />
- <property name="url" value="jdbc:mysql://127.0.0.1:3306/marketplaceDB" />
- <property name="username" value="root" />
- <property name="password" value="Changeme_123" />
+ <dataSource type="UNPOOLED">
+ <property name="driver" value="org.postgresql.Driver" />
+ <property name="url" value="jdbc:postgresql://127.0.0.1:5432/marketplaceDB" />
+ <property name="username" value="postgres" />
+ <property name="password" value="postgres" />
</dataSource>
</environment>
</environments>