Repository: cxf Updated Branches: refs/heads/master 156fd30dc -> ba0573f20
CXF-7319: cdi extension uses wrong namespace for beans.xml. This closes #257. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ba0573f2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ba0573f2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ba0573f2 Branch: refs/heads/master Commit: ba0573f202208b5e3feb881173d3df0dfc2a02ba Parents: 156fd30 Author: Dennis Kieselhorst <[email protected]> Authored: Thu Apr 13 13:39:51 2017 +0200 Committer: reta <[email protected]> Committed: Sat Apr 15 13:37:50 2017 -0400 ---------------------------------------------------------------------- .../samples/jax_rs/sse_cdi/src/main/resources/META-INF/beans.xml | 2 +- .../jax_rs/sse_spring/src/main/resources/META-INF/beans.xml | 2 +- integration/cdi/src/main/resources/META-INF/beans.xml | 2 +- rt/rs/sse/src/main/resources/META-INF/beans.xml | 2 +- systests/cdi/base/src/main/resources/META-INF/beans.xml | 2 +- .../cdi-multiple-apps-owb/src/test/resources/META-INF/beans.xml | 2 +- .../cdi-owb/cdi-no-apps-owb/src/test/resources/META-INF/beans.xml | 2 +- .../cdi-multiple-apps-weld/src/test/resources/META-INF/beans.xml | 2 +- .../cdi-no-apps-weld/src/test/resources/META-INF/beans.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/META-INF/beans.xml b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/META-INF/beans.xml index 7e2559b..c17c9c2 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/META-INF/beans.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"; version="1.1"> <scan> http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/META-INF/beans.xml b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/META-INF/beans.xml index 7e2559b..c17c9c2 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/META-INF/beans.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"; version="1.1"> <scan> http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/integration/cdi/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/integration/cdi/src/main/resources/META-INF/beans.xml b/integration/cdi/src/main/resources/META-INF/beans.xml index aff28d9..8d1007d 100644 --- a/integration/cdi/src/main/resources/META-INF/beans.xml +++ b/integration/cdi/src/main/resources/META-INF/beans.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd";> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd";> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/rt/rs/sse/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/rt/rs/sse/src/main/resources/META-INF/beans.xml b/rt/rs/sse/src/main/resources/META-INF/beans.xml index aff28d9..8d1007d 100644 --- a/rt/rs/sse/src/main/resources/META-INF/beans.xml +++ b/rt/rs/sse/src/main/resources/META-INF/beans.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd";> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd";> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/systests/cdi/base/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/systests/cdi/base/src/main/resources/META-INF/beans.xml b/systests/cdi/base/src/main/resources/META-INF/beans.xml index 2f48c57..5446495 100644 --- a/systests/cdi/base/src/main/resources/META-INF/beans.xml +++ b/systests/cdi/base/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd";> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd";> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/resources/META-INF/beans.xml b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/resources/META-INF/beans.xml index 2f48c57..5446495 100644 --- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/resources/META-INF/beans.xml +++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd";> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd";> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/resources/META-INF/beans.xml b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/resources/META-INF/beans.xml index 2f48c57..5446495 100644 --- a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/resources/META-INF/beans.xml +++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd";> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd";> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/resources/META-INF/beans.xml b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/resources/META-INF/beans.xml index 2f48c57..5446495 100644 --- a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/resources/META-INF/beans.xml +++ b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd";> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd";> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/ba0573f2/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/resources/META-INF/beans.xml b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/resources/META-INF/beans.xml index 2f48c57..5446495 100644 --- a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/resources/META-INF/beans.xml +++ b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_1.xsd";> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd";> </beans>
