From b1bec656c3fc7b6cee66a8a7cf2953d2af8d20db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Wed, 5 Oct 2011 13:34:25 +0200
Subject: [PATCH] Standarise naming.

In case of reused properties use their original name.

In case of payzen properties, use thier full name with payzen_ prefix.
---
 ...l_constraint.xml => link_url_string_constraint.xml} |  2 +-
 ...straint.xml => payzen_vads_ctx_mode_constraint.xml} | 10 +++++-----
 ..._property.xml => payzen_vads_ctx_mode_property.xml} |  2 +-
 ..._constraint.xml => service_username_constraint.xml} |  2 +-
 .../erp5_payzen_secure_payment/PayzenService_view.xml  |  2 +-
 ...payzen_ctx_mode.xml => my_payzen_vads_ctx_mode.xml} |  4 ++--
 bt5/erp5_payzen_secure_payment/bt/revision             |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/{payzen_url_constraint.xml => link_url_string_constraint.xml} (97%)
 rename bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/{payzen_ctx_mode_constraint.xml => payzen_vads_ctx_mode_constraint.xml} (87%)
 rename bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/{payzen_ctx_mode_property.xml => payzen_vads_ctx_mode_property.xml} (91%)
 rename bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/{payzen_site_id_constraint.xml => service_username_constraint.xml} (97%)
 rename bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/{my_payzen_ctx_mode.xml => my_payzen_vads_ctx_mode.xml} (98%)

diff --git a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_url_constraint.xml b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/link_url_string_constraint.xml
similarity index 97%
rename from bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_url_constraint.xml
rename to bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/link_url_string_constraint.xml
index 6a0e8157e9..094e303964 100644
--- a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_url_constraint.xml
+++ b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/link_url_string_constraint.xml
@@ -51,7 +51,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>payzen_url_constraint</string> </value>
+            <value> <string>link_url_string_constraint</string> </value>
         </item>
         <item>
             <key> <string>message_attribute_match</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_constraint.xml b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_constraint.xml
similarity index 87%
rename from bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_constraint.xml
rename to bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_constraint.xml
index 1b26189dfe..d5edb6fb3a 100644
--- a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_constraint.xml
+++ b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_constraint.xml
@@ -39,7 +39,7 @@
             <key> <string>constraint_property</string> </key>
             <value>
               <tuple>
-                <string>payzen_ctx_mode</string>
+                <string>payzen_vads_ctx_mode</string>
               </tuple>
             </value>
         </item>
@@ -51,19 +51,19 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>payzen_ctx_mode_constraint</string> </value>
+            <value> <string>payzen_vads_ctx_mode_constraint</string> </value>
         </item>
         <item>
             <key> <string>message_attribute_match</string> </key>
-            <value> <string>vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
+            <value> <string>Payzen vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
         </item>
         <item>
             <key> <string>message_no_such_property</string> </key>
-            <value> <string>vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
+            <value> <string>Payzen vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
         </item>
         <item>
             <key> <string>message_property_not_set</string> </key>
-            <value> <string>vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
+            <value> <string>Payzen vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_property.xml b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_property.xml
similarity index 91%
rename from bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_property.xml
rename to bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_property.xml
index 416976e807..3288d6613c 100644
--- a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_property.xml
+++ b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_property.xml
@@ -22,7 +22,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>payzen_ctx_mode_property</string> </value>
+            <value> <string>payzen_vads_ctx_mode_property</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_site_id_constraint.xml b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/service_username_constraint.xml
similarity index 97%
rename from bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_site_id_constraint.xml
rename to bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/service_username_constraint.xml
index 8de2646287..4afe059fec 100644
--- a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_site_id_constraint.xml
+++ b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/service_username_constraint.xml
@@ -51,7 +51,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>payzen_site_id_constraint</string> </value>
+            <value> <string>service_username_constraint</string> </value>
         </item>
         <item>
             <key> <string>message_attribute_match</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml b/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml
index 4b6572eaaa..099ac28bc2 100644
--- a/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml
+++ b/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml
@@ -107,7 +107,7 @@
                         <string>my_link_url_string</string>
                         <string>my_service_username</string>
                         <string>my_service_password</string>
-                        <string>my_payzen_ctx_mode</string>
+                        <string>my_payzen_vads_ctx_mode</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_ctx_mode.xml b/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_vads_ctx_mode.xml
similarity index 98%
rename from bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_ctx_mode.xml
rename to bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_vads_ctx_mode.xml
index 735ee616a5..bb9e6eb7e1 100644
--- a/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_ctx_mode.xml
+++ b/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_vads_ctx_mode.xml
@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_payzen_ctx_mode</string> </value>
+            <value> <string>my_payzen_vads_ctx_mode</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -256,7 +256,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>vads_ctx_mode</string> </value>
+                    <value> <string>Payzen vads_ctx_mode</string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/bt/revision b/bt5/erp5_payzen_secure_payment/bt/revision
index 3cacc0b93c..ca7bf83ac5 100644
--- a/bt5/erp5_payzen_secure_payment/bt/revision
+++ b/bt5/erp5_payzen_secure_payment/bt/revision
@@ -1 +1 @@
-12
\ No newline at end of file
+13
\ No newline at end of file
-- 
2.30.9