From 72fa7d92129925c4ae45e482b4573606ab94b8cb Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Mon, 13 Sep 2021 11:50:50 +0200
Subject: [PATCH 1/3] Split default/registry.xml into various files.

The general settings remain in registry.xml.
Weak, moderate, strong, terse, and generic get their own file in the registry directory.
(Generic is not used by default, it was commented out in the original.)
This should give a better overview.

Also, this makes it easier to copy `registry/terse.xml` for an upgrade step.
---
 plone/app/caching/operations/configure.zcml   |   2 +-
 .../app/caching/profiles/default/registry.xml | 279 ------------------
 .../profiles/default/registry/generic.xml     |  57 ++++
 .../profiles/default/registry/moderate.xml    |  53 ++++
 .../profiles/default/registry/strong.xml      |  61 ++++
 .../profiles/default/registry/terse.xml       |  61 ++++
 .../profiles/default/registry/weak.xml        |  45 +++
 7 files changed, 278 insertions(+), 280 deletions(-)
 create mode 100644 plone/app/caching/profiles/default/registry/generic.xml
 create mode 100644 plone/app/caching/profiles/default/registry/moderate.xml
 create mode 100644 plone/app/caching/profiles/default/registry/strong.xml
 create mode 100644 plone/app/caching/profiles/default/registry/terse.xml
 create mode 100644 plone/app/caching/profiles/default/registry/weak.xml

diff --git a/plone/app/caching/operations/configure.zcml b/plone/app/caching/operations/configure.zcml
index 416c0d4..a142fe3 100644
--- a/plone/app/caching/operations/configure.zcml
+++ b/plone/app/caching/operations/configure.zcml
@@ -24,7 +24,7 @@
     <adapter   factory=".default.NoCaching"             name="plone.app.caching.noCaching" />
     <utility component=".default.NoCaching"             name="plone.app.caching.noCaching" />
 
-    <!-- Uncomment to show the "Generic caching" in the UI (also see profiles/default/registry.xml)
+    <!-- Uncomment to show the "Generic caching" in the UI (also see profiles/default/registry/generic.xml)
     <adapter   factory=".default.BaseCaching"           name="plone.app.caching.baseCaching" />
     <utility component=".default.BaseCaching"           name="plone.app.caching.baseCaching" />
     -->
diff --git a/plone/app/caching/profiles/default/registry.xml b/plone/app/caching/profiles/default/registry.xml
index 8488373..6dbbf1c 100644
--- a/plone/app/caching/profiles/default/registry.xml
+++ b/plone/app/caching/profiles/default/registry.xml
@@ -12,10 +12,6 @@
     <!-- Default content type/template mappings
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
 
-    <!-- <record name="plone.app.caching.interfaces.IPloneCacheSettings.contentTypeRulesetMapping">
-        <value purge="False">
-        </value>
-    </record> -->
 
     <record name="plone.app.caching.interfaces.IPloneCacheSettings.templateRulesetMapping">
         <value purge="False">
@@ -53,279 +49,4 @@
         <value></value>
     </record>
 
