WFLY-2480 Fix backup-for/backups XSD discrepancy: both can be used si…

…multaneously
rhusar · Feb 20, 2015 · 68d677c · 68d677c
1 parent 0bda94f
commit 68d677c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 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
@@ -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
@@ -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>