stack/erp5/: Stick to zope conf naming.

software/erp5/instance-erp5-input-schema.json

@@ -81,12 +81,12 @@
       "uniqueItems": true,
       "type": "array"
     },
-    "activity-deadline": {
+    "activity-timeout": {
       "description": "How long a CMFActivity-initiated transaction may last, in seconds",
       "default": null,
       "type": ["number", "null"]
     },
-    "publication-deadline": {
+    "publisher-timeout": {
       "description": "How long a publisher-initiated transaction may last, in seconds",
       "default": null,
       "type": ["number", "null"]
@@ -103,12 +103,12 @@
               "default": false,
               "type": "boolean"
             },
-            "activity-deadline": {
-              "description": "Override global activity deadline",
+            "activity-timeout": {
+              "description": "Override global activity timeout",
               "type": ["number", "null"]
             },
-            "publication-deadline": {
-              "description": "Override global publication deadline",
+            "publisher-timeout": {
+              "description": "Override global publisher timeout",
               "type": ["number", "null"]
             }
           },

stack/erp5/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = e91c0fbd0df441884f7422fa7976053c
 
 [template-zope-conf]
 filename = zope.conf.in
-md5sum = 2631a576ffe74c9e6a08cc0a16883765
+md5sum = 5ce9d5e99880d5db9ed339bbefe28d34
 
 [site-zcml]
 filename = site.zcml
@@ -74,7 +74,7 @@ md5sum = b5ac16fdeed8863e465e955ba6d1e12a
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 852cad92ad2ec3d5dbd2f94efae2b401
+md5sum = ac155f28a096747fc267f32a1cec46e1
 
 [template-zeo]
 filename = instance-zeo.cfg.in
@@ -82,7 +82,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 98b3032baaaf424527be0b106d1f48e6
+md5sum = 9fa66b93fbf6a40aa8136c651ad9f539
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -254,8 +254,8 @@ config-tidstorage-port = ${request-zodb:connection-tidstorage-port}
 {% endfor -%}
 software-type = zope
 
-{% set global_publication_deadline = slapparameter_dict.get('publication-deadline') -%}
-{% set global_activity_deadline = slapparameter_dict.get('activity-deadline') -%}
+{% set global_publisher_timeout = slapparameter_dict.get('publisher-timeout') -%}
+{% set global_activity_timeout = slapparameter_dict.get('activity-timeout') -%}
 {% set zope_family_dict = {} -%}
 {% set zope_family_name_list = [] -%}
 {% set zope_backend_path_dict = {} -%}
@@ -293,8 +293,8 @@ config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-thres
 config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
 {# BBB: zope_parameter_dict used to contain 'webdav', so fallback to it -#}
 config-webdav = {{ dumps(current_zope_family_override_dict.get('webdav', zope_parameter_dict.get('webdav', False))) }}
-config-publication-deadline = {{ dumps(current_zope_family_override_dict.get('publication-deadline', global_publication_deadline)) }}
-config-activity-deadline = {{ dumps(current_zope_family_override_dict.get('activity-deadline', global_activity_deadline)) }}
+config-publisher-timeout = {{ dumps(current_zope_family_override_dict.get('publisher-timeout', global_publisher_timeout)) }}
+config-activity-timeout = {{ dumps(current_zope_family_override_dict.get('activity-timeout', global_activity_timeout)) }}
 {%   if test_runner_enabled -%}
 config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
 

stack/erp5/instance-zope.cfg.in

@@ -276,8 +276,8 @@ cloudooo-url = {{ (cloudooo if cloudooo.port == None else
 {%   endif -%}
 {% endfor -%}
 developer-list = {{ dumps(slapparameter_dict['developer-list']) }}
-publication-deadline = {{ dumps(slapparameter_dict['publication-deadline']) }}
-activity-deadline = {{ dumps(slapparameter_dict['activity-deadline']) }}
+publisher-timeout = {{ dumps(slapparameter_dict['publisher-timeout']) }}
+activity-timeout = {{ dumps(slapparameter_dict['activity-timeout']) }}
 instance = ${directory:instance}
 instance-products = ${directory:instance-products}
 deadlock-path = /manage_debug_threads

stack/erp5/zope.conf.in

@@ -140,14 +140,14 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
 </zodb_db>
 
 {% set developer_list = parameter_dict['developer-list'] -%}
-{% set publication_deadline = parameter_dict['publication-deadline'] -%}
-{% set activity_deadline = parameter_dict['activity-deadline'] -%}
-{% if developer_list or publication_deadline or activity_deadline -%}
+{% set publisher_timeout = parameter_dict['publisher-timeout'] -%}
+{% set activity_timeout = parameter_dict['activity-timeout'] -%}
+{% if developer_list or publisher_timeout or activity_timeout -%}
 %import Products.ERP5Type
 <ERP5Type erp5>
   {% if developer_list %}developers {{ developer_list | join(' ') }}{% endif %}
-  {% if publication_deadline %}publisher-timeout {{ publication_deadline }}{% endif %}
-  {% if activity_deadline %}activity-timeout {{ activity_deadline }}{% endif %}
+  {% if publisher_timeout %}publisher-timeout {{ publisher_timeout }}{% endif %}
+  {% if activity_timeout %}activity-timeout {{ activity_timeout }}{% endif %}
 </ERP5Type>
 
 {% endif -%}