Author: asoldano Date: 2014-05-14 13:21:17 -0400 (Wed, 14 May 2014) New Revision: 18653 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java stack/cxf/trunk/pom.xml Log: [JBWS-3793] Use latest jbossws-spi Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2014-05-14 17:16:52 UTC (rev 18652) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2014-05-14 17:21:17 UTC (rev 18653) @@ -80,11 +80,10 @@ final WebServiceFeature[] portFeatures = this.getFeatures(targetClassName, serviceImplClass, serviceRef); String forcedAddress = null; //if there is no wsdlLocation, always use the local deployed endpoint address to initialize port - URL wsdlURL = this.getWsdlURL(serviceRef, serviceClass); - final QName serviceQName = this.getServiceQName(serviceRef, serviceClass); - if (wsdlURL == null && serviceRef.getDeployedServiceAddresses().get(serviceQName) != null) + if (getWsdlURL(serviceRef, serviceClass) == null) { - forcedAddress = serviceRef.getDeployedServiceAddresses().get(serviceQName); + final QName serviceQName = this.getServiceQName(serviceRef, serviceClass); + forcedAddress = serviceRef.getDeployedServiceAddress(serviceQName); } return instantiatePort(serviceClass, targetClass, serviceInstance, portQName, portFeatures, forcedAddress); @@ -228,16 +227,20 @@ final WebServiceFeature[] features = getFeatures(serviceRefMD); final QName serviceQName = this.getServiceQName(serviceRefMD, serviceClass); URL wsdlURL = this.getWsdlURL(serviceRefMD, serviceClass); - if (wsdlURL == null && serviceRefMD.getDeployedServiceAddresses().get(serviceQName) != null) + if (wsdlURL == null) { - try + final String deployedServiceAddress = serviceRefMD.getDeployedServiceAddress(serviceQName); + if (deployedServiceAddress != null) { - wsdlURL = new URL(serviceRefMD.getDeployedServiceAddresses().get(serviceQName) + "?wsdl"); + try + { + wsdlURL = new URL(deployedServiceAddress + "?wsdl"); + } + catch (MalformedURLException e) + { + //ignore + } } - catch (MalformedURLException e) - { - //ignore - } } Service target = null; if (serviceClass == Service.class) @@ -308,7 +311,7 @@ // use the @WebServiceClien(wsdlLocation=...) if the service ref wsdl location returned at this time would be null if (webServiceClientAnnotation.wsdlLocation().length() > 0) { - serviceRefMD.setWsdlOverride(webServiceClientAnnotation.wsdlLocation()); + return serviceRefMD.getWsdlLocation(webServiceClientAnnotation.wsdlLocation()); } } } Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2014-05-14 17:16:52 UTC (rev 18652) +++ stack/cxf/trunk/pom.xml 2014-05-14 17:21:17 UTC (rev 18653) @@ -62,11 +62,11 @@ <!-- Properties --> <properties> <jbossws.api.version>1.0.2.Final</jbossws.api.version> - <jbossws.spi.version>2.3.0.Final</jbossws.spi.version> - <jbossws.common.version>2.3.0.Final</jbossws.common.version> + <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> - <jbossws.jboss720.version>4.3.0.Final</jbossws.jboss720.version> - <jbossws.wildfly800.version>4.3.0.Final</jbossws.wildfly800.version> + <jbossws.jboss720.version>5.0.0-SNAPSHOT</jbossws.jboss720.version> + <jbossws.wildfly800.version>5.0.0-SNAPSHOT</jbossws.wildfly800.version> <jbossws.native.version>4.2.0.Final</jbossws.native.version> <jboss720.version>7.2.0.Final</jboss720.version> <wildfly800.version>8.0.0.Final</wildfly800.version>