You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2007/10/11 11:12:03 UTC

svn commit: r583747 - in /incubator/cxf/trunk: rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ systests/src/test/java/org/apache/cxf/systest/local_transport/

Author: ningjiang
Date: Thu Oct 11 02:12:02 2007
New Revision: 583747

URL: http://svn.apache.org/viewvc?rev=583747&view=rev
Log:
CXF-1108 Made AbstractEndpointFactory's setServiceName and setEndpointName work

Modified:
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml?rev=583747&r1=583746&r2=583747&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml Thu Oct 11 02:12:02 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/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java?rev=583747&r1=583746&r2=583747&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java Thu Oct 11 02:12:02 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/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java?rev=583747&r1=583746&r2=583747&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java Thu Oct 11 02:12:02 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) {



Re: svn commit: r583747 - in /incubator/cxf/trunk: rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ systests/src/test/java/org/apache/cxf/systest/local_transport/

Posted by Willem Jiang <ni...@iona.com>.
Hi Glen ,

Please see my comments in the mail.

Glen Mazza wrote:
> Am Donnerstag, den 11.10.2007, 09:12 +0000 schrieb ningjiang@apache.org:
>   
>> Author: ningjiang
>> Date: Thu Oct 11 02:12:02 2007
>> New Revision: 583747
>>
>> URL: http://svn.apache.org/viewvc?rev=583747&view=rev
>> Log:
>> CXF-1108 Made AbstractEndpointFactory's setServiceName and setEndpointName work
>>
>> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java
>> URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java?rev=583747&r1=583746&r2=583747&view=diff
>> ==============================================================================
>> --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java (original)
>> +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java Thu Oct 11 02:12:02 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);
>> (A) +        extension.registerConduitInitiator("http://schemas.xmlsoap.org/wsdl/soap/http", localTransport);
>> (B)         extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/http", localTransport);
>>     
>
> Are you sure that (A) above is valid?  It does not resolve to a web page
> like (B) does.
>
> Regards,
> Glen
>
>   
I can't find it form WSDL1.1 sepecification and am not sure about it.
I just want to override the name space which http transport factory 
register.

Willem.
>> -        extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/", localTransport);
>> +        extension.registerConduitInitiator("http://cxf.apache.org/bindings/xformat", localTransport);
>>      }
>>  
>>      private void invokeService(boolean isDirectDispatch) {
>>
>>
>>     
>
>   

Re: svn commit: r583747 - in /incubator/cxf/trunk: rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ systests/src/test/java/org/apache/cxf/systest/local_transport/

Posted by Glen Mazza <gl...@verizon.net>.
Am Donnerstag, den 11.10.2007, 09:12 +0000 schrieb ningjiang@apache.org:
> Author: ningjiang
> Date: Thu Oct 11 02:12:02 2007
> New Revision: 583747
> 
> URL: http://svn.apache.org/viewvc?rev=583747&view=rev
> Log:
> CXF-1108 Made AbstractEndpointFactory's setServiceName and setEndpointName work
> 
> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java
> URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java?rev=583747&r1=583746&r2=583747&view=diff
> ==============================================================================
> --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java (original)
> +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java Thu Oct 11 02:12:02 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);
> (A) +        extension.registerConduitInitiator("http://schemas.xmlsoap.org/wsdl/soap/http", localTransport);
> (B)         extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/http", localTransport);

Are you sure that (A) above is valid?  It does not resolve to a web page
like (B) does.

Regards,
Glen

> -        extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/", localTransport);
> +        extension.registerConduitInitiator("http://cxf.apache.org/bindings/xformat", localTransport);
>      }
>  
>      private void invokeService(boolean isDirectDispatch) {
> 
>