-
-    <!-- Weak caching -->
-    <record name="plone.app.caching.weakCaching.etags">
-        <field type="plone.registry.field.Tuple">
-            <title>ETags</title>
-            <description>A list of ETag component names to include</description>
-            <value_type type="plone.registry.field.ASCIILine" />
-            <required>False</required>
-        </field>
-        <value>
-        </value>
-    </record>
-    <record name="plone.app.caching.weakCaching.lastModified">
-        <field type="plone.registry.field.Bool">
-            <title>Last-modified validation</title>
-            <description>Turn on Last-Modified headers</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.weakCaching.ramCache">
-        <field type="plone.registry.field.Bool">
-            <title>RAM cache</title>
-            <description>Turn on caching in Zope memory</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.weakCaching.vary">
-        <field type="plone.registry.field.ASCIILine">
-            <title>Vary</title>
-            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
-            <required>False</required>
-        </field>
-        <value></value>
-    </record>
-    <record name="plone.app.caching.weakCaching.anonOnly">
-        <field type="plone.registry.field.Bool">
-            <title>Only cache for anonymous users</title>
-            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-
-
-    <!-- Terse caching -->
-    <record name="plone.app.caching.terseCaching.maxage">
-        <field type="plone.registry.field.Int">
-            <title>Maximum age</title>
-            <description>Time (in seconds) to cache the response in the browser</description>
-            <required>False</required>
-        </field>
-        <value>10</value>
-    </record>
-    <record name="plone.app.caching.terseCaching.smaxage">
-        <field type="plone.registry.field.Int">
-            <title>Shared maximum age</title>
-            <description>Time (in seconds) to cache the response in the caching proxy</description>
-            <required>False</required>
-        </field>
-        <value>60</value>
-    </record>
-    <record name="plone.app.caching.terseCaching.etags">
-        <field type="plone.registry.field.Tuple">
-            <title>ETags</title>
-            <description>A list of ETag component names to include</description>
-            <value_type type="plone.registry.field.ASCIILine" />
-            <required>False</required>
-        </field>
-        <value>
-        </value>
-    </record>
-    <record name="plone.app.caching.terseCaching.lastModified">
-        <field type="plone.registry.field.Bool">
-            <title>Last-modified validation</title>
-            <description>Turn on Last-Modified headers</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.terseCaching.ramCache">
-        <field type="plone.registry.field.Bool">
-            <title>RAM cache</title>
-            <description>Turn on caching in Zope memory</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.terseCaching.vary">
-        <field type="plone.registry.field.ASCIILine">
-            <title>Vary</title>
-            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
-            <required>False</required>
-        </field>
-        <value></value>
-    </record>
-    <record name="plone.app.caching.terseCaching.anonOnly">
-        <field type="plone.registry.field.Bool">
-            <title>Only cache for anonymous users</title>
-            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-
-
-    <!-- Moderate caching -->
-    <record name="plone.app.caching.moderateCaching.smaxage">
-        <field type="plone.registry.field.Int">
-            <title>Shared maximum age</title>
-            <description>Time (in seconds) to cache the response in the caching proxy</description>
-            <required>False</required>
-        </field>
-        <value>86400</value>
-    </record>
-    <record name="plone.app.caching.moderateCaching.etags">
-        <field type="plone.registry.field.Tuple">
-            <title>ETags</title>
-            <description>A list of ETag component names to include</description>
-            <value_type type="plone.registry.field.ASCIILine" />
-            <required>False</required>
-        </field>
-        <value>
-        </value>
-    </record>
-    <record name="plone.app.caching.moderateCaching.lastModified">
-        <field type="plone.registry.field.Bool">
-            <title>Last-modified validation</title>
-            <description>Turn on Last-Modified headers</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.moderateCaching.ramCache">
-        <field type="plone.registry.field.Bool">
-            <title>RAM cache</title>
-            <description>Turn on caching in Zope memory</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.moderateCaching.vary">
-        <field type="plone.registry.field.ASCIILine">
-            <title>Vary</title>
-            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
-            <required>False</required>
-        </field>
-        <value></value>
-    </record>
-    <record name="plone.app.caching.moderateCaching.anonOnly">
-        <field type="plone.registry.field.Bool">
-            <title>Only cache for anonymous users</title>
-            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-
-    <!-- Strong caching -->
-    <record name="plone.app.caching.strongCaching.maxage">
-        <field type="plone.registry.field.Int">
-            <title>Maximum age</title>
-            <description>Time (in seconds) to cache the response in the browser or caching proxy</description>
-            <required>False</required>
-        </field>
-        <value>86400</value>
-    </record>
-    <record name="plone.app.caching.strongCaching.smaxage">
-        <field type="plone.registry.field.Int">
-            <title>Shared maximum age</title>
-            <description>Time (in seconds) to cache the response in the caching proxy. Leave blank to use value from "Maximum age" field.</description>
-            <required>False</required>
-        </field>
-        <value></value>
-    </record>
-    <record name="plone.app.caching.strongCaching.etags">
-        <field type="plone.registry.field.Tuple">
-            <title>ETags</title>
-            <description>A list of ETag component names to include</description>
-            <value_type type="plone.registry.field.ASCIILine" />
-            <required>False</required>
-        </field>
-        <value>
-        </value>
-    </record>
-    <record name="plone.app.caching.strongCaching.lastModified">
-        <field type="plone.registry.field.Bool">
-            <title>Last-modified validation</title>
-            <description>Turn on Last-Modified headers</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.strongCaching.ramCache">
-        <field type="plone.registry.field.Bool">
-            <title>RAM cache</title>
-            <description>Turn on caching in Zope memory</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.strongCaching.vary">
-        <field type="plone.registry.field.ASCIILine">
-            <title>Vary</title>
-            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
-            <required>False</required>
-        </field>
-        <value></value>
-    </record>
-    <record name="plone.app.caching.strongCaching.anonOnly">
-        <field type="plone.registry.field.Bool">
-            <title>Only cache for anonymous users</title>
-            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-
-    <!-- Uncomment if showing "Generic caching" in the UI.
-         Also see operations/configure.zcml
-
-    <record name="plone.app.caching.baseCaching.maxage">
-        <field type="plone.registry.field.Int">
-            <title>Maximum age</title>
-            <description>Time (in seconds) to cache the response in the browser or caching proxy</description>
-            <required>False</required>
-        </field>
-        <value></value>
-    </record>
-    <record name="plone.app.caching.baseCaching.smaxage">
-        <field type="plone.registry.field.Int">
-            <title>Shared maximum age</title>
-            <description>Time (in seconds) to cache the response in the caching proxy. Leave blank to use value from "Maximum age" field.</description>
-            <required>False</required>
-        </field>
-        <value></value>
-    </record>
-    <record name="plone.app.caching.baseCaching.etags">
-        <field type="plone.registry.field.Tuple">
-            <title>ETags</title>
-            <description>A list of ETag component names to include</description>
-            <value_type type="plone.registry.field.ASCIILine" />
-            <required>False</required>
-        </field>
-        <value>
-        </value>
-    </record>
-    <record name="plone.app.caching.baseCaching.lastModified">
-        <field type="plone.registry.field.Bool">
-            <title>Last-modified validation</title>
-            <description>Turn on Last-Modified headers</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.baseCaching.ramCache">
-        <field type="plone.registry.field.Bool">
-            <title>RAM cache</title>
-            <description>Turn on caching in Zope memory</description>
-            <required>False</required>
-        </field>
-        <value>False</value>
-    </record>
-    <record name="plone.app.caching.baseCaching.vary">
-        <field type="plone.registry.field.ASCIILine">
-            <title>Vary</title>
-            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
-            <required>False</required>
-        </field>
-        <value></value>
-    </record>
-    -->
-
-
 </registry>
