Author: sergeyb
Date: Wed Nov 17 23:02:56 2010
New Revision: 1036271
URL: http://svn.apache.org/viewvc?rev=1036271&view=rev
Log:
[CXF-3021] Removing a reference to javax.wsdl.port from WSDLEndpointFactory
Modified:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
Modified:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=1036271&r1=1036270&r2=1036271&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
(original)
+++
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
Wed Nov 17 23:02:56 2010
@@ -20,7 +20,6 @@
package org.apache.cxf.binding.soap;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -30,7 +29,6 @@ import java.util.List;
import java.util.Set;
import javax.annotation.Resource;
-import javax.wsdl.Port;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
@@ -165,15 +163,16 @@ public class SoapTransportFactory extend
}
}
- public EndpointInfo createEndpointInfo(ServiceInfo serviceInfo,
BindingInfo b, Port port) {
+ public EndpointInfo createEndpointInfo(ServiceInfo serviceInfo,
BindingInfo b,
+ List<?> ees) {
String transportURI = "http://schemas.xmlsoap.org/wsdl/soap/";;
if (b instanceof SoapBindingInfo) {
SoapBindingInfo sbi = (SoapBindingInfo)b;
transportURI = sbi.getTransportURI();
}
EndpointInfo info = new SoapEndpointInfo(serviceInfo, transportURI);
- if (port != null) {
- List ees = port.getExtensibilityElements();
+
+ if (ees != null) {
for (Iterator itr = ees.iterator(); itr.hasNext();) {
Object extensor = itr.next();
@@ -190,6 +189,7 @@ public class SoapTransportFactory extend
}
}
}
+
return info;
}
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java?rev=1036271&r1=1036270&r2=1036271&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java
Wed Nov 17 23:02:56 2010
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.wsdl11;
-import javax.wsdl.Port;
+import java.util.List;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
@@ -26,10 +26,10 @@ import org.apache.cxf.service.model.Endp
import org.apache.cxf.service.model.ServiceInfo;
/**
- * A factory to create an internal {...@link EndpointInfo} from a WSDL4J
{...@link Port}.
+ * A factory to create an internal {...@link EndpointInfo} from WSDL Port
extensions.
*/
public interface WSDLEndpointFactory {
- EndpointInfo createEndpointInfo(ServiceInfo serviceInfo, BindingInfo b,
Port port);
+ EndpointInfo createEndpointInfo(ServiceInfo serviceInfo, BindingInfo b,
List<?> extensions);
void createPortExtensors(EndpointInfo ei, Service service);
}
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1036271&r1=1036270&r2=1036271&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Wed Nov 17 23:02:56 2010
@@ -21,6 +21,7 @@ package org.apache.cxf.wsdl11;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -444,7 +445,9 @@ public class WSDLServiceBuilder {
}
if (factory instanceof WSDLEndpointFactory) {
WSDLEndpointFactory wFactory = (WSDLEndpointFactory)factory;
- ei = wFactory.createEndpointInfo(service, bi, port);
+ ei = wFactory.createEndpointInfo(service, bi,
+ port == null ? Collections.emptyList()
+ :
port.getExtensibilityElements());
}
if (ei == null) {
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java?rev=1036271&r1=1036270&r2=1036271&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
Wed Nov 17 23:02:56 2010
@@ -26,7 +26,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.wsdl.Port;
import javax.wsdl.extensions.http.HTTPAddress;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.xml.namespace.QName;
@@ -71,10 +70,9 @@ public abstract class AbstractHTTPTransp
public EndpointInfo createEndpointInfo(
ServiceInfo serviceInfo,
BindingInfo b,
- Port port
+ List<?> ees
) {
- if (port != null) {
- List ees = port.getExtensibilityElements();
+ if (ees != null) {
for (Iterator itr = ees.iterator(); itr.hasNext();) {
Object extensor = itr.next();
@@ -98,6 +96,7 @@ public abstract class AbstractHTTPTransp
}
}
}
+
HttpEndpointInfo hei = new HttpEndpointInfo(serviceInfo,
"http://schemas.xmlsoap.org/wsdl/http/";);
AddressType at = new HttpAddressType();
