You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/06/23 17:00:25 UTC
svn commit: r957233 - in /cxf/branches/2.2.x-fixes: ./
api/src/main/java/org/apache/cxf/
api/src/main/java/org/apache/cxf/ws/addressing/
api/src/test/java/org/apache/cxf/
rt/core/src/main/java/org/apache/cxf/wsdl11/
rt/frontend/jaxws/src/main/java/org/...
Author: dkulp
Date: Wed Jun 23 15:00:24 2010
New Revision: 957233
URL: http://svn.apache.org/viewvc?rev=957233&view=rev
Log:
Merged revisions 957093 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r957093 | dkulp | 2010-06-22 21:00:11 -0400 (Tue, 22 Jun 2010) | 2 lines
Fix some issues where BindingProvider interface might not be loadable
from the classloader of the other interface.
........
Added:
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java
- copied unchanged from r957093, cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java
Removed:
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/NSManager.java
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/NSManagerTest.java
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/NSManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/NSManagerTest.java?rev=957233&r1=957232&r2=957233&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/NSManagerTest.java (original)
+++ cxf/branches/2.2.x-fixes/api/src/test/java/org/apache/cxf/NSManagerTest.java Wed Jun 23 15:00:24 2010
@@ -21,6 +21,8 @@ package org.apache.cxf;
import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.ws.addressing.NSManager;
+
import org.junit.Assert;
import org.junit.Test;
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?rev=957233&r1=957232&r2=957233&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java Wed Jun 23 15:00:24 2010
@@ -58,7 +58,6 @@ import org.w3c.dom.Element;
import com.ibm.wsdl.extensions.schema.SchemaImpl;
import org.apache.cxf.Bus;
-import org.apache.cxf.NSManager;
import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.XMLUtils;
@@ -76,6 +75,7 @@ import org.apache.cxf.service.model.Mess
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.ws.addressing.NSManager;
import org.apache.cxf.wsdl.WSDLManager;
/**
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=957233&r1=957232&r2=957233&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java Wed Jun 23 15:00:24 2010
@@ -101,7 +101,13 @@ public class JaxWsProxyFactoryBean exten
protected Class[] getImplementingClasses() {
Class cls = getClientFactoryBean().getServiceClass();
- return new Class[] {cls, BindingProvider.class};
+ Class ret[] = new Class[] {cls, BindingProvider.class};
+ try {
+ Proxy.getProxyClass(cls.getClassLoader(), ret);
+ } catch (Throwable t) {
+ ret = new Class[] {cls};
+ }
+ return ret;
}
/**