diff --git a/plone/app/caching/profiles/default/registry/generic.xml b/plone/app/caching/profiles/default/registry/generic.xml
new file mode 100644
index 0000000..8c5bfd2
--- /dev/null
+++ b/plone/app/caching/profiles/default/registry/generic.xml
@@ -0,0 +1,57 @@
+<registry>
+    <!-- Uncomment if showing "Generic caching" in the UI.
+         Also see operations/configure.zcml
+
+    <record name="plone.app.caching.baseCaching.maxage">
+        <field type="plone.registry.field.Int">
+            <title>Maximum age</title>
+            <description>Time (in seconds) to cache the response in the browser or caching proxy</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    <record name="plone.app.caching.baseCaching.smaxage">
+        <field type="plone.registry.field.Int">
+            <title>Shared maximum age</title>
+            <description>Time (in seconds) to cache the response in the caching proxy. Leave blank to use value from "Maximum age" field.</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    <record name="plone.app.caching.baseCaching.etags">
+        <field type="plone.registry.field.Tuple">
+            <title>ETags</title>
+            <description>A list of ETag component names to include</description>
+            <value_type type="plone.registry.field.ASCIILine" />
+            <required>False</required>
+        </field>
+        <value>
+        </value>
+    </record>
+    <record name="plone.app.caching.baseCaching.lastModified">
+        <field type="plone.registry.field.Bool">
+            <title>Last-modified validation</title>
+            <description>Turn on Last-Modified headers</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.baseCaching.ramCache">
+        <field type="plone.registry.field.Bool">
+            <title>RAM cache</title>
+            <description>Turn on caching in Zope memory</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.baseCaching.vary">
+        <field type="plone.registry.field.ASCIILine">
+            <title>Vary</title>
+            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    -->
+
+</registry>
diff --git a/plone/app/caching/profiles/default/registry/moderate.xml b/plone/app/caching/profiles/default/registry/moderate.xml
new file mode 100644
index 0000000..ed68cb0
--- /dev/null
+++ b/plone/app/caching/profiles/default/registry/moderate.xml
@@ -0,0 +1,53 @@
+<registry>
+    <!-- Moderate caching -->
+    <record name="plone.app.caching.moderateCaching.smaxage">
+        <field type="plone.registry.field.Int">
+            <title>Shared maximum age</title>
+            <description>Time (in seconds) to cache the response in the caching proxy</description>
+            <required>False</required>
+        </field>
+        <value>86400</value>
+    </record>
+    <record name="plone.app.caching.moderateCaching.etags">
+        <field type="plone.registry.field.Tuple">
+            <title>ETags</title>
+            <description>A list of ETag component names to include</description>
+            <value_type type="plone.registry.field.ASCIILine" />
+            <required>False</required>
+        </field>
+        <value>
+        </value>
+    </record>
+    <record name="plone.app.caching.moderateCaching.lastModified">
+        <field type="plone.registry.field.Bool">
+            <title>Last-modified validation</title>
+            <description>Turn on Last-Modified headers</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.moderateCaching.ramCache">
+        <field type="plone.registry.field.Bool">
+            <title>RAM cache</title>
+            <description>Turn on caching in Zope memory</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.moderateCaching.vary">
+        <field type="plone.registry.field.ASCIILine">
+            <title>Vary</title>
+            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    <record name="plone.app.caching.moderateCaching.anonOnly">
+        <field type="plone.registry.field.Bool">
+            <title>Only cache for anonymous users</title>
+            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+</registry>
diff --git a/plone/app/caching/profiles/default/registry/strong.xml b/plone/app/caching/profiles/default/registry/strong.xml
new file mode 100644
index 0000000..c7e4df9
--- /dev/null
+++ b/plone/app/caching/profiles/default/registry/strong.xml
@@ -0,0 +1,61 @@
+<registry>
+    <!-- Strong caching -->
+    <record name="plone.app.caching.strongCaching.maxage">
+        <field type="plone.registry.field.Int">
+            <title>Maximum age</title>
+            <description>Time (in seconds) to cache the response in the browser or caching proxy</description>
+            <required>False</required>
+        </field>
+        <value>86400</value>
+    </record>
+    <record name="plone.app.caching.strongCaching.smaxage">
+        <field type="plone.registry.field.Int">
+            <title>Shared maximum age</title>
+            <description>Time (in seconds) to cache the response in the caching proxy. Leave blank to use value from "Maximum age" field.</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    <record name="plone.app.caching.strongCaching.etags">
+        <field type="plone.registry.field.Tuple">
+            <title>ETags</title>
+            <description>A list of ETag component names to include</description>
+            <value_type type="plone.registry.field.ASCIILine" />
+            <required>False</required>
+        </field>
+        <value>
+        </value>
+    </record>
+    <record name="plone.app.caching.strongCaching.lastModified">
+        <field type="plone.registry.field.Bool">
+            <title>Last-modified validation</title>
+            <description>Turn on Last-Modified headers</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.strongCaching.ramCache">
+        <field type="plone.registry.field.Bool">
+            <title>RAM cache</title>
+            <description>Turn on caching in Zope memory</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.strongCaching.vary">
+        <field type="plone.registry.field.ASCIILine">
+            <title>Vary</title>
+            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    <record name="plone.app.caching.strongCaching.anonOnly">
+        <field type="plone.registry.field.Bool">
+            <title>Only cache for anonymous users</title>
+            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+</registry>
diff --git a/plone/app/caching/profiles/default/registry/terse.xml b/plone/app/caching/profiles/default/registry/terse.xml
new file mode 100644
index 0000000..adae5bb
--- /dev/null
+++ b/plone/app/caching/profiles/default/registry/terse.xml
@@ -0,0 +1,61 @@
+<registry>
+    <!-- Terse caching -->
+    <record name="plone.app.caching.terseCaching.maxage">
+        <field type="plone.registry.field.Int">
+            <title>Maximum age</title>
+            <description>Time (in seconds) to cache the response in the browser</description>
+            <required>False</required>
+        </field>
+        <value>10</value>
+    </record>
+    <record name="plone.app.caching.terseCaching.smaxage">
+        <field type="plone.registry.field.Int">
+            <title>Shared maximum age</title>
+            <description>Time (in seconds) to cache the response in the caching proxy</description>
+            <required>False</required>
+        </field>
+        <value>60</value>
+    </record>
+    <record name="plone.app.caching.terseCaching.etags">
+        <field type="plone.registry.field.Tuple">
+            <title>ETags</title>
+            <description>A list of ETag component names to include</description>
+            <value_type type="plone.registry.field.ASCIILine" />
+            <required>False</required>
+        </field>
+        <value>
+        </value>
+    </record>
+    <record name="plone.app.caching.terseCaching.lastModified">
+        <field type="plone.registry.field.Bool">
+            <title>Last-modified validation</title>
+            <description>Turn on Last-Modified headers</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.terseCaching.ramCache">
+        <field type="plone.registry.field.Bool">
+            <title>RAM cache</title>
+            <description>Turn on caching in Zope memory</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.terseCaching.vary">
+        <field type="plone.registry.field.ASCIILine">
+            <title>Vary</title>
+            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    <record name="plone.app.caching.terseCaching.anonOnly">
+        <field type="plone.registry.field.Bool">
+            <title>Only cache for anonymous users</title>
+            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+</registry>
diff --git a/plone/app/caching/profiles/default/registry/weak.xml b/plone/app/caching/profiles/default/registry/weak.xml
new file mode 100644
index 0000000..674f819
--- /dev/null
+++ b/plone/app/caching/profiles/default/registry/weak.xml
@@ -0,0 +1,45 @@
+<registry>
+    <!-- Weak caching -->
+    <record name="plone.app.caching.weakCaching.etags">
+        <field type="plone.registry.field.Tuple">
+            <title>ETags</title>
+            <description>A list of ETag component names to include</description>
+            <value_type type="plone.registry.field.ASCIILine" />
+            <required>False</required>
+        </field>
+        <value>
+        </value>
+    </record>
+    <record name="plone.app.caching.weakCaching.lastModified">
+        <field type="plone.registry.field.Bool">
+            <title>Last-modified validation</title>
+            <description>Turn on Last-Modified headers</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.weakCaching.ramCache">
+        <field type="plone.registry.field.Bool">
+            <title>RAM cache</title>
+            <description>Turn on caching in Zope memory</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.weakCaching.vary">
+        <field type="plone.registry.field.ASCIILine">
+            <title>Vary</title>
+            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    <record name="plone.app.caching.weakCaching.anonOnly">
+        <field type="plone.registry.field.Bool">
+            <title>Only cache for anonymous users</title>
+            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+</registry>

