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 2013/05/31 20:46:48 UTC
svn commit: r1488351 - in /cxf/branches/dkulp-nowsdl4j:
api/src/main/resources/schemas/wsdl/ rt/transports/http/
rt/transports/http/src/main/java/org/apache/cxf/transport/http/
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/
rt/trans...
Author: dkulp
Date: Fri May 31 18:46:48 2013
New Revision: 1488351
URL: http://svn.apache.org/r1488351
Log:
Get transports/http building and testing (and is now javax.wsdl free except for the optional extension loader)
Modified:
cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb
cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xsd
cxf/branches/dkulp-nowsdl4j/rt/transports/http/pom.xml
cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java
cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java
cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
cxf/branches/dkulp-nowsdl4j/testutils/pom.xml
Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb (original)
+++ cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb Fri May 31 18:46:48 2013
@@ -19,18 +19,7 @@
-->
<jaxb:bindings version="1.0"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
- jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema">
- <jaxb:schemaBindings>
- <jaxb:package name="org.apache.cxf.wsdl"/>
- </jaxb:schemaBindings>
- <jaxb:globalBindings generateIsSetMethod="true"/>
- </jaxb:bindings>
- <!--jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema/xs:complexType[@name='tExtensibilityElement']">
- <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
- </jaxb:bindings-->
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
<jaxb:bindings schemaLocation="http.xsd" node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl.http"/>
Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xsd?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xsd (original)
+++ cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xsd Fri May 31 18:46:48 2013
@@ -35,44 +35,32 @@ No other rights are granted by implicati
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
targetNamespace="http://schemas.xmlsoap.org/wsdl/http/">
- <import namespace = "http://schemas.xmlsoap.org/wsdl/"
- schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"/>
-
<element name="address" type="http:addressType"/>
<complexType name="addressType">
- <complexContent>
- <extension base="wsdl:tExtensibilityElement">
- <sequence/>
- <attribute name="location" type="anyURI" use="required"/>
- </extension>
- </complexContent>
+ <sequence/>
+ <attribute name="location" type="anyURI" use="required"/>
+ <anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
</complexType>
<element name="binding" type="http:bindingType"/>
<complexType name="bindingType">
- <complexContent>
- <extension base="wsdl:tExtensibilityElement">
- <sequence/>
- <attribute name="verb" type="NMTOKEN" use="required"/>
- </extension>
- </complexContent>
+ <sequence/>
+ <attribute name="verb" type="NMTOKEN" use="required"/>
+ <anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
</complexType>
<element name="operation" type="http:operationType"/>
<complexType name="operationType">
- <complexContent>
- <extension base="wsdl:tExtensibilityElement">
- <sequence/>
- <attribute name="location" type="anyURI" use="required"/>
- </extension>
- </complexContent>
+ <sequence/>
+ <attribute name="location" type="anyURI" use="required"/>
+ <anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
</complexType>
<element name="urlEncoded">
- <complexType/>
+ <complexType/>
</element>
<element name="urlReplacement">
- <complexType/>
- </element>
+ <complexType/>
+ </element>
</schema>
Modified: cxf/branches/dkulp-nowsdl4j/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/transports/http/pom.xml?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/transports/http/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/transports/http/pom.xml Fri May 31 18:46:48 2013
@@ -78,6 +78,12 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-wsdl</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified: cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Fri May 31 18:46:48 2013
@@ -76,7 +76,6 @@ import org.apache.cxf.transport.https.Ce
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
-import org.apache.cxf.wsdl.WSDLLibrary;
/**
* Common base for HTTP Destination implementations.
@@ -487,7 +486,7 @@ public abstract class AbstractHTTPDestin
if (pde != null) {
server = pde.getServerEndpointPolicy(endpointInfo, this, new ServerPolicyCalculator());
}
- if (null == server && WSDLLibrary.isAvailable()) {
+ if (null == server) {
server = endpointInfo.getTraversedExtensor(
new HTTPServerPolicy(), HTTPServerPolicy.class);
}
Modified: cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java Fri May 31 18:46:48 2013
@@ -31,9 +31,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Resource;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
@@ -51,8 +48,6 @@ import org.apache.cxf.transport.Destinat
import org.apache.cxf.transport.servlet.ServletDestinationFactory;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl.http.AddressType;
-import org.apache.cxf.wsdl11.WSDLEndpointFactory;
-
/**
*
@@ -60,7 +55,7 @@ import org.apache.cxf.wsdl11.WSDLEndpoin
@NoJSR250Annotations(unlessNull = "bus")
public class HTTPTransportFactory
extends AbstractTransportFactory
- implements WSDLEndpointFactory, ConduitInitiator, DestinationFactory {
+ implements ConduitInitiator, DestinationFactory {
public static final List<String> DEFAULT_NAMESPACES
@@ -134,15 +129,7 @@ public class HTTPTransportFactory
for (Iterator<?> itr = ees.iterator(); itr.hasNext();) {
Object extensor = itr.next();
- if (extensor instanceof HTTPAddress) {
- final HTTPAddress httpAdd = (HTTPAddress)extensor;
-
- EndpointInfo info = new HttpEndpointInfo(serviceInfo,
- "http://schemas.xmlsoap.org/wsdl/http/");
- info.setAddress(httpAdd.getLocationURI());
- info.addExtensor(httpAdd);
- return info;
- } else if (extensor instanceof AddressType) {
+ if (extensor instanceof AddressType) {
final AddressType httpAdd = (AddressType)extensor;
EndpointInfo info =
@@ -157,7 +144,7 @@ public class HTTPTransportFactory
HttpEndpointInfo hei = new HttpEndpointInfo(serviceInfo,
"http://schemas.xmlsoap.org/wsdl/http/");
- AddressType at = new HttpAddressType();
+ AddressType at = new AddressType();
hei.addExtensor(at);
return hei;
@@ -211,25 +198,6 @@ public class HTTPTransportFactory
}
}
- private static class HttpAddressType extends AddressType
- implements HTTPAddress, SOAPAddress {
- private static final long serialVersionUID = 7048265985129995746L;
-
- public HttpAddressType() {
- super();
- setElementType(new QName("http://schemas.xmlsoap.org/wsdl/soap/", "address"));
- }
-
- public String getLocationURI() {
- return getLocation();
- }
-
- public void setLocationURI(String locationURI) {
- setLocation(locationURI);
- }
-
- }
-
/**
* This call creates a new HTTPConduit for the endpoint. It is equivalent
* to calling getConduit without an EndpointReferenceType.
Modified: cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java Fri May 31 18:46:48 2013
@@ -19,7 +19,6 @@
package org.apache.cxf.transport.http;
-import javax.wsdl.extensions.ExtensibilityElement;
import javax.xml.bind.JAXBException;
import org.apache.cxf.Bus;
@@ -46,7 +45,7 @@ public final class HTTPWSDLExtensionLoad
}
public void createExtensor(WSDLManager manager,
Class<?> parentType,
- Class<? extends ExtensibilityElement> elementType) {
+ Class<?> elementType) {
try {
JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
parentType,
Modified: cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java Fri May 31 18:46:48 2013
@@ -23,7 +23,6 @@ import java.net.URI;
import javax.servlet.http.HttpServletRequest;
import org.apache.cxf.transport.AbstractDestination;
-import org.apache.cxf.wsdl.WSDLLibrary;
import org.apache.cxf.wsdl.http.AddressType;
public final class BaseUrlHelper {
@@ -58,8 +57,7 @@ public final class BaseUrlHelper {
public static void setAddress(AbstractDestination dest, String absAddress) {
dest.getEndpointInfo().setAddress(absAddress);
- if (WSDLLibrary.isAvailable()
- && dest.getEndpointInfo().getExtensor(AddressType.class) != null) {
+ if (dest.getEndpointInfo().getExtensor(AddressType.class) != null) {
dest.getEndpointInfo().getExtensor(AddressType.class).setLocation(absAddress);
}
}
Modified: cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb Fri May 31 18:46:48 2013
@@ -22,14 +22,6 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema">
- <jaxb:schemaBindings>
- <jaxb:package name="org.apache.cxf.wsdl"/>
- </jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
- </jaxb:bindings>
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema/xs:complexType[@name='tExtensibilityElement']">
- <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
- </jaxb:bindings>
</jaxb:bindings>
Modified: cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd Fri May 31 18:46:48 2013
@@ -44,351 +44,345 @@
<xs:annotation>
<xs:documentation>Properties used for configuring a server-side HTTP prort</xs:documentation>
</xs:annotation>
+ <xs:sequence></xs:sequence>
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibilityElement">
-
- <xs:attribute name="ReceiveTimeout" type="xs:unsignedInt" use="optional" default="30000">
- <xs:annotation>
- <xs:documentation>
- Receive timeout in milliseconds, 0 is infinite
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="SuppressClientSendErrors" type="xs:boolean" use="optional" default="false">
- <xs:annotation>
- <xs:documentation>
- When set to false, exceptions will be thrown when an error is encountered
- receiving a request from the client. When set to true these errors will
- be suppressed. The default is false.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="SuppressClientReceiveErrors" type="xs:boolean" use="optional" default="false">
- <xs:annotation>
- <xs:documentation>
- When set to false, exceptions will be thrown when an error is encountered
- sending a reply from to client. When set to true these errors will be
- suppressed. The default is false.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="HonorKeepAlive" type="xs:boolean" use="optional" default="true">
- <xs:annotation>
- <xs:documentation>
- When set to true, the request socket will remain open after the reply is
- sent to the client, if the client has requested keep-alive and is using
- at least version 1.1 of HTTP. If set to false, the socket will be closed
- after each reply is sent, even if the client requests the server to keep
- the connection alive. Keep-Alive improves performance for the client
- requesting such behavior, but can limit overall scalability of the server
- for handling many clients. The Default is true.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="KeepAliveParameters" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- If KeepAlive connections are turned on, this allows sending additional
- parameters back to the client via the Keep-Alive header. Common
- parameters are timeout and max to specify how long the client should
- hold open the connection and how many connections to hold open. Different
- clients may have different defaults. For Java HTTPUrlConnection, the
- defaults would be timeout=5, max=5
-
- Example: timeout=60, max=5;
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="RedirectURL" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- A URL to which clients are redirected (if the ReplyCode and ReplyDescription
- are not set, ReplyCode will be set to 302, and ReplyDescription will be set
- to 'Object Moved').
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="CacheControl" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Most commonly used to specify no-cache, however the standard supports a
- dozen or so caching related directives for responses.
- </xs:documentation>
- </xs:annotation>
-
- </xs:attribute>
-
- <xs:attribute name="ContentLocation" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the URL representing the resource used to satisfy the request(e.g., to inform that default.htm document was used.)
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="ContentType" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the MIME type used for responses. The default is set by the binding.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="ContentEncoding" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies any additional encoding applied to the response. Values are specified using IANA labels.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="ServerType" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies an optional value for the HTTP ServerType property.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
+ <xs:attribute name="ReceiveTimeout" type="xs:unsignedInt" use="optional" default="30000">
+ <xs:annotation>
+ <xs:documentation>
+ Receive timeout in milliseconds, 0 is infinite
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="SuppressClientSendErrors" type="xs:boolean" use="optional" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ When set to false, exceptions will be thrown when an error is encountered
+ receiving a request from the client. When set to true these errors will
+ be suppressed. The default is false.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="SuppressClientReceiveErrors" type="xs:boolean" use="optional" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ When set to false, exceptions will be thrown when an error is encountered
+ sending a reply from to client. When set to true these errors will be
+ suppressed. The default is false.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="HonorKeepAlive" type="xs:boolean" use="optional" default="true">
+ <xs:annotation>
+ <xs:documentation>
+ When set to true, the request socket will remain open after the reply is
+ sent to the client, if the client has requested keep-alive and is using
+ at least version 1.1 of HTTP. If set to false, the socket will be closed
+ after each reply is sent, even if the client requests the server to keep
+ the connection alive. Keep-Alive improves performance for the client
+ requesting such behavior, but can limit overall scalability of the server
+ for handling many clients. The Default is true.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="KeepAliveParameters" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ If KeepAlive connections are turned on, this allows sending additional
+ parameters back to the client via the Keep-Alive header. Common
+ parameters are timeout and max to specify how long the client should
+ hold open the connection and how many connections to hold open. Different
+ clients may have different defaults. For Java HTTPUrlConnection, the
+ defaults would be timeout=5, max=5
+
+ Example: timeout=60, max=5;
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="RedirectURL" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ A URL to which clients are redirected (if the ReplyCode and ReplyDescription
+ are not set, ReplyCode will be set to 302, and ReplyDescription will be set
+ to 'Object Moved').
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="CacheControl" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Most commonly used to specify no-cache, however the standard supports a
+ dozen or so caching related directives for responses.
+ </xs:documentation>
+ </xs:annotation>
+
+ </xs:attribute>
+
+ <xs:attribute name="ContentLocation" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the URL representing the resource used to satisfy the request(e.g., to inform that default.htm document was used.)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="ContentType" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the MIME type used for responses. The default is set by the binding.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="ContentEncoding" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies any additional encoding applied to the response. Values are specified using IANA labels.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="ServerType" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies an optional value for the HTTP ServerType property.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
+
</xs:complexType>
<xs:complexType name="HTTPClientPolicy">
<xs:annotation>
<xs:documentation>Properties used to configure a client-side HTTP port</xs:documentation>
</xs:annotation>
-
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibilityElement">
-
- <xs:attribute name="ConnectionTimeout" type="ptp:ParameterizedUInt" use="optional" default="30000">
- <xs:annotation>
- <xs:documentation>
- Specifies the amount of time, in milliseconds, that the consumer will attempt to establish a connection before it times out. 0 is infinite.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="ReceiveTimeout" type="ptp:ParameterizedUInt" use="optional" default="60000">
- <xs:annotation>
- <xs:documentation>
- Specifies the amount of time, in milliseconds, that the consumer will wait for a response before it times out. 0 is infinite.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="AsyncExecuteTimeout" type="ptp:ParameterizedUInt" use="optional" default="5000">
- <xs:annotation>
- <xs:documentation>
- Specifies the amount of time, in milliseconds, that a conduit will try and enqueue the response on the workqueue.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="AsyncExecuteTimeoutRejection" type="ptp:ParameterizedBoolean" use="optional" default="false">
- <xs:annotation>
- <xs:documentation>
- Specifies whether the conduit should throw and exception if it fails to enqueue the async response handling onto the workqueue.
- By default, if the conduit fails to enqueue the response handling on the workqueue, it will process the response on the current thread. Set this to true to raise and exception instead.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="AutoRedirect" type="ptp:ParameterizedBoolean" use="optional" default="false">
- <xs:annotation>
- <xs:documentation>
- Specifies if the consumer will automatically follow a server issued redirection.
- (name is not part of standard)
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="MaxRetransmits" type="ptp:ParameterizedInt" use="optional" default="-1">
- <xs:annotation>
- <xs:documentation>
- Specifies the maximum amount of retransmits that are allowed for redirects. Retransmits for
- authorization is included in the retransmit count. Each redirect may cause another
- retransmit for a UNAUTHORIZED response code, ie. 401.
- Any negative number indicates unlimited retransmits,
- although, loop protection is provided.
- The default is unlimited.
- (name is not part of standard)
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="AllowChunking" type="ptp:ParameterizedBoolean" use="optional" default="true">
- <xs:annotation>
- <xs:documentation>
- If true, the client is free to use chunking streams if it wants, but it is not
- required to use chunking streams. If false, the client
- must use regular, non-chunked requests in all cases.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="ChunkingThreshold" type="ptp:ParameterizedInt" use="optional" default="4096">
- <xs:annotation>
- <xs:documentation>
- If AllowChunking is true, this sets the threshold at which messages start
- getting chunked. Messages under this limit do not get chunked.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="ChunkLength" type="ptp:ParameterizedInt" use="optional" default="-1">
- <xs:annotation>
- <xs:documentation>Specifies the chunk length for a HttpURLConnection. This value is used in java.net.HttpURLConnection.setChunkedStreamingMode(int chunklen). chunklen indicates the number of bytes to write in each chunk. If chunklen is less than or equal to zero, a default value will be used.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Accept" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the MIME types the client is prepared to handle (e.g., HTML, JPEG, GIF, etc.)
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="AcceptLanguage" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the language the client desires (e.g., English, French, etc.)
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="AcceptEncoding" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the encoding the client is prepared to handle (e.g., gzip)
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="ContentType" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the content type of the stream being sent in a post request.
- (this should be text/xml for web services, or can be set to
- application/x-www-form-urlencoded if the client is sending form data).
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="Host" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the Internet host and port number of the resource on which the request is being invoked.
- This is sent by default based upon the URL. Certain DNS scenarios or
- application designs may request you to set this, but typically it is
- not required.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="Connection" type="http-conf:connectionType" use="optional" default="Keep-Alive">
- <xs:annotation>
- <xs:documentation>
- The connection disposition. If close the connection to the server is closed
- after each request/response dialog. If Keep-Alive the client requests the server
- to keep the connection open, and if the server honors the keep alive request,
- the connection is reused. Many servers and proxies do not honor keep-alive requests.
- </xs:documentation>
- </xs:annotation>
-
- </xs:attribute>
-
- <xs:attribute name="CacheControl" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Most commonly used to specify no-cache, however the standard supports a
- dozen or so caching related directives for requests
- </xs:documentation>
- </xs:annotation>
-
- </xs:attribute>
-
- <xs:attribute name="Cookie" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies a cookie to send to the server. Some stateful session designs will use cookies to identify a session.
- If the cookie is static, you can supply it here. If it is dynamic,
- it will need to be set by the server on first access, and can be handled
- automatically by the runtime.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="BrowserType" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- aka User-Agent
- Specifies the type of browser is sending the request. This is usually only
- needed when sites have HTML customized to Netscape vs IE, etc, but can
- also be used to optimize for different SOAP stacks.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="Referer" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the URL that referred us to this URL. This is
- sent automatically with auto redirect.
-
- May allow the server to optimize processing based upon
- previous task flow. However, typically not used in
- web services applications.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="DecoupledEndpoint" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the URL of a decoupled endpoint for the receipt of responses over a separate provider->consumer connection.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <!--Proxy server attributes-->
- <xs:attribute name="ProxyServer" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the address of proxy server if one is used.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="ProxyServerPort" type="ptp:ParameterizedInt" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the port number used by the proxy server.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="NonProxyHosts" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>
- Specifies the list of hostnames that will not use the proxy configuration.
- Examples of value:
- * "localhost" -> A single hostname
- * "localhost|www.google.com" -> 2 hostnames that will not use the proxy configuration
- * "localhost|www.google.*|*.apache.org" -> It's also possible to use a pattern-like value
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="ProxyServerType" type="http-conf:proxyServerType" use="optional" default="HTTP">
- <xs:annotation>
- <xs:documentation>
- Specifies the type of the proxy server. Can be either HTTP or SOCKS.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
+ <xs:sequence/>
+ <xs:attribute name="ConnectionTimeout" type="ptp:ParameterizedUInt" use="optional" default="30000">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the amount of time, in milliseconds, that the consumer will attempt to establish a connection before it times out. 0 is infinite.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="ReceiveTimeout" type="ptp:ParameterizedUInt" use="optional" default="60000">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the amount of time, in milliseconds, that the consumer will wait for a response before it times out. 0 is infinite.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="AsyncExecuteTimeout" type="ptp:ParameterizedUInt" use="optional" default="5000">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the amount of time, in milliseconds, that a conduit will try and enqueue the response on the workqueue.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="AsyncExecuteTimeoutRejection" type="ptp:ParameterizedBoolean" use="optional" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies whether the conduit should throw and exception if it fails to enqueue the async response handling onto the workqueue.
+ By default, if the conduit fails to enqueue the response handling on the workqueue, it will process the response on the current thread. Set this to true to raise and exception instead.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="AutoRedirect" type="ptp:ParameterizedBoolean" use="optional" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies if the consumer will automatically follow a server issued redirection.
+ (name is not part of standard)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="MaxRetransmits" type="ptp:ParameterizedInt" use="optional" default="-1">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the maximum amount of retransmits that are allowed for redirects. Retransmits for
+ authorization is included in the retransmit count. Each redirect may cause another
+ retransmit for a UNAUTHORIZED response code, ie. 401.
+ Any negative number indicates unlimited retransmits,
+ although, loop protection is provided.
+ The default is unlimited.
+ (name is not part of standard)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="AllowChunking" type="ptp:ParameterizedBoolean" use="optional" default="true">
+ <xs:annotation>
+ <xs:documentation>
+ If true, the client is free to use chunking streams if it wants, but it is not
+ required to use chunking streams. If false, the client
+ must use regular, non-chunked requests in all cases.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="ChunkingThreshold" type="ptp:ParameterizedInt" use="optional" default="4096">
+ <xs:annotation>
+ <xs:documentation>
+ If AllowChunking is true, this sets the threshold at which messages start
+ getting chunked. Messages under this limit do not get chunked.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="ChunkLength" type="ptp:ParameterizedInt" use="optional" default="-1">
+ <xs:annotation>
+ <xs:documentation>Specifies the chunk length for a HttpURLConnection. This value is used in java.net.HttpURLConnection.setChunkedStreamingMode(int chunklen). chunklen indicates the number of bytes to write in each chunk. If chunklen is less than or equal to zero, a default value will be used.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="Accept" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the MIME types the client is prepared to handle (e.g., HTML, JPEG, GIF, etc.)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="AcceptLanguage" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the language the client desires (e.g., English, French, etc.)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="AcceptEncoding" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the encoding the client is prepared to handle (e.g., gzip)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="ContentType" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the content type of the stream being sent in a post request.
+ (this should be text/xml for web services, or can be set to
+ application/x-www-form-urlencoded if the client is sending form data).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="Host" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the Internet host and port number of the resource on which the request is being invoked.
+ This is sent by default based upon the URL. Certain DNS scenarios or
+ application designs may request you to set this, but typically it is
+ not required.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="Connection" type="http-conf:connectionType" use="optional" default="Keep-Alive">
+ <xs:annotation>
+ <xs:documentation>
+ The connection disposition. If close the connection to the server is closed
+ after each request/response dialog. If Keep-Alive the client requests the server
+ to keep the connection open, and if the server honors the keep alive request,
+ the connection is reused. Many servers and proxies do not honor keep-alive requests.
+ </xs:documentation>
+ </xs:annotation>
+
+ </xs:attribute>
+
+ <xs:attribute name="CacheControl" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Most commonly used to specify no-cache, however the standard supports a
+ dozen or so caching related directives for requests
+ </xs:documentation>
+ </xs:annotation>
+
+ </xs:attribute>
+
+ <xs:attribute name="Cookie" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies a cookie to send to the server. Some stateful session designs will use cookies to identify a session.
+ If the cookie is static, you can supply it here. If it is dynamic,
+ it will need to be set by the server on first access, and can be handled
+ automatically by the runtime.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="BrowserType" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ aka User-Agent
+ Specifies the type of browser is sending the request. This is usually only
+ needed when sites have HTML customized to Netscape vs IE, etc, but can
+ also be used to optimize for different SOAP stacks.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="Referer" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the URL that referred us to this URL. This is
+ sent automatically with auto redirect.
+
+ May allow the server to optimize processing based upon
+ previous task flow. However, typically not used in
+ web services applications.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="DecoupledEndpoint" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the URL of a decoupled endpoint for the receipt of responses over a separate provider->consumer connection.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <!--Proxy server attributes-->
+ <xs:attribute name="ProxyServer" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the address of proxy server if one is used.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="ProxyServerPort" type="ptp:ParameterizedInt" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the port number used by the proxy server.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="NonProxyHosts" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the list of hostnames that will not use the proxy configuration.
+ Examples of value:
+ * "localhost" -> A single hostname
+ * "localhost|www.google.com" -> 2 hostnames that will not use the proxy configuration
+ * "localhost|www.google.*|*.apache.org" -> It's also possible to use a pattern-like value
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="ProxyServerType" type="http-conf:proxyServerType" use="optional" default="HTTP">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the type of the proxy server. Can be either HTTP or SOCKS.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
</xs:complexType>
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java Fri May 31 18:46:48 2013
@@ -65,7 +65,7 @@ import org.apache.cxf.staxutils.StaxUtil
public class JAXBExtensionHelper implements ExtensionSerializer, ExtensionDeserializer {
private static final Logger LOG = LogUtils.getL7dLogger(JAXBExtensionHelper.class);
- final Class<? extends ExtensibilityElement> typeClass;
+ final Class<?> typeClass;
final String namespace;
String jaxbNamespace;
@@ -73,7 +73,7 @@ public class JAXBExtensionHelper impleme
private Set<Class<?>> classes;
- public JAXBExtensionHelper(Class<? extends ExtensibilityElement> cls,
+ public JAXBExtensionHelper(Class<?> cls,
String ns) {
typeClass = cls;
namespace = ns;
@@ -106,13 +106,13 @@ public class JAXBExtensionHelper impleme
}
public static void addExtensions(ExtensionRegistry registry,
Class<?> parentType,
- Class<? extends ExtensibilityElement> cls)
+ Class<?> cls)
throws JAXBException {
addExtensions(registry, parentType, cls, null);
}
public static void addExtensions(ExtensionRegistry registry,
Class<?> parentType,
- Class<? extends ExtensibilityElement> cls,
+ Class<?> cls,
String namespace) throws JAXBException {
JAXBExtensionHelper helper = new JAXBExtensionHelper(cls, namespace);
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java Fri May 31 18:46:48 2013
@@ -28,11 +28,12 @@ import javax.xml.namespace.QName;
* Implements the <code>ExtensibilityElement</code> interface.
*/
public class TExtensibilityElementImpl
- extends TExtensibilityElement
implements ExtensibilityElement {
@XmlTransient()
QName elementType;
+
+ private Boolean required;
/**
* Returns the type of this extensibility element.
@@ -56,7 +57,7 @@ public class TExtensibilityElementImpl
* @return Boolean
*/
public Boolean getRequired() {
- return isSetRequired() ? isRequired() : null;
+ return required;
}
public void setRequired(Boolean value) {
this.required = value;
Modified: cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java (original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java Fri May 31 18:46:48 2013
@@ -32,7 +32,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.jaxws.spi.ProviderImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
Modified: cxf/branches/dkulp-nowsdl4j/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/testutils/pom.xml?rev=1488351&r1=1488350&r2=1488351&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/testutils/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/testutils/pom.xml Fri May 31 18:46:48 2013
@@ -45,6 +45,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-wsdl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<scope>provided</scope>