cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r712597 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/resources/schemas/configuration/cxf-beans.xsd rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
Date Mon, 10 Nov 2008 01:57:39 GMT
Author: ningjiang
Date: Sun Nov  9 17:57:39 2008
New Revision: 712597

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

........
  r711975 | ericjohnson | 2008-11-07 05:07:03 +0800 (Fri, 07 Nov 2008) | 1 line
  
  added annotations for jax-ws elements and fixed some typos
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov  9 17:57:39 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,711490,71219
 4,712198,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,71197
 5,712194,712198,712272

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

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd?rev=712597&r1=712596&r2=712597&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
Sun Nov  9 17:57:39 2008
@@ -41,7 +41,7 @@
                 <xsd:documentation>
                     Specifies if the bean is an abstract bean. Abstract beans act as parents
for 
                     concrete bean definitions and are not instantiated. The default is "false".
-                    Setting this to "true" instructs the bean factory not to instantiate
the bean,
+                    Setting this to "true" instructs the bean factory not to instantiate
the bean.
                     See documentation for attribute abstract in attribute group beanAttributes
                     in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
                 </xsd:documentation>
@@ -50,7 +50,7 @@
         <xsd:attribute name="depends-on" type="xsd:string">
             <xsd:annotation>
                 <xsd:documentation>
-                    A list of beans that the bean depends on being instantiated before the
bean 
+                    A list of beans that the bean depends on being instantiated before it

                     can be instantiated.
                     See documentation for attribute depends-on in attribute group beanAttributes
                     in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd

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=712597&r1=712596&r2=712597&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:57:39 2008
@@ -40,7 +40,11 @@
                   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="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>
@@ -51,8 +55,16 @@
                 <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="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>
@@ -80,7 +92,11 @@
                 <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="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>
@@ -154,7 +170,11 @@
                   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="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>
@@ -165,7 +185,11 @@
                 <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="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>
@@ -193,9 +217,17 @@
                 <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="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"/>
@@ -262,15 +294,52 @@
       <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="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:all>
           <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>



Mime
View raw message