Author: ningjiang Date: Sun Nov 23 23:46:07 2008 New Revision: 720131 URL: http://svn.apache.org/viewvc?rev=720131&view=rev Log: Merged revisions 720124 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r720124 | ningjiang | 2008-11-24 15:03:08 +0800 (Mon, 24 Nov 2008) | 9 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java (props changed) Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 23 23:46:07 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327,719354,719362,719368,719382,719649 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,720124 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327,719354,719362,719368,719382,719649,720119 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd?rev=720131&r1=720130&r2=720131&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd Sun Nov 23 23:46:07 2008 @@ -30,103 +30,394 @@ <xsd:import namespace="http://cxf.apache.org/configuration/beans"; schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/> <xsd:element name="endpoint"> + <xsd:annotation> + <xsd:documentation>Configures a JAX-WS server. This element is associated with the org.apache.cxf.jaxws.EndpointImpl object.</xsd:documentation> + </xsd:annotation> <xsd:complexType> <xsd:complexContent> <xsd:extension base="beans:identifiedType"> <xsd:all> - <xsd:element name="binding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="executor" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="handlers" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="implementor" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="properties" type="beans:mapType" minOccurs="0"/> + <xsd:element name="binding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the message binding used by the endpoint. Message bindings are configured using implementations of the + org.apache.cxf.binding.BindingFactory interface. The SOAP binding is configured using the soap:soapBinding bean.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the data binding used by the endpoint. The class implementing the JAXB data binding is org.apache.cxf.jaxb.JAXBDataBinding.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="executor" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures a Java executor to handle the service.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="features" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of beans that configure advanced features like WS-RM.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="handlers" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of JAX-WS handlers to add to the endpoint's processing chain.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="implementor" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the bean implementing the service. If this child is used you should not use the implementor attribute.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming requests.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies an implementation of the org.apache.cxf.service.Invoker interface to be used by the service. The Invoker + implementation controls how a service is invoked. For example, it controls if each request is handled by a new instance of the + service implementation or if state is preserved across invocations.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing responses.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="properties" type="beans:mapType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a map of properties that are passed to the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name="schemaLocations" type="schemasType" minOccurs="0"/> <xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/> </xsd:all> <xsd:attributeGroup ref="cxf-beans:beanAttributes"/> - <xsd:attribute name="address" type="xsd:string" /> - <xsd:attribute name="bindingUri" type="xsd:string" /> - <xsd:attribute name="bus" type="xsd:string" /> - <xsd:attribute name="implementor" type="xsd:string"/> - <xsd:attribute name="implementorClass" type="xsd:string"/> - <xsd:attribute name="publish" type="xsd:boolean" default="true"/> + <xsd:attribute name="address" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the HTTP address of the endpoint. This value will override the value specified in the services + contract.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bindingUri" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the data binding the service will use. For SOAP bindings the IDs are defined in the JAX-WS + specification. For other data bindings, the ID is the namespace of the WSDL extensions used to configure the + binding.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bus" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the Spring bean configuring the bus managing the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="implementor" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the class implementing the service. You can specify the implementation class using either the class + name or an ID reference to a Spring bean configuring the implementation class. This class needs to be on the + classpath.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="implementorClass" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the name of the class implementing the service. This attribute is useful when you specify the implementor + with the ref bean which is wrapped by using Spring AOP.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="publish" type="xsd:boolean" default="true"> + <xsd:annotation> + <xsd:documentation>Specifies if the service should be automatically published.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> <xsd:attribute name="publishedEndpointUrl" type="xsd:string"/> - <xsd:attribute name="endpointName" type="xsd:QName" /> - <xsd:attribute name="serviceName" type="xsd:QName" /> - <xsd:attribute name="wsdlLocation" type="xsd:string" /> + <xsd:attribute name="endpointName" type="xsd:QName"> + <xsd:annotation> + <xsd:documentation>Specifies the value of the service's WSDL port element's name attribute.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <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: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 + from which the service is deployed.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> </xsd:element> <xsd:element name="server"> + <xsd:annotation> + <xsd:documentation>Configures a JAX-WS server. The element is associated with the org.apache.cxf.jaxws.support.JaxWsServerFactoryBean object.</xsd:documentation> + </xsd:annotation> <xsd:complexType> <xsd:complexContent> <xsd:extension base="beans:identifiedType"> <xsd:all> - <xsd:element name="binding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="executor" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="handlers" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="properties" type="beans:mapType" minOccurs="0"/> + <xsd:element name="binding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the message binding used by the endpoint. Message bindings are configured using implementations of the + org.apache.cxf.binding.BindingFactory interface. The SOAP binding is configured using the soap:soapBinding bean.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the data binding used by the endpoint. The class implementing the JAXB data binding is + org.apache.cxf.jaxb.JAXBDataBinding.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="executor" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures a Java executor to handle the service.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="features" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of beans that configure advanced features like WS-RM.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="handlers" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of JAX-WS handlers to add to the endpoint's processing chain.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming requests.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies an implementation of the org.apache.cxf.service.Invoker interface to be used by the service. The Invoker + implementation controls how a service is invoked. For example, it controls if each request is handled by a new instance of the + service implementation or if state is preserved across invocations.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing responses.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="properties" type="beans:mapType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a map of properties that are passed to the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name="schemaLocations" type="schemasType" minOccurs="0"/> - <xsd:element name="serviceBean" type="xsd:anyType" minOccurs="0"/> + <xsd:element name="serviceBean" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the bean implementing the service. If this child is used you should not use the serviceBean attribute.</xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/> </xsd:all> <xsd:attributeGroup ref="cxf-beans:beanAttributes"/> - <xsd:attribute name="address" type="xsd:string" /> - <xsd:attribute name="bindingId" type="xsd:string" /> - <xsd:attribute name="bus" type="xsd:string" /> - <xsd:attribute name="serviceClass" type="xsd:string"/> - <xsd:attribute name="serviceBean" type="xsd:string"/> - <xsd:attribute name="start" type="xsd:boolean" default="true"/> - <xsd:attribute name="transportId" type="xsd:string"/> - <xsd:attribute name="wsdlLocation" type="xsd:string" /> - <xsd:attribute name="endpointName" type="xsd:QName" /> - <xsd:attribute name="serviceName" type="xsd:QName" /> + <xsd:attribute name="address" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the HTTP address of the endpoint. This value will override the value specified in the services + contract.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bindingId" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the data binding the service will use. For SOAP bindings the IDs are defined in the JAX-WS + specification. For other data bindings, the ID is the namespace of the WSDL extensions used to configure the + binding.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bus" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the Spring bean configuring the bus managing the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="serviceClass" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the name of the class implementing the service. This attribute is useful when you specify the implementor + with the ref bean which is wrapped by using Spring AOP.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="serviceBean" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the class implementing the service. You can specify the implementation class using either the class + name or an ID reference to a Spring bean configuring the implementation class. This class needs to be on the + classpath.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="start" type="xsd:boolean" default="true"> + <xsd:annotation> + <xsd:documentation>Specifies if the service should be automatically published.</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 + from which the service is deployed.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="endpointName" type="xsd:QName"> + <xsd:annotation> + <xsd:documentation>Specifies the value of the service's WSDL port element's name attribute.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <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:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> </xsd:element> <xsd:element name="client"> + <xsd:annotation> + <xsd:documentation>Configures a JAX-WS client.</xsd:documentation> + </xsd:annotation> <xsd:complexType> <xsd:complexContent> <xsd:extension base="beans:identifiedType"> <xsd:all> - <xsd:element name="binding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="handlers" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="properties" type="beans:mapType" minOccurs="0"/> - <xsd:element name="conduitSelector" type="xsd:anyType" minOccurs="0"/> + <xsd:element name="binding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the message binding used by the endpoint. Message bindings are configured using implementations of the + org.apache.cxf.binding.BindingFactory interface. The SOAP binding is configured using the soap:soapBinding bean.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the data binding used by the endpoint. The class implementing the JAXB data binding is org.apache.cxf.jaxb.JAXBDataBinding.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="features" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of beans that configure advanced features like WS-RM.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="handlers" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of JAX-WS handlers to add to the endpoint's processing chain.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming responses.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing requests.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="properties" type="beans:mapType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a map of properties that are passed to the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="conduitSelector" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a org.apache.cxf.endpoint.ConduitSelector implementation. ConduitSelector implementations override the + strategy used to select the Conduit used to process outgoing messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> </xsd:all> <xsd:attributeGroup ref="cxf-beans:beanAttributes"/> - <xsd:attribute name="address" type="xsd:string" /> - <xsd:attribute name="bindingId" type="xsd:string" /> - <xsd:attribute name="bus" type="xsd:string" /> - <xsd:attribute name="endpointName" type="xsd:QName" /> - <xsd:attribute name="password" type="xsd:string" /> - <xsd:attribute name="serviceClass" type="xsd:string" /> - <xsd:attribute name="serviceName" type="xsd:QName" /> - <xsd:attribute name="username" type="xsd:string" /> - <xsd:attribute name="wsdlLocation" type="xsd:string" /> + <xsd:attribute name="address" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the HTTP address of the endpoint on which the client makes requests. This value will override the value + specified in the services contract.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bindingId" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the data binding the client will use. For SOAP bindings the IDs are defined in the JAX-WS + specification. For other data bindings, the ID is the namespace of the WSDL extensions used to configure the + binding.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bus" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the Spring bean configuring the bus managing the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="endpointName" type="xsd:QName"> + <xsd:annotation> + <xsd:documentation>Specifies the value of the WSDL port element's name attribute for the service on which the client is making + requests.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="password" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies a password that is used for simple username/password authentication.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="serviceClass" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the name of the class implementing the client.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="serviceName" type="xsd:QName"> + <xsd:annotation> + <xsd:documentation>Specifies the value of the WSDL service element's name attribute for the service on which the client is making + requests.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="username" type="xsd:string"> + <xsd:annotation> + <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 + from which the client is deployed.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -138,4 +429,4 @@ </xsd:sequence> </xsd:complexType> -</xsd:schema> +</xsd:schema> \ No newline at end of file Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=720131&r1=720130&r2=720131&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java Sun Nov 23 23:46:07 2008 @@ -241,6 +241,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.0.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd?rev=720131&r1=720130&r2=720131&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/resources/schemas/simple.xsd Sun Nov 23 23:46:07 2008 @@ -36,31 +36,124 @@ <xsd:complexContent> <xsd:extension base="beans:identifiedType"> <xsd:all> - <xsd:element name="binding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="executor" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="properties" type="beans:mapType" minOccurs="0"/> + <xsd:element name="binding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the message binding used by the endpoint. Message bindings are configured using implementations of the + org.apache.cxf.binding.BindingFactory interface. The SOAP binding is configured using the soap:soapBinding bean.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the data binding used by the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="executor" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures a Java executor to handle the service.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="features" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of beans that configure advanced features.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming requests.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies an implementation of the org.apache.cxf.service.Invoker interface to be used by the service. The Invoker + implementation controls how a service is invoked. For example, it controls if each request is handled by a new instance of the + service implementation or if state is preserved across invocations.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing responses.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="properties" type="beans:mapType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a map of properties that are passed to the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name="schemaLocations" type="schemasType" minOccurs="0"/> - <xsd:element name="serviceBean" type="xsd:anyType" minOccurs="0"/> + <xsd:element name="serviceBean" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the bean implementing the service. If this child is used you should not use the serviceBean attribute.</xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/> </xsd:all> <xsd:attributeGroup ref="cxf-beans:beanAttributes"/> - <xsd:attribute name="address" type="xsd:string" /> - <xsd:attribute name="bindingId" type="xsd:string" /> - <xsd:attribute name="bus" type="xsd:string" /> - <xsd:attribute name="serviceClass" type="xsd:string"/> - <xsd:attribute name="serviceBean" type="xsd:string"/> - <xsd:attribute name="start" type="xsd:boolean" default="true"/> - <xsd:attribute name="transportId" type="xsd:string"/> - <xsd:attribute name="wsdlLocation" type="xsd:string" /> - <xsd:attribute name="endpointName" type="xsd:QName" /> - <xsd:attribute name="serviceName" type="xsd:QName" /> + <xsd:attribute name="address" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the HTTP address of the endpoint. This value will override the value specified in the services + contract.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bindingId" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the data binding the service will use. The ID is the namespace of the WSDL extensions used to configure the + binding.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bus" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the Spring bean configuring the bus managing the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="serviceClass" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the name of the class implementing the service. This attribute is useful when you specify the implementor + with the ref bean which is wrapped by using Spring AOP.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="serviceBean" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the class implementing the service. You can specify the implementation class using either the class + name or an ID reference to a Spring bean configuring the implementation class. This class needs to be on the + classpath.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="start" type="xsd:boolean" default="true"> + <xsd:annotation> + <xsd:documentation>Specifies if the service should be automatically published.</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 + from which the service is deployed.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="endpointName" type="xsd:QName"> + <xsd:annotation> + <xsd:documentation>Specifies the value of the service's WSDL port element's name attribute.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <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:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -68,29 +161,116 @@ <xsd:element name="client" type="clientType"/> <xsd:complexType name="clientType"> + <xsd:annotation> + <xsd:documentation>Configures a client implemented using the Simple front-end.</xsd:documentation> + </xsd:annotation> <xsd:complexContent> <xsd:extension base="beans:identifiedType"> <xsd:all> - <xsd:element name="binding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="conduitSelector" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="properties" type="beans:mapType" minOccurs="0"/> + <xsd:element name="binding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the message binding used by the endpoint. Message bindings are configured using implementations of the + org.apache.cxf.binding.BindingFactory interface. The SOAP binding is configured using the soap:soapBinding bean.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="conduitSelector" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a org.apache.cxf.endpoint.ConduitSelector implementation. ConduitSelector implementations override the + strategy used to select the Conduit used to process outgoing messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Configures the data binding used by the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="features" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of beans that configure advanced features like WS-RM.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming responses.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process incoming fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing requests.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a list of interceptors to process outgoing fault messages.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="properties" type="beans:mapType" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Specifies a map of properties that are passed to the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:element> </xsd:all> <xsd:attributeGroup ref="cxf-beans:beanAttributes"/> - <xsd:attribute name="address" type="xsd:string" /> - <xsd:attribute name="bindingId" type="xsd:string" /> - <xsd:attribute name="bus" type="xsd:string" /> - <xsd:attribute name="endpointName" type="xsd:QName" /> - <xsd:attribute name="password" type="xsd:string" /> - <xsd:attribute name="serviceClass" type="xsd:string" /> - <xsd:attribute name="serviceName" type="xsd:QName" /> - <xsd:attribute name="username" type="xsd:string" /> - <xsd:attribute name="wsdlLocation" type="xsd:string" /> + <xsd:attribute name="address" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the HTTP address of the endpoint on which the client makes requests. This value will override the value + specified in the services contract.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bindingId" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the data binding the client will use. The ID is the namespace of the WSDL extensions used to + configure the binding.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="bus" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the ID of the Spring bean configuring the bus managing the endpoint.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="endpointName" type="xsd:QName"> + <xsd:annotation> + <xsd:documentation>Specifies the value of the WSDL port element's name attribute for the service on which the client is making + requests.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="password" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies a password that is used for simple username/password authentication.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="serviceClass" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>Specifies the name of the class implementing the client.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="serviceName" type="xsd:QName"> + <xsd:annotation> + <xsd:documentation>Specifies the value of the WSDL service element's name attribute for the service on which the client is making + requests.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="username" type="xsd:string"> + <xsd:annotation> + <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 + from which the client is deployed.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java?rev=720131&r1=720130&r2=720131&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java Sun Nov 23 23:46:07 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.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml?rev=720131&r1=720130&r2=720131&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml Sun Nov 23 23:46:07 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" Propchange: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java ('svn:mergeinfo' removed)
