[mule-scm] [mule] [15985] branches/mule-3.x: Merged revisions 15983 via svnmerge from

[dirk.olmes]

Some parts of this message have been removed. Learn more about Nabble's security policy.

Revision

15985

Author

dirk.olmes

Date

2009-11-05 19:59:50 -0600 (Thu, 05 Nov 2009)

Log Message

Merged revisions 15983 via svnmerge from 
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
  r15983 | jwheeler | 2009-11-05 18:29:56 +0100 (Thu, 05 Nov 2009) | 1 line
  
  Updated annotations.
........

Modified Paths

• branches/mule-3.x/transports/jdbc/src/main/resources/META-INF/mule-jdbc.xsd

Property Changed

• branches/mule-3.x/

Diff

Property changes: branches/mule-3.x

Name: svnmerge-integrated
   - /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-14644,14646-14647,14649-14761,14763-14
 838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15513,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15721,15723-15745,15747-15753,15755-15756,15760-15765,15774-15777,15781-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15858,15863,15865-15875,15881-15884,15889,15892-15902,15908-15910,15912-15913,15915-15921,15923,15935-15938,15944-15962,15975,15978 /branches/mule-3.x-messaging:1-15430 /branches/mule-3.x-xmpp:1-15727
   + /branches/mule-3.x-messaging:1-15430 /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-1
 4644,14646-14647,14649-14761,14763-14838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15513,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15721,15723-15745,15747-15753,15755-15756,15760-15765,15774-15777,15781-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15858,15863,15865-15875,15881-15884,15889,15892-15902,15908-15910,15912-15913,15915-15921,15923,15935-15938,15944-15962,15975,15978,15983 /branches/mule-3.x-xmpp:1-15727

Modified: branches/mule-3.x/transports/jdbc/src/main/resources/META-INF/mule-jdbc.xsd (15984 => 15985)

--- branches/mule-3.x/transports/jdbc/src/main/resources/META-INF/mule-jdbc.xsd	2009-11-06 00:12:55 UTC (rev 15984)
+++ branches/mule-3.x/transports/jdbc/src/main/resources/META-INF/mule-jdbc.xsd	2009-11-06 01:59:50 UTC (rev 15985)
@@ -38,7 +38,12 @@
         <xsd:complexContent>
             <xsd:extension base="mule:connectorType">
                 <xsd:sequence>
-                    <xsd:element ref="abstract-sqlStatementStrategyFactory" minOccurs="0" maxOccurs="1"/>
+                    <xsd:element ref="abstract-sqlStatementStrategyFactory" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>The factory that determines the
+                execution strategy based on the SQL provided.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
                     <xsd:element ref="abstract-query" minOccurs="0" maxOccurs="unbounded">
                         <xsd:annotation>
                             <xsd:documentation>Defines a set of queries. Each query has a key
@@ -51,7 +56,7 @@
                     type="mule:substitutableLong">
                     <xsd:annotation>
                         <xsd:documentation>
-                                                    The delay in milliseconds that will be used during two subsequent polls to the database. This is only applied to queries configured on inbound endpoints.
+                        The delay in milliseconds that will be used during two subsequent polls to the database. This is only applied to queries configured on inbound endpoints.
                         </xsd:documentation>
                     </xsd:annotation>
                 </xsd:attribute>
@@ -59,21 +64,21 @@
                     use="required">
                     <xsd:annotation>
                         <xsd:documentation>
-                                                    Reference to the JDBC DataSource object. This object is typically created using Spring. When using XA transactions, an XADataSource object must be provided.
+                        Reference to the JDBC DataSource object. This object is typically created using Spring. When using XA transactions, an XADataSource object must be provided.
                         </xsd:documentation>
                     </xsd:annotation>
                 </xsd:attribute>
                 <xsd:attribute name="queryRunner-ref" type="xsd:NMTOKEN">
                     <xsd:annotation>
                         <xsd:documentation>
-                                                    Reference to the QueryRunner object, which is the object that actually runs the Query. This object is typically created using Spring. Default is org.apache.commons.dbutils.QueryRunner.
+                        Reference to the QueryRunner object, which is the object that actually runs the Query. This object is typically created using Spring. Default is org.apache.commons.dbutils.QueryRunner.
                         </xsd:documentation>
                     </xsd:annotation>
                 </xsd:attribute>
                 <xsd:attribute name="resultSetHandler-ref" type="xsd:NMTOKEN">
                     <xsd:annotation>
                         <xsd:documentation>
