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

[dkulp]

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;
     }