Author: dkulp
Date: Wed Nov 20 18:21:07 2013
New Revision: 1543896
URL: http://svn.apache.org/r1543896
Log:
Get the grizzly container tests to pass.
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java
cxf/trunk/systests/container-integration/grizzly/pom.xml
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImpl.java?rev=1543896&r1=1543895&r2=1543896&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImpl.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImpl.java
Wed Nov 20 18:21:07 2013
@@ -23,6 +23,7 @@ import java.io.IOException;
import javax.xml.ws.spi.http.HttpExchange;
import javax.xml.ws.spi.http.HttpHandler;
+import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.wsdl.http.AddressType;
@@ -53,6 +54,8 @@ public class HttpHandlerImpl extends Htt
ei.setAddress(contextPath + path);
if (ei.getExtensor(AddressType.class) != null) {
ei.getExtensor(AddressType.class).setLocation(contextPath + path);
+ } else if (ei.getExtensor(SoapAddress.class) != null) {
+
ei.getExtensor(SoapAddress.class).setLocationURI(contextPath + path);
}
}
}
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java?rev=1543896&r1=1543895&r2=1543896&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java
Wed Nov 20 18:21:07 2013
@@ -23,12 +23,13 @@ import java.io.IOException;
import javax.xml.ws.spi.http.HttpContext;
import org.apache.cxf.Bus;
+import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
+import org.apache.cxf.transport.http.DestinationRegistryImpl;
-public class JAXWSHttpSpiTransportFactory extends HTTPTransportFactory
implements DestinationFactory {
+public class JAXWSHttpSpiTransportFactory extends SoapTransportFactory
implements DestinationFactory {
private HttpContext context;
private JAXWSHttpSpiDestination destination;
@@ -40,7 +41,7 @@ public class JAXWSHttpSpiTransportFactor
public Destination getDestination(EndpointInfo endpointInfo, Bus bus)
throws IOException {
if (destination == null) {
- destination = new JAXWSHttpSpiDestination(bus, registry,
endpointInfo);
+ destination = new JAXWSHttpSpiDestination(bus, new
DestinationRegistryImpl(), endpointInfo);
// set handler into the provided HttpContext, our Destination hook
into the server container
HttpHandlerImpl handler = new HttpHandlerImpl(destination);
context.setHandler(handler);
Modified: cxf/trunk/systests/container-integration/grizzly/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/container-integration/grizzly/pom.xml?rev=1543896&r1=1543895&r2=1543896&view=diff
==============================================================================
--- cxf/trunk/systests/container-integration/grizzly/pom.xml (original)
+++ cxf/trunk/systests/container-integration/grizzly/pom.xml Wed Nov 20
18:21:07 2013
@@ -83,6 +83,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
