cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [1/2] cxf git commit: Adding a curcuit-breaker-failover element to clustering.xsd
Date Thu, 22 Dec 2016 17:35:13 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 7f4a24d03 -> 443fe6b1b


Adding a curcuit-breaker-failover element to clustering.xsd


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce274c7b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce274c7b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce274c7b

Branch: refs/heads/master
Commit: ce274c7b4450279f2c0d4deae5bc5c3952af5c42
Parents: 7f4a24d
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Dec 22 17:31:53 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Dec 22 17:31:53 2016 +0000

----------------------------------------------------------------------
 .../src/main/resources/schemas/clustering.xsd   | 32 ++++++++++++++++++--
 .../clustering/circuit_breaker_failover.xml     |  8 ++++-
 2 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ce274c7b/rt/features/clustering/src/main/resources/schemas/clustering.xsd
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/resources/schemas/clustering.xsd b/rt/features/clustering/src/main/resources/schemas/clustering.xsd
index 3077b1a..9fd206d 100644
--- a/rt/features/clustering/src/main/resources/schemas/clustering.xsd
+++ b/rt/features/clustering/src/main/resources/schemas/clustering.xsd
@@ -39,7 +39,7 @@
           <xsd:all>
             <xsd:element name="strategy" type="xsd:anyType" minOccurs="0">
               <xsd:annotation>
-                <xsd:documentation>Configures the strategy that the failover feature
will be used. The Strategy object instance need to be implemented the org.apache.cxf.clustering.FailoverStrategy.</xsd:documentation>
+                <xsd:documentation>Configures the strategy that the failover feature
will use. The Strategy object instance need to implement the org.apache.cxf.clustering.FailoverStrategy.</xsd:documentation>
               </xsd:annotation>
             </xsd:element>
             <xsd:element name="targetSelector" type="xsd:anyType" minOccurs="0">
@@ -63,12 +63,12 @@
           <xsd:all>
             <xsd:element name="strategy" type="xsd:anyType" minOccurs="0">
               <xsd:annotation>
-                <xsd:documentation>Configures the strategy that the loadDistributor
feature will be used. The Strategy object instance need to be implemented the org.apache.cxf.clustering.FailoverStrategy.</xsd:documentation>
+                <xsd:documentation>Configures the strategy that the loadDistributor
feature will use. The Strategy object instance need to implement the org.apache.cxf.clustering.FailoverStrategy.</xsd:documentation>
               </xsd:annotation>
             </xsd:element>
             <xsd:element name="targetSelector" type="xsd:anyType" minOccurs="0">
               <xsd:annotation>
-                <xsd:documentation>Configures the the targetSelector which will be
used in the loadDistributor feature.</xsd:documentation>
+                <xsd:documentation>Configures the targetSelector which will be used
in the loadDistributor feature.</xsd:documentation>
               </xsd:annotation>
             </xsd:element>
           </xsd:all>   
@@ -76,5 +76,31 @@
       </xsd:complexContent>
     </xsd:complexType>
   </xsd:element>
+  
+  <xsd:element name="circuit-breaker-failover">
+    <xsd:annotation>
+      <xsd:documentation>Configures the circuit breaker feature. This element is associated
with the org.apache.cxf.clustering.FailoverFeature object.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="cxf-beans:identifiedType">
+          <xsd:all>
+            <xsd:element name="strategy" type="xsd:anyType" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>Configures the strategy that the circuit breaker
feature will use. The Strategy object instance need to implement the org.apache.cxf.clustering.FailoverStrategy.</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="targetSelector" type="xsd:anyType" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>Configures the targetSelector which will be used
in the loadDistributor feature.</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+          </xsd:all>   
+          <xsd:attribute name="threshold" type="xsd:int"/>
+          <xsd:attribute name="timeout" type="xsd:int"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
  
 </xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce274c7b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/circuit_breaker_failover.xml
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/circuit_breaker_failover.xml
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/circuit_breaker_failover.xml
index e9b81e3..2d75383 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/circuit_breaker_failover.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/circuit_breaker_failover.xml
@@ -17,7 +17,13 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:clustering="http://cxf.apache.org/clustering"
xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:clustering="http://cxf.apache.org/clustering"
xmlns:http="http://cxf.apache.org/transports/http/configuration" 
+xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+                    http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
+                    http://cxf.apache.org/transports/http/configuration
+                    http://cxf.apache.org/schemas/configuration/http-conf.xsd 
+                    http://www.springframework.org/schema/beans
+                    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
     <bean id="Sequential" class="org.apache.cxf.clustering.SequentialStrategy"/>
     <bean id="Random" class="org.apache.cxf.clustering.RandomStrategy"/>
     <jaxws:client name="{http://cxf.apache.org/greeter_control}ReplicatedPortA" createdFromAPI="true">


Mime
View raw message