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 2008/11/24 08:03:08 UTC
svn commit: r720124 - in /cxf/branches/2.1.x-fixes: ./
rt/frontend/jaxws/src/main/resources/schemas/
rt/frontend/simple/src/main/java/org/apache/cxf/frontend/
rt/frontend/simple/src/main/resources/schemas/
rt/frontend/simple/src/test/java/org/apache/cx...
Author: ningjiang
Date: Sun Nov 23 23:03:08 2008
New Revision: 720124
URL: http://svn.apache.org/viewvc?rev=720124&view=rev
Log:
Merged revisions 720119 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r720119 | ningjiang | 2008-11-24 14:20:56 +0800 (Mon, 24 Nov 2008) | 1 line
CXF-1926 added the getter/setter of transportId on the ClientProxyFactoryBean
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 23 23:03:08 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281,718439,718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222,719273,719327,719354,719362,719368,719382,719649,719680
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281,718439,718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222,719273,719327,719354,719362,719368,719382,719649,719680,720119
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/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=720124&r1=720123&r2=720124&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 Sun Nov 23 23:03:08 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/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=720124&r1=720123&r2=720124&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java Sun Nov 23 23:03:08 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/branches/2.1.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd?rev=720124&r1=720123&r2=720124&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd Sun Nov 23 23:03:08 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/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java?rev=720124&r1=720123&r2=720124&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java Sun Nov 23 23:03:08 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/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml?rev=720124&r1=720123&r2=720124&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml Sun Nov 23 23:03:08 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"