Merge pull request #30 from laurentC35/dev-loop

Change bindingsDependency to bindingDependencies (boolean to array)
InseeFr · Jul 24, 2020 · 7a83355 · 7a83355
2 parents 9c12885 + 09b0157
commit 7a83355
Show file tree

Hide file tree

Showing 10 changed files with 10,891 additions and 11,083 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>fr.insee.lunatic</groupId>
 	<artifactId>lunatic-model</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0-rc3</version>
 	<name>Lunatic Model</name>
 	<description>Classes and converters for the Lunatic model</description>
 	<url>http://www.insee.fr</url>

diff --git a/src/main/resources/xsd/LunaticModel.xsd b/src/main/resources/xsd/LunaticModel.xsd
@@ -74,7 +74,7 @@
             <xs:element name="declarations" type="DeclarationType" minOccurs="0" maxOccurs="unbounded"/>
             <!-- Warning : To validate the name -->
             <xs:element name="conditionFilter" type="xs:string" minOccurs="0"/>
-            <xs:element name="bindingsDependency" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="bindingDependencies" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" use="required"/>
         <xs:attribute name="componentType" type="ComponentTypeEnum"/>

diff --git a/src/main/resources/xsd/LunaticModelFlat.xsd b/src/main/resources/xsd/LunaticModelFlat.xsd
@@ -66,7 +66,7 @@
             <xs:element name="declarations" type="DeclarationType" minOccurs="0" maxOccurs="unbounded"/>
             <!-- Warning : To validate the name -->
             <xs:element name="conditionFilter" type="xs:string" minOccurs="0"/>
-            <xs:element name="bindingsDependency" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="bindingDependencies" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" use="required"/>
         <xs:attribute name="componentType" type="ComponentTypeEnum"/>

diff --git a/src/test/resources/dummy/form.xml b/src/test/resources/dummy/form.xml
diff --git a/src/test/resources/dummy/form_flat.xml b/src/test/resources/dummy/form_flat.xml