You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2010/09/26 14:48:29 UTC

svn commit: r1001421 - in /synapse/branches/2.0/repository/schema: endpoint.xsd misc/target.xsd proxy.xsd

Author: ruwan
Date: Sun Sep 26 12:48:29 2010
New Revision: 1001421

URL: http://svn.apache.org/viewvc?rev=1001421&view=rev
Log:
Fixing target to have faultSequence and few other fixes

Modified:
    synapse/branches/2.0/repository/schema/endpoint.xsd
    synapse/branches/2.0/repository/schema/misc/target.xsd
    synapse/branches/2.0/repository/schema/proxy.xsd

Modified: synapse/branches/2.0/repository/schema/endpoint.xsd
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/repository/schema/endpoint.xsd?rev=1001421&r1=1001420&r2=1001421&view=diff
==============================================================================
--- synapse/branches/2.0/repository/schema/endpoint.xsd (original)
+++ synapse/branches/2.0/repository/schema/endpoint.xsd Sun Sep 26 12:48:29 2010
@@ -99,17 +99,60 @@
             </xs:documentation>
         </xs:annotation>
         <xs:choice>
-            <xs:element name="loadbalance">
+            <xs:group ref="lbEndpoints"/>
+            <xs:group ref="failoverEndpoints"/>
+        </xs:choice>
+    </xs:group>
+
+    <xs:group name="lbEndpoints">
+        <xs:annotation>
+            <xs:documentation source="description">
+                This group represents the secondary load balance endpoints
+            </xs:documentation>
+        </xs:annotation>
+        <xs:all>
+            <xs:element name="session" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
-                    <xs:group ref="leafEndpoints" minOccurs="1" maxOccurs="unbounded"/>
+                    <xs:attribute name="type" use="optional">
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="simpleClientSession"/>
+                                <!-- TODO : add other possible values -->
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:attribute>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="failover">
+            <xs:element name="loadbalance" minOccurs="1" maxOccurs="1">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="endpoint" minOccurs="1" maxOccurs="unbounded">
+                            <xs:complexType>
+                                <xs:group ref="leafEndpoints" minOccurs="1" maxOccurs="1"/>
+                                <xs:attribute name="name" type="xs:string" use="optional"/>
+                                <xs:attribute name="key" type="xs:string" use="optional"/>
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                    <xs:attribute name="algorithm" type="xs:string" default="org.apache.synapse.endpoints.algorithms.RoundRobin" use="required"/>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+    </xs:group>
+
+    <xs:group name="failoverEndpoints">
+        <xs:annotation>
+            <xs:documentation source="description">
+                This group represents the secondary fail over endpoints
+            </xs:documentation>
+        </xs:annotation>
+        <xs:all>
+            <xs:element name="failover" minOccurs="1" maxOccurs="1">
                 <xs:complexType>
                     <xs:group ref="leafEndpoints" minOccurs="1" maxOccurs="unbounded"/>
                 </xs:complexType>
             </xs:element>
-        </xs:choice>
+        </xs:all>
     </xs:group>
 
     <xs:complexType name="DefaultEndpoint">
@@ -153,7 +196,7 @@
                                     <xs:enumeration value="fault"/>
                                 </xs:restriction>
                             </xs:simpleType>
-                        </xs:element> 
+                        </xs:element>
                     </xs:all>
                 </xs:complexType>
             </xs:element>
@@ -176,6 +219,13 @@
                     </xs:all>
                 </xs:complexType>
             </xs:element>
+            <xs:element name="suspendDurationOnFailure" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                    <xs:documentation source="description">
+                        This is deprecated, please use the suspendOnFailure
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
         </xs:all>
         <xs:attributeGroup ref="commonEndpoint"/>
     </xs:complexType>

Modified: synapse/branches/2.0/repository/schema/misc/target.xsd
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/repository/schema/misc/target.xsd?rev=1001421&r1=1001420&r2=1001421&view=diff
==============================================================================
--- synapse/branches/2.0/repository/schema/misc/target.xsd (original)
+++ synapse/branches/2.0/repository/schema/misc/target.xsd Sun Sep 26 12:48:29 2010
@@ -54,10 +54,18 @@
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
+            <xs:element name="faultSequence" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:group ref="mediatorList" minOccurs="1" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
             <xs:element name="endpoint" type="Endpoint" minOccurs="0" maxOccurs="1"/>
         </xs:all>
         <xs:attribute name="inSequence" type="xs:string" use="optional"/>
         <xs:attribute name="outSequence" type="xs:string" use="optional"/>
+        <xs:attribute name="faultSequence" type="xs:string" use="optional"/>
         <xs:attribute name="endpoint" type="xs:string" use="optional"/>
     </xs:complexType>
 

Modified: synapse/branches/2.0/repository/schema/proxy.xsd
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/repository/schema/proxy.xsd?rev=1001421&r1=1001420&r2=1001421&view=diff
==============================================================================
--- synapse/branches/2.0/repository/schema/proxy.xsd (original)
+++ synapse/branches/2.0/repository/schema/proxy.xsd Sun Sep 26 12:48:29 2010
@@ -61,9 +61,10 @@
             <xs:element ref="parameter" minOccurs="0"/>
         </xs:all>
         <xs:attributeGroup ref="monitoringAspect"/>
-        <xs:attribute name="name" use="required"/>
-        <xs:attribute name="transports" use="optional"/>
-        <xs:attribute name="pinnedServers" use="optional"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="transports" type="xs:string" use="optional"/>
+        <xs:attribute name="pinnedServers" type="xs:string" use="optional"/>
+        <xs:attribute name="startOnLoad" type="xs:boolean" use="optional"/>
     </xs:complexType>
 
 </xs:schema>
\ No newline at end of file