From commits-return-8201-archive-asf-public=cust-asf.ponee.io@openwebbeans.apache.org Fri May 10 16:07:50 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 7D3DA18061A for ; Fri, 10 May 2019 18:07:50 +0200 (CEST) Received: (qmail 31710 invoked by uid 500); 10 May 2019 16:07:49 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 31699 invoked by uid 99); 10 May 2019 16:07:49 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 May 2019 16:07:49 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 34A1C3A05E4 for ; Fri, 10 May 2019 16:07:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1859085 - in /openwebbeans/meecrowave/trunk: meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java pom.xml Date: Fri, 10 May 2019 16:07:48 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190510160749.34A1C3A05E4@svn01-us-west.apache.org> Author: rmannibucau Date: Fri May 10 16:07:48 2019 New Revision: 1859085 URL: http://svn.apache.org/viewvc?rev=1859085&view=rev Log: MEECROWAVE-191 cxf 3.3.2 Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java openwebbeans/meecrowave/trunk/pom.xml Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java?rev=1859085&r1=1859084&r2=1859085&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java Fri May 10 16:07:48 2019 @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Typed; import javax.inject.Inject; import javax.inject.Named; import javax.servlet.ServletContext; @@ -35,8 +36,9 @@ import org.apache.cxf.message.Message; import org.apache.meecrowave.Meecrowave; @Named("cxf") +@Typed({MeecrowaveBus.class, Bus.class}) @ApplicationScoped -public class MeecrowaveBus implements Bus { +public class MeecrowaveBus implements Bus, ClassUnwrapper { private final ConfigurableBus delegate = new ConfigurableBus(); protected MeecrowaveBus() { @@ -45,7 +47,7 @@ public class MeecrowaveBus implements Bu @Inject public MeecrowaveBus(final ServletContext context) { - setProperty(ClassUnwrapper.class.getName(), (ClassUnwrapper) this::getRealClass); + setProperty(ClassUnwrapper.class.getName(), this); final ClassLoader appLoader = context.getClassLoader(); setExtension(appLoader, ClassLoader.class); // ServletController locks on the classloader otherwise @@ -60,11 +62,16 @@ public class MeecrowaveBus implements Bu /** * Unwrap all proxies and get the real underlying class * for detecting annotations, etc. - * @param o - * @return + * @param o the instance to analyze. + * @return the class to introspect. */ - protected Class getRealClass(Object o) { - final Class aClass = o.getClass(); + @Override + public Class getRealClass(Object o) { + return getRealClassFromClass(o.getClass()); + } + + @Override + public Class getRealClassFromClass(final Class aClass) { if (aClass.getName().contains("$$")) { Class realClass = aClass.getSuperclass(); if (realClass == Object.class || realClass.isInterface()) { Modified: openwebbeans/meecrowave/trunk/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1859085&r1=1859084&r2=1859085&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/pom.xml (original) +++ openwebbeans/meecrowave/trunk/pom.xml Fri May 10 16:07:48 2019 @@ -52,7 +52,7 @@ 4.12 9.0.19 2.0.10 - 3.3.1 + 3.3.2 1.1.10 2.11.1 1.8.2 @@ -217,8 +217,8 @@ - + + cxf-staging + https://repository.apache.org/content/repositories/orgapachecxf-1141/ + + true + + + false + + +