Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7054A109AA for ; Mon, 26 Aug 2013 16:44:30 +0000 (UTC) Received: (qmail 39303 invoked by uid 500); 26 Aug 2013 16:44:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 39177 invoked by uid 500); 26 Aug 2013 16:44:29 -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 39169 invoked by uid 99); 26 Aug 2013 16:44:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 16:44:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 16:44:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E816823888A6; Mon, 26 Aug 2013 16:44:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1517595 - in /cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend: ClientProxyFactoryBean.java blueprint/SimpleBPNamespaceHandler.java Date: Mon, 26 Aug 2013 16:44:04 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130826164404.E816823888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Aug 26 16:44:04 2013 New Revision: 1517595 URL: http://svn.apache.org/r1517595 Log: Merged revisions 1517594 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1517594 | dkulp | 2013-08-26 12:32:21 -0400 (Mon, 26 Aug 2013) | 2 lines [CXF-5234] Fix problem of simple frontend blueprint proxies not being parsed. ........ Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=1517595&r1=1517594&r2=1517595&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java Mon Aug 26 16:44:04 2013 @@ -19,7 +19,6 @@ package org.apache.cxf.frontend; import java.io.Closeable; -import java.lang.reflect.Proxy; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -33,6 +32,7 @@ import org.apache.cxf.binding.BindingCon import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.common.classloader.ClassLoaderUtils.ClassLoaderHolder; import org.apache.cxf.common.injection.NoJSR250Annotations; +import org.apache.cxf.common.util.ProxyHelper; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.configuration.security.AuthorizationPolicy; import org.apache.cxf.databinding.DataBinding; @@ -122,9 +122,10 @@ public class ClientProxyFactoryBean exte */ public synchronized Object create() { ClassLoaderHolder orig = null; + ClassLoader loader = null; try { if (getBus() != null) { - ClassLoader loader = getBus().getExtension(ClassLoader.class); + loader = getBus().getExtension(ClassLoader.class); if (loader != null) { orig = ClassLoaderUtils.setThreadContextClassloader(loader); } @@ -171,7 +172,9 @@ public class ClientProxyFactoryBean exte Class classes[] = getImplementingClasses(); - Object obj = Proxy.newProxyInstance(clientFactoryBean.getServiceClass().getClassLoader(), + Object obj = ProxyHelper.getProxy(loader == null + ? clientFactoryBean.getServiceClass().getClassLoader() + : loader, classes, handler); Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java?rev=1517595&r1=1517594&r2=1517595&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java Mon Aug 26 16:44:04 2013 @@ -50,7 +50,7 @@ public class SimpleBPNamespaceHandler im if ("server".equals(s)) { return new ServerFactoryBeanDefinitionParser().parse(element, context); } else if ("client".equals(s)) { - //TODO + return new ClientProxyFactoryBeanDefinitionParser().parse(element, context); } return null; }