-                                                    Reference to the ResultSetHandler object, which is the object that determines which java.sql.ResultSet gets handled. This object is typically created using Spring. Default is org.apache.commons.dbutils.handlers.MapListHandler, which steps through the ResultSet and stores records as Map objects on a List.
+                        Reference to the ResultSetHandler object, which is the object that determines which java.sql.ResultSet gets handled. This object is typically created using Spring. Default is org.apache.commons.dbutils.handlers.MapListHandler, which steps through the ResultSet and stores records as Map objects on a List.
                                                 </xsd:documentation>
                     </xsd:annotation>
                 </xsd:attribute>
@@ -93,7 +98,7 @@
         substitutionGroup="mule:abstract-inbound-endpoint">
         <xsd:annotation>
             <xsd:documentation>
-                            Receives or fetches data from a database. You can reference SQL select statements or call stored procedures on inbound endpoints. Statements on the inbound endpoint get invoked periodically according to the pollingInterval. Statements that contain an insert, update, or delete are not allowed.
+                Receives or fetches data from a database. You can reference SQL select statements or call stored procedures on inbound endpoints. Statements on the inbound endpoint get invoked periodically according to the pollingInterval. Statements that contain an insert, update, or delete are not allowed.
             </xsd:documentation>
         </xsd:annotation>
     </xsd:element>
@@ -112,7 +117,7 @@
         substitutionGroup="mule:abstract-outbound-endpoint">
         <xsd:annotation>
             <xsd:documentation>
-                            You can reference any SQL statement or call a stored procedure on outbound endpoints. Statements on the outbound endpoint get invoked synchronously. SQL select statements or stored procedures may return output that is handled by the ResultSetHandler and then attached to the message as the payload.
+                You can reference any SQL statement or call a stored procedure on outbound endpoints. Statements on the outbound endpoint get invoked synchronously. SQL select statements or stored procedures may return output that is handled by the ResultSetHandler and then attached to the message as the payload.
             </xsd:documentation>
         </xsd:annotation>
     </xsd:element>
@@ -150,7 +155,8 @@
     
     <xsd:element name="query" type="queryType" substitutionGroup="abstract-query">
         <xsd:annotation>
-            <xsd:documentation>Assigns a name (key) to a query (value). Queries
+            <xsd:documentation>
+                Assigns a name (key) to a query (value). Queries
                 are then referenced by key, such as jdbc://myQuery for
                 <![CDATA[<jdbc:query key="myQuery" value="select * from table"/>]]>
                 </xsd:documentation>
@@ -163,8 +169,16 @@
     </xsd:complexType>
     
     <xsd:attributeGroup name="addressAttributes">
-        <xsd:attribute name="queryKey" type="xsd:string"/>
-        <xsd:attribute name="pollingFrequency" type="mule:substitutableLong"/>
+        <xsd:attribute name="queryKey" type="xsd:string">
+                <xsd:annotation>
+                        <xsd:documentation>The key of the query to use.</xsd:documentation>
+                </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pollingFrequency" type="mule:substitutableLong">
+                <xsd:annotation>
+                        <xsd:documentation>The delay in milliseconds that will be used during two subsequent polls to the database.</xsd:documentation>
+                </xsd:annotation>
+        </xsd:attribute>
     </xsd:attributeGroup>
 
     <xsd:element name="transaction" type="transactionType" substitutionGroup="mule:abstract-transaction">
@@ -189,7 +203,8 @@
 
     <xsd:element name="sqlStatementStrategyFactory" type="sqlStatementStrategyFactoryType" substitutionGroup="abstract-sqlStatementStrategyFactory">
         <xsd:annotation>
-            <xsd:documentation>Override the default SqlStatementStrategyFactory. Determines the
+            <xsd:documentation>
+                Override the default SqlStatementStrategyFactory. Determines the
                 execution strategy based on the SQL provided.</xsd:documentation>
         </xsd:annotation>
     </xsd:element>

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email