cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r705455 - in /cxf/branches/2.1.x-fixes: ./ rt/bindings/xml/src/main/resources/schemas/wsdl/ rt/transports/http-jetty/src/main/resources/schemas/configuration/ rt/transports/http/src/main/resources/schemas/configuration/ rt/transports/http/s...
Date Fri, 17 Oct 2008 03:58:31 GMT
Author: ningjiang
Date: Thu Oct 16 20:58:30 2008
New Revision: 705455

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

........
  r705340 | ericjohnson | 2008-10-17 03:54:16 +0800 (Fri, 17 Oct 2008) | 1 line
  
  updated schema documentaiton
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
    cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 16 20:58:30 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,705446
+/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

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

Modified: cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd?rev=705455&r1=705454&r2=705455&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
Thu Oct 16 20:58:30 2008
@@ -34,8 +34,7 @@
 				<xs:attribute name="rootNode" type="xs:QName"
 					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:documentation>The QName of the root element used to wrap the message passed
across the wire</xs:documentation>
 					</xs:annotation>
 				</xs:attribute>
 			</xs:extension>
@@ -53,12 +52,12 @@
 
 	<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:documentation>Specifies how the message body is mapped to an XML document.</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:documentation>Specifies that the messages are mapped to XML documents</xs:documentation>
 		</xs:annotation>
 	</xs:element>
 

Modified: cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd?rev=705455&r1=705454&r2=705455&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
Thu Oct 16 20:58:30 2008
@@ -40,22 +40,46 @@
     
     <!-- Is this really supposed to be supperceeded by http-conf:HTTPListenerPolicy? -->
     <xs:complexType name="ThreadingParametersType">
-       <xs:attribute name="minThreads" type="xs:unsignedShort"/>
-       <xs:attribute name="maxThreads" type="xs:unsignedShort"/>
+       <xs:attribute name="minThreads" type="xs:unsignedShort">
+          <xs:annotation>
+             <xs:documentation>Specifies the minimum number of threads available to
the Jetty instance for processing requests.</xs:documentation>
+          </xs:annotation>
+       </xs:attribute>
+       <xs:attribute name="maxThreads" type="xs:unsignedShort">
+                    <xs:annotation>
+             <xs:documentation>Specifies the maximum number of threads available to
the Jetty instance for processing requests.</xs:documentation>
+          </xs:annotation>
+       </xs:attribute>
     </xs:complexType>
     
     <xs:complexType name="ThreadingParametersIdentifiedType">
        <xs:sequence>
-         <xs:element name="threadingParameters" type="tns:ThreadingParametersType"/>
+         <xs:element name="threadingParameters" type="tns:ThreadingParametersType">
+            <xs:annotation>
+               <xs:documentation>Specifies the thread pool properties for the parameter
set.</xs:documentation>
+            </xs:annotation>
+         </xs:element>
        </xs:sequence>
-         <xs:attribute name="id" type="xs:string"/>
+         <xs:attribute name="id" type="xs:string">
+             <xs:annotation>
+                <xs:documentation>Specifies a unique identifier by which the property
set can be referred.</xs:documentation>
+             </xs:annotation>
+         </xs:attribute>
     </xs:complexType>
     
     <xs:complexType name="TLSServerParametersIdentifiedType">
        <xs:sequence>
-          <xs:element name="tlsServerParameters" type="sec:TLSServerParametersType"/>
+          <xs:element name="tlsServerParameters" type="sec:TLSServerParametersType">
+             <xs:annotation>
+                <xs:documentation>Specifies the properties for the parameter set.</xs:documentation>
+             </xs:annotation>
+          </xs:element>
        </xs:sequence>
-          <xs:attribute name="id" type="xs:string"/>
+          <xs:attribute name="id" type="xs:string">
+             <xs:annotation>
+                <xs:documentation>Specifies a unique identifier by which the property
set can be referred.</xs:documentation>
+             </xs:annotation>
+          </xs:attribute>
     </xs:complexType>
     
     <xs:complexType name="ParametersRefType">
@@ -66,40 +90,79 @@
        <xs:sequence>
          <xs:choice minOccurs="0" maxOccurs="1">
           <xs:element name="tlsServerParameters" 
-                      type="sec:TLSServerParametersType"/>
+                      type="sec:TLSServerParametersType">
+             <xs:annotation>
+                <xs:documentation>Specifies an instance of the security parameters
for the Jetty instance.</xs:documentation>
+             </xs:annotation>
+          </xs:element>
           <xs:element name="tlsServerParametersRef"
