cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r780202 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend/jaxws/src/main/resources/schemas/ rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/
Date Sat, 30 May 2009 08:22:55 GMT
Author: ningjiang
Date: Sat May 30 08:22:51 2009
New Revision: 780202

URL: http://svn.apache.org/viewvc?rev=780202&view=rev
Log:
Merged revisions 780184 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r780184 | ningjiang | 2009-05-30 14:05:53 +0800 (Sat, 30 May 2009) | 1 line
  
  CXF-2246 Added the support to configure the transportId from jaxws:endpoint
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 30 08:22:51 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,780184

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=780202&r1=780201&r2=780202&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Sat May 30 08:22:51 2009
@@ -521,6 +521,14 @@
         this.implementorClass = implementorClass;
     }
     
+    public void setTransportId(String transportId) {        
+        serverFactory.setTransportId(transportId);
+    }
+    
+    public String getTransportId() {
+        return serverFactory.getTransportId();
+    }
+    
     public void setBindingConfig(BindingConfiguration config) {
         serverFactory.setBindingConfig(config);
     }

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd?rev=780202&r1=780201&r2=780202&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd Sat May
30 08:22:51 2009
@@ -149,8 +149,13 @@
           <xsd:attribute name="serviceName" type="xsd:QName">
             <xsd:annotation>
               <xsd:documentation>Specifies the value of the service's WSDL service
element's name attribute.</xsd:documentation>
-            </xsd:annotation>
+            </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/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java?rev=780202&r1=780201&r2=780202&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
Sat May 30 08:22:51 2009
@@ -87,7 +87,7 @@
             fail("can't get the right implementor object");
         }
         assertEquals("http://localhost:8080/simpleWithAddress",
-                     ep.getServer().getEndpoint().getEndpointInfo().getAddress());
+                     ep.getServer().getEndpoint().getEndpointInfo().getAddress());      
 
 
         bean = ctx.getBean("inlineImplementor");
         assertNotNull(bean);
@@ -114,6 +114,8 @@
         assertEquals("get the wrong bindingId",
                      ep.getBindingUri(),
                      "http://cxf.apache.org/bindings/xformat");
+        assertEquals("get a wrong transportId",
+                     "http://cxf.apache.org/transports/local", ep.getTransportId());
 
         bean = ctx.getBean("simpleWithBinding");
         assertNotNull(bean);

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml?rev=780202&r1=780201&r2=780202&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
Sat May 30 08:22:51 2009
@@ -36,7 +36,7 @@
               <value>http://cxf.apache.org/transports/local</value>
               <value>http://schemas.xmlsoap.org/soap/http</value>
               <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
-              <value>http://schemas.xmlsoap.org/wsdl/http/</value>
+              <value>http://schemas.xmlsoap.org/wsdl/http/</value>          
   
           </list>
       </property>
   </bean>
@@ -50,7 +50,8 @@
   
     <jaxws:endpoint id="simpleWithBindingUri" 
     implementor="#greeter" address="http://localhost:8080/simpeWithHttpBinding"
-    bindingUri="http://cxf.apache.org/bindings/xformat"/>
+    bindingUri="http://cxf.apache.org/bindings/xformat"
+    transportId="http://cxf.apache.org/transports/local"/>
     
   <jaxws:endpoint id="inlineImplementor" address="http://localhost:8080/simpleWithAddress2">
     <jaxws:implementor>



Mime
View raw message