From 68d677c0550967e157252e1888d6d345a94c6db6 Mon Sep 17 00:00:00 2001
From: Radoslav Husar <radosoft@gmail.com>
Date: Fri, 20 Feb 2015 00:02:35 +0100
Subject: [PATCH] WFLY-2480 Fix backup-for/backups XSD discrepancy: both can be
 used simultaneously

---
 .../schema/jboss-as-infinispan_2_0.xsd        | 22 +++++++++----------
 .../schema/jboss-as-infinispan_3_0.xsd        | 22 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/clustering/infinispan/extension/src/main/resources/schema/jboss-as-infinispan_2_0.xsd b/clustering/infinispan/extension/src/main/resources/schema/jboss-as-infinispan_2_0.xsd
index 90fc1aeb4082..1d51a269dcc5 100644
--- a/clustering/infinispan/extension/src/main/resources/schema/jboss-as-infinispan_2_0.xsd
+++ b/clustering/infinispan/extension/src/main/resources/schema/jboss-as-infinispan_2_0.xsd
@@ -406,18 +406,16 @@
                             <xs:documentation>The state transfer configuration for distribution and replicated caches.</xs:documentation>
                         </xs:annotation>
                     </xs:element>
-                    <xs:choice minOccurs="0">
-                        <xs:element name="backups" type="tns:backups" minOccurs="0">
-                            <xs:annotation>
-                                <xs:documentation>A list of backup sites for this cache (for use with cross-site replication).</xs:documentation>
-                            </xs:annotation>
-                        </xs:element>
-                        <xs:element name="backup-for" type="tns:backup-for" minOccurs="0">
-                            <xs:annotation>
-                                <xs:documentation>Configures this cache as a backup for a cache on a remote site (for use with cross-site replication).</xs:documentation>
-                            </xs:annotation>
-                        </xs:element>
-                    </xs:choice>
+                    <xs:element name="backups" type="tns:backups" minOccurs="0">
+                        <xs:annotation>
+                            <xs:documentation>A list of backup sites for this cache (for use with cross-site replication).</xs:documentation>
+                        </xs:annotation>
+                    </xs:element>
+                    <xs:element name="backup-for" type="tns:backup-for" minOccurs="0">
+                        <xs:annotation>
+                            <xs:documentation>Configures this cache as a backup for a cache on a remote site (for use with cross-site replication).</xs:documentation>
+                        </xs:annotation>
+                    </xs:element>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
diff --git a/clustering/infinispan/extension/src/main/resources/schema/jboss-as-infinispan_3_0.xsd b/clustering/infinispan/extension/src/main/resources/schema/jboss-as-infinispan_3_0.xsd
index 5e8305b9115b..4ce70c072329 100644
--- a/clustering/infinispan/extension/src/main/resources/schema/jboss-as-infinispan_3_0.xsd
+++ b/clustering/infinispan/extension/src/main/resources/schema/jboss-as-infinispan_3_0.xsd
@@ -406,18 +406,16 @@
                             <xs:documentation>The state transfer configuration for distribution and replicated caches.</xs:documentation>
                         </xs:annotation>
                     </xs:element>
-                    <xs:choice minOccurs="0">
-                        <xs:element name="backups" type="tns:backups" minOccurs="0">
-                            <xs:annotation>
-                                <xs:documentation>A list of backup sites for this cache (for use with cross-site replication).</xs:documentation>
-                            </xs:annotation>
-                        </xs:element>
-                        <xs:element name="backup-for" type="tns:backup-for" minOccurs="0">
-                            <xs:annotation>
-                                <xs:documentation>Configures this cache as a backup for a cache on a remote site (for use with cross-site replication).</xs:documentation>
-                            </xs:annotation>
-                        </xs:element>
-                    </xs:choice>
+                    <xs:element name="backups" type="tns:backups" minOccurs="0">
+                        <xs:annotation>
+                            <xs:documentation>A list of backup sites for this cache (for use with cross-site replication).</xs:documentation>
+                        </xs:annotation>
+                    </xs:element>
+                    <xs:element name="backup-for" type="tns:backup-for" minOccurs="0">
+                        <xs:annotation>
+                            <xs:documentation>Configures this cache as a backup for a cache on a remote site (for use with cross-site replication).</xs:documentation>
+                        </xs:annotation>
+                    </xs:element>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>