Author: richard.opalka(a)jboss.com Date: 2010-05-27 08:24:02 -0400 (Thu, 27 May 2010) New Revision: 12358 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java Log: [JBWS-3041] final optimization - use NativeEndpointReference Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2010-05-27 11:00:05 UTC (rev 12357) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2010-05-27 12:24:02 UTC (rev 12358) @@ -24,7 +24,6 @@ import java.util.Observable; import javax.xml.ws.EndpointReference; -import javax.xml.ws.WebServiceException; import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.wsaddressing.W3CEndpointReference; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-05-27 11:00:05 UTC (rev 12357) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-05-27 12:24:02 UTC (rev 12358) @@ -31,13 +31,12 @@ import javax.xml.namespace.QName; import javax.xml.transform.dom.DOMSource; import javax.xml.ws.BindingType; -import javax.xml.ws.EndpointReference; -import javax.xml.ws.wsaddressing.W3CEndpointReference; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; +import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; @@ -137,9 +136,12 @@ throw new IllegalStateException("Only one EPR can be specified on port"); Element eprElement = portEPRs.get(0).getElement(); + + // construct Native EPR DOMSource eprInfoset = new DOMSource(eprElement); - EndpointReference epr = W3CEndpointReference.readFrom(eprInfoset); - endpointMD.setEndpointReference(epr); + NativeEndpointReference nativeEPR = (NativeEndpointReference)NativeEndpointReference.readFrom(eprInfoset); + nativeEPR.setAddress(endpointMD.getEndpointAddress()); + endpointMD.setEndpointReference(nativeEPR); } } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2010-05-27 11:00:05 UTC (rev 12357) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2010-05-27 12:24:02 UTC (rev 12358) @@ -43,7 +43,6 @@ import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.EndpointReference; import javax.xml.ws.WebServiceFeature; import javax.xml.ws.Service.Mode; @@ -62,6 +61,7 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.jaxws.client.DispatchBinding; +import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.extensions.wsrm.config.RMConfig; @@ -149,7 +149,7 @@ // The documentation edfined through the @Documentation annotation private String documentation; - private EndpointReference epr; + private NativeEndpointReference epr; private ConfigObservable configObservable = new ConfigObservable(); @@ -185,12 +185,12 @@ this.portName = portName; } - public EndpointReference getEndpointReference() + public NativeEndpointReference getEndpointReference() { return epr; } - public void setEndpointReference(final EndpointReference epr) + public void setEndpointReference(final NativeEndpointReference epr) { this.epr = epr; }