From dd8e1f7c081df9c5c8dffced89f6e3a533b058ed Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Mon, 13 Sep 2021 12:01:14 +0200
Subject: [PATCH 2/3] Moved GS parts of configure.zcml to genericsetup.zcml.

---
 plone/app/caching/configure.zcml | 17 +----------------
 plone/app/caching/profiles.zcml  | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 plone/app/caching/profiles.zcml

diff --git a/plone/app/caching/configure.zcml b/plone/app/caching/configure.zcml
index 561a7af..9f9b1fc 100644
--- a/plone/app/caching/configure.zcml
+++ b/plone/app/caching/configure.zcml
@@ -1,7 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:zcml="http://namespaces.zope.org/zcml"
-    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     i18n_domain="plone">
 
     <include package="z3c.zcmlhook" file="meta.zcml" />
@@ -14,21 +13,7 @@
 
     <include package=".browser" />
     <include package=".operations" />
-
-    <genericsetup:registerProfile
-        name="default"
-        title="HTTP caching support"
-        directory="profiles/default"
-        description="Installs plone.app.caching"
-        provides="Products.GenericSetup.interfaces.EXTENSION"
-        />
-
-    <genericsetup:importStep
-        name="plone.app.caching"
-        title="Plone caching - additional installation steps"
-        description="Imperative configuration for plone.app.caching"
-        handler=".setuphandlers.importVarious"
-        />
+    <include file="profiles.zcml" />
 
     <zcml:customAction
         handler=".setuphandlers.enableExplicitMode"
