cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
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 GMT
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 <johndament@apache.org>
Authored: Tue Nov 15 22:16:36 2016 -0500
Committer: reta <drreta@gmail.com>
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 @@
 <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>


Mime
View raw message