-                      type="tns:ParametersRefType"/>
+                      type="tns:ParametersRefType">
+             <xs:annotation>
+                <xs:documentation>Specifies a reference to a reusable set of security
parameters.</xs:documentation>
+             </xs:annotation>
+          </xs:element>
          </xs:choice>
          <xs:choice minOccurs="0" maxOccurs="1">
           <xs:element name="threadingParameters" 
-                      type="tns:ThreadingParametersType"/>
+                      type="tns:ThreadingParametersType">
+             <xs:annotation>
+                <xs:documentation>Specifies an instance of the threading configuration
use for the Jetty engine.</xs:documentation>
+             </xs:annotation>
+          </xs:element>
           <xs:element name="threadingParametersRef"
-                      type="tns:ParametersRefType"/>
+                      type="tns:ParametersRefType">
+             <xs:annotation>
+                <xs:documentation>Specifies a reference to a reusable set of threading
parameters.</xs:documentation>
+             </xs:annotation>
+          </xs:element>
          </xs:choice>         
          <xs:element name="connector" type="xsd:anyType" minOccurs="0"/>
          <xs:element name="handlers" type="xsd:anyType" minOccurs="0"/>
          <xs:element name="sessionSupport" type="xsd:boolean" minOccurs="0"/>
          <xs:element name="reuseAddress" type="xsd:boolean" minOccurs="0" />      
   
        </xs:sequence>
-          <xs:attribute name="port" type="xs:int" use="required"/>
+          <xs:attribute name="port" type="xs:int" use="required">
+             <xs:annotation>
+                <xs:documentation>Specifies the port used by the Jetty instance.
+                You can specify a value of 0 for the port attribute. Any threading 
+                properties specified in an engine element with its port attribute
+                set to 0 are used as the configuration for all Jetty listeners that are not
explicitly configured.</xs:documentation>
+             </xs:annotation>
+          </xs:attribute>
     </xs:complexType>
     
     <xs:complexType name="JettyHTTPServerEngineFactoryConfigType">
        <xs:sequence>
            <xs:element name="identifiedTLSServerParameters" 
                        type="tns:TLSServerParametersIdentifiedType"
-                       minOccurs="0" maxOccurs="unbounded"/>
+                       minOccurs="0" maxOccurs="unbounded">
+              <xs:annotation>
+                 <xs:documentation>Specifies a reusable set of properties for securing
an HTTP service provider.</xs:documentation>
+              </xs:annotation>
+           </xs:element>
            <xs:element name="identifiedThreadingParameters"
                        type="tns:ThreadingParametersIdentifiedType"
-                       minOccurs="0" maxOccurs="unbounded"/>
+                       minOccurs="0" maxOccurs="unbounded">
+              <xs:annotation>
+                 <xs:documentation>Specifies a reusable set of properties for controlling
a Jetty instance's thread pool.</xs:documentation>
+              </xs:annotation>
+           </xs:element>
            <xs:element name="engine" 
                        type="tns:JettyHTTPServerEngineConfigType" 
-                       minOccurs="0" maxOccurs="unbounded"/>
+                       minOccurs="0" maxOccurs="unbounded">
+              <xs:annotation>
+                 <xs:documentation>Specifies the configuration for a particular Jetty
runtime instance.</xs:documentation>
+              </xs:annotation>
+           </xs:element>
        </xs:sequence>
        <xs:attribute name="bus" type="xs:string" default="cxf"/>
        <xs:attribute name="id" type="xs:ID" use="optional"/>
     </xs:complexType>
     
     <xs:element name="engine-factory" 
-                type="tns:JettyHTTPServerEngineFactoryConfigType"/>
+                type="tns:JettyHTTPServerEngineFactoryConfigType">
+       <xs:annotation>
+          <xs:documentation>Contains the configuration for a Jetty instance.</xs:documentation>
+       </xs:annotation>
+    </xs:element>
  </xs:schema>

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?rev=705455&r1=705454&r2=705455&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
Thu Oct 16 20:58:30 2008
@@ -59,16 +59,16 @@
                 <xs:element ref="http-conf:client" minOccurs="0">
                    <xs:annotation>
                      <xs:documentation>
-                       This element holds the parameters that configure
-                       the client side of an Http connection.
+                       Holds the parameters that configure
+                       a client-side HTTP connection.
                      </xs:documentation>
                    </xs:annotation>
                 </xs:element>
                 <xs:element ref="http-conf:authorization" minOccurs="0">
                    <xs:annotation>
                      <xs:documentation>
-                       This element holds the parameters that configure
-                       the Basic Authentication that will be premptively
+                       Holds the parameters that configure
+                       the Basic Authentication that will be preemptively
                        used. Note, supplying a Basic Auth Supplier object
                        is the preferred approach.
                      </xs:documentation>
