Merge "Issue #2928: Update DD WebContainer to allow loading properties from environment" into development
Former-commit-id:6514bab6d6
[formerlyad824c25ab
] [formerlyb99353b37d
] [formerly6514bab6d6
[formerlyad824c25ab
] [formerlyb99353b37d
] [formerly2b379eaedc
[formerlyb99353b37d
[formerly 560113a526caf0572dfcf6e0c4792a071f49f81c]]]] Former-commit-id:2b379eaedc
Former-commit-id:e6178a7569
[formerly6d25f536be
] [formerly 6b2bf9a9de2d53bf7dc9d52af04f1d0179689298 [formerly7f3172341c
]] Former-commit-id: 11fef4b20c95dd020aa280602324ab53a76afadf [formerly9fd986d8aa
] Former-commit-id:6ad2598934
This commit is contained in:
commit
49742248a1
1 changed files with 6 additions and 1 deletions
|
@ -1,12 +1,17 @@
|
||||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
|
||||||
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
|
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
|
||||||
|
xmlns:context="http://www.springframework.org/schema/context"
|
||||||
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||||
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
|
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
|
||||||
http://cxf.apache.org/jaxws
|
http://cxf.apache.org/jaxws
|
||||||
http://cxf.apache.org/schemas/jaxws.xsd
|
http://cxf.apache.org/schemas/jaxws.xsd
|
||||||
http://cxf.apache.org/jaxrs
|
http://cxf.apache.org/jaxrs
|
||||||
http://cxf.apache.org/schemas/jaxrs.xsd">
|
http://cxf.apache.org/schemas/jaxrs.xsd
|
||||||
|
http://www.springframework.org/schema/context
|
||||||
|
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
|
||||||
|
|
||||||
|
<context:property-placeholder />
|
||||||
|
|
||||||
<import resource="classpath:META-INF/cxf/cxf.xml" />
|
<import resource="classpath:META-INF/cxf/cxf.xml" />
|
||||||
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
|
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
|
||||||
|
|
Loading…
Add table
Reference in a new issue