diff --git a/plone/app/caching/profiles.zcml b/plone/app/caching/profiles.zcml
new file mode 100644
index 0000000..8bfff04
--- /dev/null
+++ b/plone/app/caching/profiles.zcml
@@ -0,0 +1,21 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    i18n_domain="plone">
+
+    <genericsetup:registerProfile
+        name="default"
+        title="HTTP caching support"
+        directory="profiles/default"
+        description="Installs plone.app.caching"
+        provides="Products.GenericSetup.interfaces.EXTENSION"
+        />
+
+    <genericsetup:importStep
+        name="plone.app.caching"
+        title="Plone caching - additional installation steps"
+        description="Imperative configuration for plone.app.caching"
+        handler=".setuphandlers.importVarious"
+        />
+
+</configure>

From 2e1b7d0ddde85794ed8f10d641959793a1176658 Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Mon, 13 Sep 2021 12:11:36 +0200
Subject: [PATCH 3/3] Add upgrade step to define the new base terse cache
 setting.

Fixes https://github.com/plone/plone.app.caching/issues/82

Note: to let this be automatically applied when running @@plone-upgrade, we should add it to the AddOn list in CMFPlone/MigrationTool.py.
I will do that part next, but this can be done separately.
---
 news/82.bugfix                                |  2 +
 plone/app/caching/profiles.zcml               | 18 ++++++
 .../app/caching/profiles/default/metadata.xml |  2 +-
 .../caching/profiles/v2/registry/terse.xml    | 61 +++++++++++++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 news/82.bugfix
 create mode 100644 plone/app/caching/profiles/v2/registry/terse.xml