@@ -77,8 +77,8 @@
                 <xs:element ref="http-conf:proxyAuthorization" minOccurs="0">
                    <xs:annotation>
                      <xs:documentation>
-                       This element holds the parameters that configure
-                       the Basic Authentication for an outgoing Http
+                       Holds the parameters that configure
+                       the Basic Authentication for an outgoing HTTP
                        Proxy Server.
                      </xs:documentation>
                    </xs:annotation>
@@ -86,9 +86,9 @@
                 <xs:element ref="http-conf:tlsClientParameters" minOccurs="0">
                    <xs:annotation>
                      <xs:documentation>
-                       This element holds the parameters that configure
-                       the underlying SSL/TLS JSSE client side 
-                       of an Https connection.
+                       Holds the parameters that configure
+                       the underlying SSL/TLS JSSE client-side 
+                       of an HTTPS connection.
                      </xs:documentation>
                    </xs:annotation>
                 </xs:element>
@@ -96,9 +96,9 @@
                 			minOccurs="0" maxOccurs="1">
                    <xs:annotation>
                      <xs:documentation>
-                       This element holds the bean reference or class name
+                       Holds the bean reference or class name
                        of an object that supplies Basic Auth information
-                       both prememptively and in response to a 401 Http
+                       both preemptively and in response to a 401 HTTP
                        Challenge. This class must extend the abstract class 
                        org.apache.cxf.transport.http.BasicAuthSupplier.
                      </xs:documentation>
@@ -108,10 +108,10 @@
                 			minOccurs="0" maxOccurs="1">
                    <xs:annotation>
                      <xs:documentation>
-                       This element holds the bean reference or class name
+                       Holds the bean reference or class name
                        of an object that checks the Http(s)URLConnection
                        that will establish trust for a connection with an
-                       Http(s) server, before any information is sent to the
+                       HTTP(S) server, before any information is sent to the
                        server, namely Basic Auth information. This class
                        must extend the abstract class
                        org.apache.cxf.transport.http.MessageTrustDecider. 
@@ -133,24 +133,24 @@
 	            <xs:element ref="http-conf:server" minOccurs="0">
 	               <xs:annotation>
 	                 <xs:documentation>
-	                   This element holds the parameters that configure
-	                   the server side of an Http connection.
+	                   Holds the parameters that configure
+	                   a server-side HTTP connection.
 	                 </xs:documentation>
 	               </xs:annotation>
 	            </xs:element>
 	            <xs:element ref="http-conf:contextMatchStrategy" minOccurs="0">
 	               <xs:annotation>
 	                 <xs:documentation>
-	                   This element holds the parameters that configure
-	                   the context match strategy for processing an Http request.
+	                   Holds the parameters that configure
+	                   the context match strategy for processing an HTTP request.
 	                 </xs:documentation>
 	               </xs:annotation>
 	            </xs:element>
 	            <xs:element ref="http-conf:fixedParameterOrder" minOccurs="0">
 	               <xs:annotation>
 	                 <xs:documentation>
-	                   This element signifies whether the parameter order of
-	                   an Http request handled by this destination is fixed.
+	                   Signifies whether the parameter order of
+	                   an HTTP request handled by this destination is fixed.
 	                 </xs:documentation>
 	               </xs:annotation>
 	            </xs:element>

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?rev=705455&r1=705454&r2=705455&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Thu Oct 16 20:58:30 2008
@@ -55,8 +55,8 @@
                 <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 
+                        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>      
@@ -177,9 +177,8 @@
                 <xs:attribute name="MaxRetransmits" type="xs:int" use="optional" default="-1">
                     <xs:annotation>
                         <xs:documentation>
-                        Specifies 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. 
@@ -192,8 +191,8 @@
                 <xs:attribute name="AllowChunking" type="xs:boolean" use="optional" default="true">
                     <xs:annotation>
                         <xs:documentation>
-                        If true, the client is free to use chunking streams if it wants to,
but not 
-                        required to.  Regular non-chunked requests are OK too. If false,
the client 
+                        If true, the client is free to use chunking streams if it wants,
but it is not 
+                        required to use chunking streams. If false, the client 
                         must use regular, non-chunked requests in all cases.
                         </xs:documentation>
                     </xs:annotation>      
@@ -244,10 +243,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>
@@ -255,13 +254,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>      
 
@@ -280,12 +276,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>
@@ -294,12 +288,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>
@@ -307,8 +298,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
@@ -321,8 +311,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-&gt;consumer connection.
                         </xs:documentation>
                     </xs:annotation>      
                 </xs:attribute>
@@ -331,23 +320,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>



Mime
View raw message