cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r707149 - in /cxf/branches/2.0.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 Wed, 22 Oct 2008 17:52:07 GMT
Author: dkulp
Date: Wed Oct 22 10:52:07 2008
New Revision: 707149

URL: http://svn.apache.org/viewvc?rev=707149&view=rev
Log:
Merged revisions 705455 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r705455 | ningjiang | 2008-10-16 23:58:30 -0400 (Thu, 16 Oct 2008) | 9 lines
  
  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.0.x-fixes/   (props changed)
    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-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.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:52: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
-/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
+/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,705455
+/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,705340
 /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/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=707149&r1=707148&r2=707149&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:52:07 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.0.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd?rev=707149&r1=707148&r2=707149&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
Wed Oct 22 10:52:07 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.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?rev=707149&r1=707148&r2=707149&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
Wed Oct 22 10:52:07 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.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=707149&r1=707148&r2=707149&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:52:07 2008
@@ -191,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>      



Mime
View raw message