diff --git a/news/82.bugfix b/news/82.bugfix
new file mode 100644
index 0000000..cb3db02
--- /dev/null
+++ b/news/82.bugfix
@@ -0,0 +1,2 @@
+Add upgrade step to define the new base terse cache setting.
+[maurits]
diff --git a/plone/app/caching/profiles.zcml b/plone/app/caching/profiles.zcml
index 8bfff04..960191c 100644
--- a/plone/app/caching/profiles.zcml
+++ b/plone/app/caching/profiles.zcml
@@ -11,6 +11,14 @@
         provides="Products.GenericSetup.interfaces.EXTENSION"
         />
 
+    <genericsetup:registerProfile
+        name="v2"
+        title="Upgrade plone.app.caching to v2 with terse caching"
+        directory="profiles/default"
+        for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+        provides="Products.GenericSetup.interfaces.EXTENSION"
+        />
+
     <genericsetup:importStep
         name="plone.app.caching"
         title="Plone caching - additional installation steps"
@@ -18,4 +26,14 @@
         handler=".setuphandlers.importVarious"
         />
 
+    <genericsetup:upgradeSteps
+        source="1"
+        destination="2"
+        profile="plone.app.caching:default">
+        <genericsetup:upgradeDepends
+            title="Upgrade plone.app.caching to v2 with terse caching"
+            import_profile="plone.app.caching:v2"
+            />
+    </genericsetup:upgradeSteps>
+
 </configure>
