Author: dkulp
Date: Wed Oct 22 10:04:33 2008
New Revision: 707136
URL: http://svn.apache.org/viewvc?rev=707136&view=rev
Log:
Merged revisions 704738 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
........
r704738 | ericjohnson | 2008-10-14 19:39:35 -0400 (Tue, 14 Oct 2008) | 1 line
adding some documentation to the schemas
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/jms-context.xsd
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 22 10:04:33 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,705153
+/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,705153
/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,705150
/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/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd?rev=707136&r1=707135&r2=707136&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
(original)
+++
cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
Wed Oct 22 10:04:33 2008
@@ -65,7 +65,7 @@
The default is "false".
Setting this to "true" does the following: Changes the
internal name of the
bean by appending either ".jaxws-client" or
".jaxws-endpoint" to the bean's
- id. Make the bean abstract.
+ id. Makes the bean abstract.
See documentation for attribute abstract in attribute
group beanAttributes
in
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
</xsd:documentation>
Modified:
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/jms-context.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/jms-context.xsd?rev=707136&r1=707135&r2=707136&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/jms-context.xsd
(original)
+++
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/jms-context.xsd
Wed Oct 22 10:04:33 2008
@@ -30,7 +30,11 @@
</xs:annotation>
<xs:sequence>
- <xs:element name="property" type="jms-context:JMSPropertyType"
minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="property" type="jms-context:JMSPropertyType"
minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>A collection of user provided JMS
properties</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
<xs:attribute name="JMSCorrelationID" type="xs:string"/>
<xs:attribute name="JMSDeliveryMode" type="xs:int" />
@@ -45,7 +49,7 @@
<xs:complexType name="JMSServerHeadersType">
<xs:annotation>
- <xs:documentation>JMS header properties.</xs:documentation>
+ <xs:documentation>JMS header properties for use by server-side
endpoints</xs:documentation>
</xs:annotation>
<xs:complexContent>
@@ -57,7 +61,7 @@
<xs:complexType name="JMSClientHeadersType">
<xs:annotation>
- <xs:documentation>JMS header properties.</xs:documentation>
+ <xs:documentation>JMS header properties for client-side
endpoints</xs:documentation>
</xs:annotation>
<xs:complexContent>
@@ -68,6 +72,10 @@
</xs:complexType>
<xs:complexType name="JMSPropertyType">
+ <xs:annotation>
+ <xs:documentation>Name/value pair used to hold user specified JMS
+ header properties</xs:documentation>
+ </xs:annotation>
<xs:sequence>
<xs:element name="name" type="xs:string"/>
<xs:element name="value" type="xs:string"/>
@@ -76,7 +84,8 @@
<xs:complexType name="JMSConnectionSecurityInfoType">
<xs:annotation>
- <xs:documentation>Contains username/password sometimes required
when establishing a connection.</xs:documentation>
+ <xs:documentation>Contains username/password sometimes required
when
+ establishing a connection to a JMS broker.</xs:documentation>
</xs:annotation>
<xs:sequence>
Modified:
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd?rev=707136&r1=707135&r2=707136&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
(original)
+++
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
Wed Oct 22 10:04:33 2008
@@ -32,7 +32,12 @@
<xs:extension base="wsdl:tExtensibilityElement">
<xs:sequence />
<xs:attribute name="rootNode" type="xs:QName"
- use="optional" />
+ use="optional">
+ <xs:annotation>
+ <xs:documentation>The QName of
the element created to be
+ the root element of the
document passed across the wire</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -46,7 +51,15 @@
</xs:complexContent>
</xs:complexType>
- <xs:element name="body" type="xformat:XMLBindingMessageFormat" />
- <xs:element name="binding" type="xformat:XMLFormatBinding"/>
+ <xs:element name="body" type="xformat:XMLBindingMessageFormat">
+ <xs:annotation>
+ <xs:documentation>Specifies how the data will be mapped
to an XML message</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="binding" type="xformat:XMLFormatBinding">
+ <xs:annotation>
+ <xs:documentation>Specifies that the messages are
mapped to XML messages</xs:documentation>
+ </xs:annotation>
+ </xs:element>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
Modified:
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?rev=707136&r1=707135&r2=707136&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
(original)
+++
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Wed Oct 22 10:04:33 2008
@@ -38,9 +38,7 @@
<xs:complexType name="HTTPServerPolicy">
<xs:annotation>
- <xs:documentation>HTTP Server configuration properties.
- Used for configuring a HTTP server port.
- </xs:documentation>
+ <xs:documentation>Properties used for configuring a server-side
HTTP prort</xs:documentation>
</xs:annotation>
<xs:complexContent>
@@ -57,9 +55,9 @@
<xs:attribute name="SuppressClientSendErrors"
type="xs:boolean" use="optional" default="false">
<xs:annotation>
<xs:documentation>
- When set to no, exceptions will be thrown when an
error is encountered
- receiving a request from the client. When set to yes
these errors will
- be suppressed.
+ When set to false, exceptions will be thrown when an
error is encountered
+ receiving a request from the client. When set to true
these errors will
+ be suppressed. The default is false.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -67,9 +65,9 @@
<xs:attribute name="SuppressClientReceiveErrors"
type="xs:boolean" use="optional" default="false">
<xs:annotation>
<xs:documentation>
- When set to No, exceptions will be thrown when an
error is encountered
- sending a reply from to client. When set to Yes these
errors will be
- suppressed.
+ When set to false, exceptions will be thrown when an
error is encountered
+ sending a reply from to client. When set to true
these errors will be
+ suppressed. The default is false.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -77,13 +75,13 @@
<xs:attribute name="HonorKeepAlive" type="xs:boolean"
use="optional" default="true">
<xs:annotation>
<xs:documentation>
- When set to Yes, the request socket will remain open
after the reply is
+ When set to true, the request socket will remain open
after the reply is
sent to the client, if the client has requested
keep-alive and is using
- at least version 1.1 of HTTP. If set to No, the
socket will be closed
+ at least version 1.1 of HTTP. If set to false, the
socket will be closed
after each reply is sent, even if the client requests
the server to keep
the connection alive. Keep-Alive improves performance
for the client
requesting such behavior, but can limit overall
scalability of the server
- for handling many clients.
+ for handling many clients. The Default is true.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -91,7 +89,7 @@
<xs:attribute name="RedirectURL" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- to redirect the client to another url (if the
ReplyCode and ReplyDescription
+ A URL to which clients are redirected (if the
ReplyCode and ReplyDescription
are not set, ReplyCode will be set to 302, and
ReplyDescription will be set
to 'Object Moved').
</xs:documentation>
@@ -102,7 +100,7 @@
<xs:annotation>
<xs:documentation>
Most commonly used to specify no-cache, however the
standard supports a
- dozen or so caching related directives for responses
+ dozen or so caching related directives for responses.
</xs:documentation>
</xs:annotation>
@@ -111,16 +109,15 @@
<xs:attribute name="ContentLocation" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- to let the client know what the final url was for
handling the
- request (e.g., to inform that default.htm document was
used.)
+ Specifies the URL representing the resource used to
satisfy the request(e.g., to inform that default.htm document was used.)
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="ContentType" type="xs:string"
use="optional" default="text/xml">
+ <xs:attribute name="ContentType" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- what MIME type this reply is
+ Specifies the MIME type used for responses. The
default is set by the binding.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -128,7 +125,7 @@
<xs:attribute name="ContentEncoding" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- how this is encoded, if applicable
+ Specifies any additional encoding applied to the
response. Values are specified using IANA labels.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -136,7 +133,7 @@
<xs:attribute name="ServerType" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- used to send a ServerType header to the client, if
desired
+ Specifies an optional value for the HTTP ServerType
property.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -146,9 +143,7 @@
<xs:complexType name="HTTPClientPolicy">
<xs:annotation>
- <xs:documentation>HTTP client configuration properties.
- Used for configuring a HTTP client port.
- </xs:documentation>
+ <xs:documentation>Properties used to configure a client-side HTTP
port</xs:documentation>
</xs:annotation>
<xs:complexContent>
@@ -157,7 +152,7 @@
<xs:attribute name="ConnectionTimeout" type="xs:unsignedInt"
use="optional" default="30000">
<xs:annotation>
<xs:documentation>
- Send timeout in milliseconds, 0 is infinite
+ Specifies the amount of time, in milliseconds, that
the consumer will attempt to establish a connection before it times out. 0 is
infinite.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -165,7 +160,7 @@
<xs:attribute name="ReceiveTimeout" type="xs:unsignedInt"
use="optional" default="60000">
<xs:annotation>
<xs:documentation>
- Receive timeout in milliseconds, 0 is infinite
+ Specifies the amount of time, in milliseconds, that
the consumer will wait for a response before it times out. 0 is infinite.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -173,8 +168,7 @@
<xs:attribute name="AutoRedirect" type="xs:boolean"
use="optional" default="false">
<xs:annotation>
<xs:documentation>
- Whether to automatically follow up when the server
issues a redirection reply.
- Default is No, so calling flow would handle this
condition.
+ Specifies if the consumer will automatically follow a
server issued redirection.
(name is not part of standard)
</xs:documentation>
</xs:annotation>
@@ -183,9 +177,8 @@
<xs:attribute name="MaxRetransmits" type="xs:int"
use="optional" default="-1">
<xs:annotation>
<xs:documentation>
- This attribute governs the amount of retransmits that
- are allowed for redirects along with retransmits for
- authorization. Each redirect may cause another
+ Specifies the maximum amount of retransmits that are
allowed for redirects. Retransmits for
+ authorization is included in the retransmit count.
Each redirect may cause another
retransmit for a UNAUTHORIZED response code, ie. 401.
Any negative number indicates unlimited retransmits,
although, loop protection is provided.
@@ -199,7 +192,7 @@
<xs:annotation>
<xs:documentation>
If true, the client is free to use chunking streams if
it wants to, but not
- required. Regular non-chunked requests are OK too.
If false, the client
+ required to. Regular non-chunked requests are OK too.
If false, the client
must use regular, non-chunked requests in all cases.
</xs:documentation>
</xs:annotation>
@@ -208,7 +201,7 @@
<xs:attribute name="Accept" type="xs:string" use="optional">
<xs:annotation>
<xs:documentation>
- What MIME types the client is prepared to handle
(e.g., HTML, JPEG, GIF, etc.)
+ Specifies the MIME types the client is prepared to
handle (e.g., HTML, JPEG, GIF, etc.)
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -216,7 +209,7 @@
<xs:attribute name="AcceptLanguage" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- What language the client desires (e.g., English,
French, etc.)
+ Specifies the language the client desires (e.g.,
English, French, etc.)
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -224,15 +217,15 @@
<xs:attribute name="AcceptEncoding" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- What encoding the client is prepared to handle (e.g.,
gzip)
+ Specifies the encoding the client is prepared to
handle (e.g., gzip)
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="ContentType" type="xs:string"
use="optional" default="text/xml">
+ <xs:attribute name="ContentType" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- The content type of the stream being sent in a post
request
+ Specifies the content type of the stream being sent in
a post request.
(this should be text/xml for web services, or can be
set to
application/x-www-form-urlencoded if the client is
sending form data).
</xs:documentation>
@@ -242,10 +235,10 @@
<xs:attribute name="Host" type="xs:string" use="optional">
<xs:annotation>
<xs:documentation>
- what host the client intends (for virtual servers
mapping to same IP)
- This is sent by default based upon the URL. Certain
DNS scenarios or
+ Specifies the Internet host and port number of the
resource on which the request is being invoked.
+ This is sent by default based upon the URL. Certain
DNS scenarios or
application designs may request you to set this, but
typically it is
- not required).
+ not required.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -253,13 +246,10 @@
<xs:attribute name="Connection"
type="http-conf:connectionType" use="optional" default="Keep-Alive">
<xs:annotation>
<xs:documentation>
- The connection disposition. If close the connection
to the server is closed
- after each request/response dialog; if Keep-Alive, the
client requests the server
+ The connection disposition. If close the connection to
the server is closed
+ after each request/response dialog. If Keep-Alive the
client requests the server
to keep the connection open, and if the server honors
the keep alive request,
- the connection is reused. Many servers and proxies do
not honor these requests.
- Default is close.
-
- The server may choose not honor the keep alive request.
+ the connection is reused. Many servers and proxies do
not honor keep-alive requests.
</xs:documentation>
</xs:annotation>
@@ -278,12 +268,10 @@
<xs:attribute name="Cookie" type="xs:string" use="optional">
<xs:annotation>
<xs:documentation>
- The cookie to send to the server
-
- some stateful session designs will use cookies to
identify a session.
- If the cookie is static, you can supply it here. If
it is dynamic,
+ Specifies a cookie to send to the server. Some
stateful session designs will use cookies to identify a session.
+ If the cookie is static, you can supply it here. If it
is dynamic,
it will need to be set by the server on first access,
and can be handled
- automatically by the runtime
+ automatically by the runtime.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -292,12 +280,9 @@
<xs:annotation>
<xs:documentation>
aka User-Agent
-
- some servers will optimize based upon the client
sending the request.
-
- What to tell the server about what kind of browser we
are (usually only
+ Specifies the type of browser is sending the request.
This is usually only
needed when sites have HTML customized to Netscape vs
IE, etc, but can
- also be used to optimize for different SOAP stacks.)
+ also be used to optimize for different SOAP stacks.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -305,8 +290,7 @@
<xs:attribute name="Referer" type="xs:string" use="optional">
<xs:annotation>
<xs:documentation>
- What URL referred us to this URL
-
+ Specifies the URL that referred us to this URL. This
is
sent automatically with auto redirect.
May allow the server to optimize processing based upon
@@ -319,8 +303,7 @@
<xs:attribute name="DecoupledEndpoint" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- Decoupled endpoint to accept incoming
- asynchronous responses.
+ Specifies the URL of a decoupled endpoint for the
receipt of responses over a separate provider->consumer connection.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -329,23 +312,21 @@
<xs:attribute name="ProxyServer" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
- Address of proxy server, if used
- (proxy servers are a special kind of firewall)
- proxy.mycompany.com
+ Specifies the address of proxy server if one is used.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ProxyServerPort" type="xs:int"
use="optional">
<xs:annotation>
<xs:documentation>
- Port number of proxy server.
+ Specifies the port number used by the proxy server.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ProxyServerType"
type="http-conf:proxyServerType" use="optional" default="HTTP">
<xs:annotation>
<xs:documentation>
- Type of number of proxy server.
+ Specifies the ype of the proxy server. Can be either
HTTP or SOCKS.
</xs:documentation>
</xs:annotation>
</xs:attribute>
