summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGao Weitao <victor.gao@huawei.com>2018-05-25 03:23:34 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-25 03:23:34 +0000
commit4d197a486a575d2e5a80af913a268b5922dee36c (patch)
tree4cf222f1855eea639bf8c9256ea21411fa1d20d7
parentd4bb37c62a6360885145221928b1bd47f16b2bb9 (diff)
parent6449f094bf9993891570b6c0072f9b8aaaf7749a (diff)
Merge "fix docker start error"
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml
index f71aa51a..312365d1 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml
@@ -41,7 +41,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
- <context:property-placeholder location="classpath:jdbc.properties" ignore-unresolvable="true"/>
+ <ctx:property-placeholder location="classpath:config.properties" ignore-unresolvable="true"/>
<bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>