Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B86E9200BCE for ; Fri, 18 Nov 2016 02:15:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B708C160B0F; Fri, 18 Nov 2016 01:15:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0D168160B0B for ; Fri, 18 Nov 2016 02:15:37 +0100 (CET) Received: (qmail 67331 invoked by uid 500); 18 Nov 2016 01:15:37 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 67322 invoked by uid 99); 18 Nov 2016 01:15:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2016 01:15:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2D4D0E0C0A; Fri, 18 Nov 2016 01:15:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reta@apache.org To: commits@cxf.apache.org Message-Id: <13d33fb6c1514179be113af7fc65752c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: CXF-7133: Clean up how default app is loaded and avoid extra XML configuration. This closes #199. Date: Fri, 18 Nov 2016 01:15:37 +0000 (UTC) archived-at: Fri, 18 Nov 2016 01:15:38 -0000 Repository: cxf Updated Branches: refs/heads/master fd9c2ed8d -> 4818e8aa5 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/4818e8aa Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4818e8aa Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4818e8aa Branch: refs/heads/master Commit: 4818e8aa5e2b3d3e36a2b6c7d04553e0c473638f Parents: fd9c2ed Author: John D. Ament Authored: Tue Nov 15 22:16:36 2016 -0500 Committer: reta Committed: Thu Nov 17 20:15:13 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/4818e8aa/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/4818e8aa/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 @@ - - -