Code Review
/
vfc
/
nfvo
/
driver
/
vnfm
/
svnfm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix docker start error
[vfc/nfvo/driver/vnfm/svnfm.git]
/
huawei
/
vnfmadapter
/
VnfmadapterService
/
service
/
src
/
main
/
resources
/
spring
/
Vnfmadapter
/
services.xml
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"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
- <c
ontext:property-placeholder location="classpath:jdbc
.properties" ignore-unresolvable="true"/>
+ <c
tx:property-placeholder location="classpath:config
.properties" ignore-unresolvable="true"/>
<bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
<bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>