diff --git a/plone/app/caching/profiles/default/metadata.xml b/plone/app/caching/profiles/default/metadata.xml
index dc95597..5f38361 100644
--- a/plone/app/caching/profiles/default/metadata.xml
+++ b/plone/app/caching/profiles/default/metadata.xml
@@ -1,5 +1,5 @@
 <metadata>
-    <version>1</version>
+    <version>2</version>
     <dependencies>
         <dependency>profile-plone.app.registry:default</dependency>
     </dependencies>
diff --git a/plone/app/caching/profiles/v2/registry/terse.xml b/plone/app/caching/profiles/v2/registry/terse.xml
new file mode 100644
index 0000000..adae5bb
--- /dev/null
+++ b/plone/app/caching/profiles/v2/registry/terse.xml
@@ -0,0 +1,61 @@
+<registry>
+    <!-- Terse caching -->
+    <record name="plone.app.caching.terseCaching.maxage">
+        <field type="plone.registry.field.Int">
+            <title>Maximum age</title>
+            <description>Time (in seconds) to cache the response in the browser</description>
+            <required>False</required>
+        </field>
+        <value>10</value>
+    </record>
+    <record name="plone.app.caching.terseCaching.smaxage">
+        <field type="plone.registry.field.Int">
+            <title>Shared maximum age</title>
+            <description>Time (in seconds) to cache the response in the caching proxy</description>
+            <required>False</required>
+        </field>
+        <value>60</value>
+    </record>
+    <record name="plone.app.caching.terseCaching.etags">
+        <field type="plone.registry.field.Tuple">
+            <title>ETags</title>
+            <description>A list of ETag component names to include</description>
+            <value_type type="plone.registry.field.ASCIILine" />
+            <required>False</required>
+        </field>
+        <value>
+        </value>
+    </record>
+    <record name="plone.app.caching.terseCaching.lastModified">
+        <field type="plone.registry.field.Bool">
+            <title>Last-modified validation</title>
+            <description>Turn on Last-Modified headers</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.terseCaching.ramCache">
+        <field type="plone.registry.field.Bool">
+            <title>RAM cache</title>
+            <description>Turn on caching in Zope memory</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+    <record name="plone.app.caching.terseCaching.vary">
+        <field type="plone.registry.field.ASCIILine">
+            <title>Vary</title>
+            <description>Name(s) of HTTP headers that must match for the caching proxy to return a cached response</description>
+            <required>False</required>
+        </field>
+        <value></value>
+    </record>
+    <record name="plone.app.caching.terseCaching.anonOnly">
+        <field type="plone.registry.field.Bool">
+            <title>Only cache for anonymous users</title>
+            <description>Ensure logging users always get a fresh page. Note that if you are caching pages in a proxy cache, you'll still need to use a Vary response header to keep anonymous and authenticated content separate.</description>
+            <required>False</required>
+        </field>
+        <value>False</value>
+    </record>
+</registry>