Code Review / vfc / nfvo / driver / vnfm / svnfm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 1: d4bb37c)
Merge "fix docker start error"
authorGao Weitao <victor.gao@huawei.com>
Fri, 25 May 2018 03:23:34 +0000 (03:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 25 May 2018 03:23:34 +0000 (03:23 +0000)
huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml patch | blob | history

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 f71aa51..312365d 100644 (file)
--- 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"/>
 
Specific VNFM drivers