You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by er...@apache.org on 2008/11/06 22:07:12 UTC

svn commit: r711975 - in /cxf/trunk: common/common/src/main/resources/schemas/configuration/cxf-beans.xsd rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd

Author: ericjohnson
Date: Thu Nov  6 13:07:03 2008
New Revision: 711975

URL: http://svn.apache.org/viewvc?rev=711975&view=rev
Log:
added annotations for jax-ws elements and fixed some typos

Modified:
    cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
    cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd

Modified: cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd?rev=711975&r1=711974&r2=711975&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd (original)
+++ cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd Thu Nov  6 13:07:03 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
@@ -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/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd?rev=711975&r1=711974&r2=711975&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd Thu Nov  6 13:07:03 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"/>