Author: dkulp
Date: Thu Oct 11 10:29:48 2007
New Revision: 583891
URL: http://svn.apache.org/viewvc?rev=583891&view=rev
Log:
Merged revisions 583747 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r583747 | ningjiang | 2007-10-11 05:12:02 -0400 (Thu, 11 Oct 2007) | 1 line
CXF-1108 Made AbstractEndpointFactory's setServiceName and setEndpointName
work
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml?rev=583891&r1=583890&r2=583891&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
Thu Oct 11 10:29:48 2007
@@ -56,10 +56,10 @@
serviceClass="org.apache.hello_world_soap_http.GreeterImpl"
address="http://localhost:8080/simpleWithAddress";
bus="cxf"
- endpointName="e:HelloEndpointCustomized"
- serviceName="s:HelloServiceCustomized"
- xmlns:e="http://service.jaxws.cxf.apache.org/endpoint";
- xmlns:s="http://service.jaxws.cxf.apache.org/service";>
+ endpointName="e:SoapPort_Test1"
+ serviceName="s:SOAPService_Test1"
+ xmlns:e="http://apache.org/hello_world_soap_http";
+ xmlns:s="http://apache.org/hello_world_soap_http";>
<jaxws:invoker>
<bean class="org.apache.cxf.service.invoker.BeanInvoker">
<constructor-arg>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java?rev=583891&r1=583890&r2=583891&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
Thu Oct 11 10:29:48 2007
@@ -76,6 +76,15 @@
private ConduitSelector conduitSelector;
protected Endpoint createEndpoint() throws BusException, EndpointException
{
+
+ if (serviceName != null) {
+ serviceFactory.setServiceName(serviceName);
+ }
+
+ if (endpointName != null) {
+ serviceFactory.setEndpointName(endpointName);
+ }
+
Service service = serviceFactory.getService();
if (service == null) {
@@ -83,9 +92,6 @@
service = serviceFactory.create();
}
- if (serviceName != null) {
- serviceFactory.setServiceName(serviceName);
- }
if (endpointName == null) {
endpointName = serviceFactory.getEndpointName();
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java?rev=583891&r1=583890&r2=583891&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java
Thu Oct 11 10:29:48 2007
@@ -74,7 +74,7 @@
soapDF.setBus(bus);
dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/";, soapDF);
dfm.registerDestinationFactory("http://schemas.xmlsoap.org/soap/";,
soapDF);
-
dfm.registerDestinationFactory("http://cxf.apache.org/transports/local";,
soapDF);
+
LocalTransportFactory localTransport = new LocalTransportFactory();
dfm.registerDestinationFactory("http://schemas.xmlsoap.org/soap/http";,
localTransport);
@@ -83,10 +83,10 @@
dfm.registerDestinationFactory("http://cxf.apache.org/transports/local";,
localTransport);
ConduitInitiatorManager extension =
bus.getExtension(ConduitInitiatorManager.class);
- extension.registerConduitInitiator(LocalTransportFactory.TRANSPORT_ID,
localTransport);
-
extension.registerConduitInitiator("http://schemas.xmlsoap.org/wsdl/soap/";,
localTransport);
+
extension.registerConduitInitiator("http://cxf.apache.org/transports/local";,
localTransport);
+
extension.registerConduitInitiator("http://schemas.xmlsoap.org/wsdl/soap/http";,
localTransport);
extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/http";,
localTransport);
- extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/";,
localTransport);
+
extension.registerConduitInitiator("http://cxf.apache.org/bindings/xformat";,
localTransport);
}
private void invokeService(boolean isDirectDispatch) {
