Author: asoldano
Date: Wed Aug 18 14:35:40 2010
New Revision: 986704
URL: http://svn.apache.org/viewvc?rev=986704&view=rev
Log:
[CXF-2845] Modifying JAXWS 2.2 Endpoint impl to use the new http_jaxws_spi
transport
Modified:
cxf/trunk/rt/frontend/jaxws/pom.xml
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/EndpointImpl.java
Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=986704&r1=986703&r2=986704&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Wed Aug 18 14:35:40 2010
@@ -184,9 +184,13 @@
<id>jaxws22</id>
<dependencies>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jaxws-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <version>1.0</version>
</dependency>
</dependencies>
<properties>
@@ -227,7 +231,6 @@
<artifactItem>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <version>1.0</version>
<outputDirectory>${basedir}/target/endorsed</outputDirectory>
</artifactItem>
</artifactItems>
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/EndpointImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/EndpointImpl.java?rev=986704&r1=986703&r2=986704&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/EndpointImpl.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/jaxws22/EndpointImpl.java
Wed Aug 18 14:35:40 2010
@@ -23,7 +23,9 @@ import javax.xml.ws.EndpointContext;
import javax.xml.ws.WebServiceFeature;
import org.apache.cxf.Bus;
+import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.cxf.transport.http_jaxws_spi.JAXWSHttpSpiTransportFactory;
/**
*
@@ -104,7 +106,11 @@ public class EndpointImpl extends org.ap
//new in 2.2, but introduces a new class not found in 2.1
public void publish(javax.xml.ws.spi.http.HttpContext context) {
- super.publish(context);
+ ServerFactoryBean serverFactory = getServerFactory();
+ if (serverFactory.getDestinationFactory() == null) {
+ serverFactory.setDestinationFactory(new
JAXWSHttpSpiTransportFactory(getBus(), context));
+ }
+ super.publish(context.getPath());
}
}