Repository: cxf Updated Branches: refs/heads/3.1.x-fixes f3207adb1 -> c70b431fa
CXF-7133: Clean up how default app is loaded and avoid extra XML configuration. This closes #199. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c70b431f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c70b431f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c70b431f Branch: refs/heads/3.1.x-fixes Commit: c70b431fa52dc571a8177a06d802d56c841278a9 Parents: f3207ad Author: John D. Ament <[email protected]> Authored: Tue Nov 15 22:16:36 2016 -0500 Committer: reta <[email protected]> Committed: Thu Nov 17 20:14:26 2016 -0500 ---------------------------------------------------------------------- .../cdi/src/main/java/org/apache/cxf/cdi/DefaultApplication.java | 2 ++ integration/cdi/src/main/resources/META-INF/beans.xml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c70b431f/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplication.java ---------------------------------------------------------------------- diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplication.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplication.java index 69a6077..f92752c 100644 --- a/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplication.java +++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplication.java @@ -18,9 +18,11 @@ */ package org.apache.cxf.cdi; +import javax.enterprise.inject.Vetoed; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; @ApplicationPath("/") +@Vetoed public class DefaultApplication extends Application { } http://git-wip-us.apache.org/repos/asf/cxf/blob/c70b431f/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 70c89e6..aff28d9 100644 --- a/integration/cdi/src/main/resources/META-INF/beans.xml +++ b/integration/cdi/src/main/resources/META-INF/beans.xml @@ -2,7 +2,4 @@ <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";> - <scan> - <exclude name="org.apache.cxf.cdi.DefaultApplication" /> - </scan> </beans>
