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/10 02:53:45 UTC
svn commit: r712596 - in /cxf/branches/2.1.x-fixes: ./
rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
Author: ningjiang
Date: Sun Nov 9 17:53:45 2008
New Revision: 712596
URL: http://svn.apache.org/viewvc?rev=712596&view=rev
Log:
Merged revisions 711490 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r711490 | ericjohnson | 2008-11-05 10:15:36 +0800 (Wed, 05 Nov 2008) | 1 line
started annotating jaxws;endpoint and jaxws:server children
........
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/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java (props changed)
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 9 17:53:45 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,708417,708550,708554,709353-709354,709425,710150,710154,712194,71219
8,712272
+/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,708417,708550,708554,709353-709354,709425,710150,710154,711490,71219
4,712198,712272
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=712596&r1=712595&r2=712596&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 9 17:53:45 2008
@@ -34,17 +34,52 @@
<xsd:complexContent>
<xsd:extension base="beans:identifiedType">
<xsd:all>
- <xsd:element name="binding" 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:element name="executor" type="xsd:anyType" minOccurs="0"/>
- <xsd:element name="features" type="xsd:anyType" minOccurs="0"/>
+ <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: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="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:element name="schemaLocations" type="schemasType" minOccurs="0"/>
<xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/>
@@ -113,16 +148,51 @@
<xsd:complexContent>
<xsd:extension base="beans:identifiedType">
<xsd:all>
- <xsd:element name="binding" 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:element name="executor" type="xsd:anyType" minOccurs="0"/>
- <xsd:element name="features" type="xsd:anyType" minOccurs="0"/>
+ <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: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="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:element name="schemaLocations" type="schemasType" minOccurs="0"/>
<xsd:element name="serviceBean" type="xsd:anyType" minOccurs="0"/>
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
('svn:mergeinfo' removed)