cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r720119 - in /cxf/trunk/rt/frontend: jaxws/src/main/resources/schemas/ simple/src/main/java/org/apache/cxf/frontend/ simple/src/main/resources/schemas/ simple/src/test/java/org/apache/cxf/frontend/spring/
Date Mon, 24 Nov 2008 06:20:57 GMT
Author: ningjiang
Date: Sun Nov 23 22:20:56 2008
New Revision: 720119

URL: http://svn.apache.org/viewvc?rev=720119&view=rev
Log:
CXF-1926 added the getter/setter of transportId on the ClientProxyFactoryBean

Modified:
    cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
    cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd
    cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
    cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml

Modified: cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd?rev=720119&r1=720118&r2=720119&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd Sun Nov 23 22:20:56 2008
@@ -274,7 +274,11 @@
               <xsd:documentation>Specifies if the service should be automatically published.</xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
-          <xsd:attribute name="transportId" type="xsd:string"/>
+           <xsd:attribute name="transportId" type="xsd:string">
+        	<xsd:annotation>
+              <xsd:documentation>Specifies the transportId that endpoint will use,
it will override the transport which is defined in the wsdl.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
           <xsd:attribute name="wsdlLocation" type="xsd:string">
             <xsd:annotation>
               <xsd:documentation>Specifies the location of the endpoint's WSDL contract.
The WSDL contract's location is relative to the folder 
@@ -403,6 +407,11 @@
               <xsd:documentation>Specifies a password that is used for simple username/password
authentication.</xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
+          <xsd:attribute name="transportId" type="xsd:string">
+        	<xsd:annotation>
+              <xsd:documentation>Specifies the transportId that endpoint will use,
it will override the transport which is defined in the wsdl.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
           <xsd:attribute name="wsdlLocation" type="xsd:string">
             <xsd:annotation>
               <xsd:documentation>Specifies the location of the endpoint's WSDL contract.
The WSDL contract's location is relative to the folder 

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=720119&r1=720118&r2=720119&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
Sun Nov 23 22:20:56 2008
@@ -246,6 +246,14 @@
     public String getBindingId() {
         return clientFactoryBean.getBindingId();
     }
+    
+    public void setTransportId(String transportId) {
+        clientFactoryBean.setTransportId(transportId);
+    }
+    
+    public String getTransportId() {
+        return clientFactoryBean.getTransportId();
+    }
 
     public ReflectionServiceFactoryBean getServiceFactory() {
         return clientFactoryBean.getServiceFactory();

Modified: cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd?rev=720119&r1=720118&r2=720119&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd (original)
+++ cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd Sun Nov 23 22:20:56
2008
@@ -137,7 +137,11 @@
               <xsd:documentation>Specifies if the service should be automatically published.</xsd:documentation>
             </xsd:annotation>
         </xsd:attribute>
-        <xsd:attribute name="transportId" type="xsd:string"/>
+        <xsd:attribute name="transportId" type="xsd:string">
+        	<xsd:annotation>
+              <xsd:documentation>Specifies the transportId that endpoint will use,
it will override the transport which is defined in the wsdl.</xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
         <xsd:attribute name="wsdlLocation" type="xsd:string">
             <xsd:annotation>
               <xsd:documentation>Specifies the location of the endpoint's WSDL contract.
The WSDL contract's location is relative to the folder 
@@ -261,6 +265,11 @@
               <xsd:documentation>Specifies a password that is used for simple username/password
authentication.</xsd:documentation>
             </xsd:annotation>
         </xsd:attribute>
+        <xsd:attribute name="transportId" type="xsd:string">
+        	<xsd:annotation>
+              <xsd:documentation>Specifies the transportId that endpoint will use,
it will override the transport which is defined in the wsdl.</xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>        
         <xsd:attribute name="wsdlLocation" type="xsd:string">
             <xsd:annotation>
               <xsd:documentation>Specifies the location of the endpoint's WSDL contract.
The WSDL contract's location is relative to the folder 

Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java?rev=720119&r1=720118&r2=720119&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
Sun Nov 23 22:20:56 2008
@@ -129,13 +129,17 @@
         ClientProxyFactoryBean clientProxyFactoryBean =
             (ClientProxyFactoryBean) ctx.getBean("client2.proxyFactory");
         assertNotNull(clientProxyFactoryBean);
+        assertEquals("get the wrong transportId", 
+                     clientProxyFactoryBean.getTransportId(),
+                     "http://cxf.apache.org/transports/local");
 
         assertEquals("get the wrong bindingId",
                      clientProxyFactoryBean.getBindingId(),
                      "http://cxf.apache.org/bindings/xformat");
 
-        greeter = (HelloService) ctx.getBean("client2");
+        greeter = (HelloService) ctx.getBean("client2");        
         assertNotNull(greeter);
+     
 
         greeter = (HelloService) ctx.getBean("client3");
         assertNotNull(greeter);

Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml?rev=720119&r1=720118&r2=720119&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
(original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
Sun Nov 23 22:20:56 2008
@@ -71,7 +71,8 @@
     serviceName="s:XMLService"
     xmlns:s="http://apache.org/hello_world_soap_http"
     endpointName="s:XMLPort"
-    bindingId="http://cxf.apache.org/bindings/xformat">
+    bindingId="http://cxf.apache.org/bindings/xformat"
+    transportId="http://cxf.apache.org/transports/local">
    </simple:client>
 
    <simple:client id="client3"



Mime
View raw message