From eb41bebb04cb8158d46d130ba63ca2044f2ccbb1 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Wed, 7 Mar 2012 15:45:09 -0800
Subject:  * Mailing lists get multiple chains and pipelines.  For example,
 normal    postings go through the `posting_chain` while messages to owners to
 through    `owners_chain`.  The default `built-in` chain is renamed to   
 `default-posting-chain` while the `built-in` pipeline is renamed   
 `default-posting-pipeline`.

 * Schema changes:
   - start_chain      -> posting_chain
   - pipeline         -> posting_pipeline
---
 src/mailman/rest/configuration.py       |  2 +-
 src/mailman/rest/docs/configuration.rst | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/mailman/rest')

diff --git a/src/mailman/rest/configuration.py b/src/mailman/rest/configuration.py
index 028ee86fa..5caf53d3c 100644
--- a/src/mailman/rest/configuration.py
+++ b/src/mailman/rest/configuration.py
@@ -192,9 +192,9 @@ ATTRIBUTES = dict(
     next_digest_number=GetterSetter(None),
     no_reply_address=GetterSetter(None),
     owner_address=GetterSetter(None),
-    pipeline=GetterSetter(pipeline_validator),
     post_id=GetterSetter(None),
     posting_address=GetterSetter(None),
+    posting_pipeline=GetterSetter(pipeline_validator),
     real_name=GetterSetter(unicode),
     reply_goes_to_list=GetterSetter(enum_validator(ReplyToMunging)),
     request_address=GetterSetter(None),
diff --git a/src/mailman/rest/docs/configuration.rst b/src/mailman/rest/docs/configuration.rst
index e572acec4..1f83ff262 100644
--- a/src/mailman/rest/docs/configuration.rst
+++ b/src/mailman/rest/docs/configuration.rst
@@ -51,9 +51,9 @@ All readable attributes for a list are available on a sub-resource.
     next_digest_number: 1
     no_reply_address: noreply@example.com
     owner_address: test-one-owner@example.com
-    pipeline: built-in
     post_id: 1
     posting_address: test-one@example.com
+    posting_pipeline: default-posting-pipeline
     real_name: Test-one
     reply_goes_to_list: no_munging
     request_address: test-one-request@example.com
@@ -93,7 +93,7 @@ all the writable attributes in one request.
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
     ...             digest_size_threshold=10.5,
-    ...             pipeline='virgin',
+    ...             posting_pipeline='virgin',
     ...             filter_content=True,
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
@@ -141,8 +141,7 @@ These values are changed permanently.
     include_list_post_header: False
     include_rfc2369_headers: False
     ...
-    pipeline: virgin
-    ...
+    posting_pipeline: virgin
     real_name: Fnords
     reply_goes_to_list: point_to_list
     ...
@@ -174,7 +173,7 @@ must be included.  It is an error to leave one or more out...
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
     ...             digest_size_threshold=10.5,
-    ...             pipeline='virgin',
+    ...             posting_pipeline='virgin',
     ...             filter_content=True,
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
@@ -214,7 +213,7 @@ must be included.  It is an error to leave one or more out...
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
     ...             digest_size_threshold=10.5,
-    ...             pipeline='virgin',
+    ...             posting_pipeline='virgin',
     ...             filter_content=True,
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
@@ -247,7 +246,7 @@ It is also an error to spell an attribute value incorrectly...
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
     ...             digest_size_threshold=10.5,
-    ...             pipeline='virgin',
+    ...             posting_pipeline='virgin',
     ...             filter_content=True,
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
@@ -279,7 +278,7 @@ It is also an error to spell an attribute value incorrectly...
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
     ...             digest_size_threshold=10.5,
-    ...             pipeline='dummy',
+    ...             posting_pipeline='dummy',
     ...             filter_content=True,
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
@@ -287,7 +286,7 @@ It is also an error to spell an attribute value incorrectly...
     ...           'PUT')
     Traceback (most recent call last):
     ...
-    HTTPError: HTTP Error 400: Cannot convert parameters: pipeline
+    HTTPError: HTTP Error 400: Cannot convert parameters: posting_pipeline
 
 ...or to name an invalid auto-response enumeration value.
 
@@ -311,7 +310,7 @@ It is also an error to spell an attribute value incorrectly...
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
     ...             digest_size_threshold=10.5,
-    ...             pipeline='virgin',
+    ...             posting_pipeline='virgin',
     ...             filter_content=True,
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
-- 
cgit v1.2.3-70-g09d2