From 132127aa75d59e4a32120dbd4ba3f08657e007b0 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Thu, 14 Nov 2024 17:41:38 +0100
Subject: [PATCH 1/2] Add "storage" attribute to config/option elements

---
 src/main/resources/concrete-cif-1.0.xsd  |  8 ++++++++
 src/test/resources/cifs-bad/config-1.xml |  6 ++++++
 src/test/resources/cifs-bad/config-2.xml |  6 ++++++
 src/test/resources/cifs-bad/config-3.xml |  6 ++++++
 src/test/resources/cifs-bad/config-4.xml |  6 ++++++
 src/test/resources/cifs-good/config.xml  | 17 +++++++++++++++++
 6 files changed, 49 insertions(+)
 create mode 100644 src/test/resources/cifs-bad/config-1.xml
 create mode 100644 src/test/resources/cifs-bad/config-2.xml
 create mode 100644 src/test/resources/cifs-bad/config-3.xml
 create mode 100644 src/test/resources/cifs-bad/config-4.xml
 create mode 100644 src/test/resources/cifs-good/config.xml

diff --git a/src/main/resources/concrete-cif-1.0.xsd b/src/main/resources/concrete-cif-1.0.xsd
index 7758d54..1588901 100644
--- a/src/main/resources/concrete-cif-1.0.xsd
+++ b/src/main/resources/concrete-cif-1.0.xsd
@@ -334,6 +334,14 @@
                     <xs:simpleContent>
                         <xs:extension base="xs:string">
                             <xs:attribute name="name" type="string-required" use="required" />
+                            <xs:attribute name="storage" use="optional">
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:string">
+                                        <xs:enumeration value="file" />
+                                        <xs:enumeration value="database" />
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:attribute>
                             <xs:attribute name="package" type="handle" use="required" />
                         </xs:extension>
                     </xs:simpleContent>
diff --git a/src/test/resources/cifs-bad/config-1.xml b/src/test/resources/cifs-bad/config-1.xml
new file mode 100644
index 0000000..7d02a49
--- /dev/null
+++ b/src/test/resources/cifs-bad/config-1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<concrete5-cif version="1.0">
+    <config>
+        <option />
+    </config>
+</concrete5-cif>
diff --git a/src/test/resources/cifs-bad/config-2.xml b/src/test/resources/cifs-bad/config-2.xml
new file mode 100644
index 0000000..4e106d5
--- /dev/null
+++ b/src/test/resources/cifs-bad/config-2.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<concrete5-cif version="1.0">
+    <config>
+        <option name="" package="" />
+    </config>
+</concrete5-cif>
diff --git a/src/test/resources/cifs-bad/config-3.xml b/src/test/resources/cifs-bad/config-3.xml
new file mode 100644
index 0000000..e9006b3
--- /dev/null
+++ b/src/test/resources/cifs-bad/config-3.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<concrete5-cif version="1.0">
+    <config>
+        <option name="o1" storage="" package="my_package">foo</option>
+    </config>
+</concrete5-cif>
diff --git a/src/test/resources/cifs-bad/config-4.xml b/src/test/resources/cifs-bad/config-4.xml
new file mode 100644
index 0000000..a976ed4
--- /dev/null
+++ b/src/test/resources/cifs-bad/config-4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<concrete5-cif version="1.0">
+    <config>
+        <option name="o1" storage="wrong" package="my_package">foo</option>
+    </config>
+</concrete5-cif>
diff --git a/src/test/resources/cifs-good/config.xml b/src/test/resources/cifs-good/config.xml
new file mode 100644
index 0000000..2a4a2f6
--- /dev/null
+++ b/src/test/resources/cifs-good/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<concrete5-cif version="1.0">
+    <config>
+        <option name="o1" package="" />
+        <option name="o2" package="my_package" />
+        <option name="o3" storage="file" package="" />
+        <option name="o4" storage="file" package="my_package" />
+        <option name="o5" storage="database" package="" />
+        <option name="o6" storage="database" package="my_package" />
+        <option name="o7" package="">foo</option>
+        <option name="o8" package="my_package">foo</option>
+        <option name="o9" storage="file" package="">foo</option>
+        <option name="o10" storage="file" package="my_package">foo</option>
+        <option name="o11" storage="database" package="">foo</option>
+        <option name="o12" storage="database" package="my_package">foo</option>
+    </config>
+</concrete5-cif>

From 58103c01b1572d4ece9914a121de5d0c181a77a1 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Thu, 14 Nov 2024 18:48:56 +0100
Subject: [PATCH 2/2] Allow keeping previous config values

---
 src/main/resources/concrete-cif-1.0.xsd  | 1 +
 src/test/resources/cifs-bad/config-5.xml | 6 ++++++
 src/test/resources/cifs-bad/config-6.xml | 6 ++++++
 src/test/resources/cifs-good/config.xml  | 2 ++
 4 files changed, 15 insertions(+)
 create mode 100644 src/test/resources/cifs-bad/config-5.xml
 create mode 100644 src/test/resources/cifs-bad/config-6.xml

diff --git a/src/main/resources/concrete-cif-1.0.xsd b/src/main/resources/concrete-cif-1.0.xsd
index 1588901..c5977ce 100644
--- a/src/main/resources/concrete-cif-1.0.xsd
+++ b/src/main/resources/concrete-cif-1.0.xsd
@@ -342,6 +342,7 @@
                                     </xs:restriction>
                                 </xs:simpleType>
                             </xs:attribute>
+                            <xs:attribute name="overwrite" type="xs:boolean" use="optional" />
                             <xs:attribute name="package" type="handle" use="required" />
                         </xs:extension>
                     </xs:simpleContent>
diff --git a/src/test/resources/cifs-bad/config-5.xml b/src/test/resources/cifs-bad/config-5.xml
new file mode 100644
index 0000000..6ec2b3e
--- /dev/null
+++ b/src/test/resources/cifs-bad/config-5.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<concrete5-cif version="1.0">
+    <config>
+        <option name="o1" overwrite="" package="my_package">foo</option>
+    </config>
+</concrete5-cif>
diff --git a/src/test/resources/cifs-bad/config-6.xml b/src/test/resources/cifs-bad/config-6.xml
new file mode 100644
index 0000000..606a5ae
--- /dev/null
+++ b/src/test/resources/cifs-bad/config-6.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<concrete5-cif version="1.0">
+    <config>
+        <option name="o1" overwrite="wrong" package="my_package">foo</option>
+    </config>
+</concrete5-cif>
diff --git a/src/test/resources/cifs-good/config.xml b/src/test/resources/cifs-good/config.xml
index 2a4a2f6..dc795cf 100644
--- a/src/test/resources/cifs-good/config.xml
+++ b/src/test/resources/cifs-good/config.xml
@@ -13,5 +13,7 @@
         <option name="o10" storage="file" package="my_package">foo</option>
         <option name="o11" storage="database" package="">foo</option>
         <option name="o12" storage="database" package="my_package">foo</option>
+        <option name="o13" storage="database" overwrite="false" package="my_package">foo</option>
+        <option name="o14" storage="database" overwrite="true" package="my_package">foo</option>
     </config>
 </concrete5-cif>