From 584a80ee6174ec5a2b4792e1343e64d3f0854cb3 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Wed, 30 Jun 2010 13:52:43 +0000
Subject: [PATCH] * Move Solver Decision portal type from the experimental
 erp5_simulation business template to the erp5_base business template.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36744 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Solver%20Decision/configuration.xml         | 0
 .../portal_types/Solver%20Decision/view.xml                  | 0
 .../allowed_content_types.xml                                | 3 +++
 .../base_category_list.xml                                   | 3 +++
 .../portal_types/Solver%20Decision.xml                       | 0
 .../portal_skins/erp5_base}/SolverDecision_view.xml          | 0
 .../erp5_base}/SolverDecision_view/my_causality_title.xml    | 0
 .../erp5_base}/SolverDecision_view/my_delivery_solver.xml    | 0
 .../SolverDecision_view/my_delivery_title_list.xml           | 0
 .../erp5_base}/SolverDecision_view/my_description.xml        | 0
 .../erp5_base}/SolverDecision_view/my_solver.xml             | 0
 .../erp5_base}/SolverDecision_viewConfiguration.xml          | 0
 .../SolverDecision_viewConfiguration/my_configuration.xml    | 0
 bt5/erp5_base/bt/change_log                                  | 1 +
 bt5/erp5_base/bt/revision                                    | 2 +-
 bt5/erp5_base/bt/template_action_path_list                   | 2 ++
 .../bt/template_portal_type_allowed_content_type_list        | 1 +
 bt5/erp5_base/bt/template_portal_type_base_category_list     | 3 ++-
 bt5/erp5_base/bt/template_portal_type_id_list                | 1 +
 .../allowed_content_types.xml                                | 3 +--
 .../base_category_list.xml                                   | 5 -----
 bt5/erp5_simulation/bt/revision                              | 2 +-
 bt5/erp5_simulation/bt/template_action_path_list             | 2 --
 .../bt/template_portal_type_allowed_content_type_list        | 1 -
 .../bt/template_portal_type_base_category_list               | 1 -
 bt5/erp5_simulation/bt/template_portal_type_id_list          | 1 -
 26 files changed, 16 insertions(+), 15 deletions(-)
 rename bt5/{erp5_simulation => erp5_base}/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml (100%)
 rename bt5/{erp5_simulation => erp5_base}/ActionTemplateItem/portal_types/Solver%20Decision/view.xml (100%)
 rename bt5/{erp5_simulation => erp5_base}/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml (100%)
 rename bt5/{erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation => erp5_base/SkinTemplateItem/portal_skins/erp5_base}/SolverDecision_view.xml (100%)
 rename bt5/{erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation => erp5_base/SkinTemplateItem/portal_skins/erp5_base}/SolverDecision_view/my_causality_title.xml (100%)
 rename bt5/{erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation => erp5_base/SkinTemplateItem/portal_skins/erp5_base}/SolverDecision_view/my_delivery_solver.xml (100%)
 rename bt5/{erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation => erp5_base/SkinTemplateItem/portal_skins/erp5_base}/SolverDecision_view/my_delivery_title_list.xml (100%)
 rename bt5/{erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation => erp5_base/SkinTemplateItem/portal_skins/erp5_base}/SolverDecision_view/my_description.xml (100%)
 rename bt5/{erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation => erp5_base/SkinTemplateItem/portal_skins/erp5_base}/SolverDecision_view/my_solver.xml (100%)
 rename bt5/{erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation => erp5_base/SkinTemplateItem/portal_skins/erp5_base}/SolverDecision_viewConfiguration.xml (100%)
 rename bt5/{erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation => erp5_base/SkinTemplateItem/portal_skins/erp5_base}/SolverDecision_viewConfiguration/my_configuration.xml (100%)
 delete mode 100644 bt5/erp5_simulation/PortalTypeBaseCategoryTemplateItem/base_category_list.xml

diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml
rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Decision/view.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml
rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Decision/view.xml
diff --git a/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 83c95f566f..4da0053b89 100644
--- a/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -117,6 +117,9 @@
  <portal_type id="Rounding Tool">
   <item>Rounding Model</item>
  </portal_type>
+ <portal_type id="Solver Process">
+  <item>Solver Decision</item>
+ </portal_type>
  <portal_type id="Solver Process Tool">
   <item>Solver Process</item>
  </portal_type>
diff --git a/bt5/erp5_base/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_base/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
index c3e9781f25..f5aa12fde5 100644
--- a/bt5/erp5_base/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
+++ b/bt5/erp5_base/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
@@ -24,4 +24,7 @@
  <portal_type id="Query Module">
   <item>business_application</item>
  </portal_type>
+ <portal_type id="Solver Decision">
+  <item>causality</item>
+ </portal_type>
 </base_category_list>
\ No newline at end of file
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
similarity index 100%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
rename to bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view.xml
similarity index 100%
rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view.xml
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_causality_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_causality_title.xml
similarity index 100%
rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_causality_title.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_causality_title.xml
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_delivery_solver.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_solver.xml
similarity index 100%
rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_delivery_solver.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_solver.xml
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_delivery_title_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_title_list.xml
similarity index 100%
rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_delivery_title_list.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_title_list.xml
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_description.xml
similarity index 100%
rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_description.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_description.xml
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_solver.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_solver.xml
similarity index 100%
rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_view/my_solver.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_solver.xml
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_viewConfiguration.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration.xml
similarity index 100%
rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_viewConfiguration.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration.xml
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_viewConfiguration/my_configuration.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration/my_configuration.xml
similarity index 100%
rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_viewConfiguration/my_configuration.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration/my_configuration.xml
diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log
index e389e291d3..2b5ec87058 100644
--- a/bt5/erp5_base/bt/change_log
+++ b/bt5/erp5_base/bt/change_log
@@ -1,4 +1,5 @@
 2010-06-30 kazuhiko
+* Move Solver Decision portal type from the experimental erp5_simulation business template to the erp5_base business template.
 * Calculate and pass default values to automatic solvers.
 * Add fallback scripts for target solvers' default configuration values.
 
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index d0af645045..83249da5a1 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-783
\ No newline at end of file
+784
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_action_path_list b/bt5/erp5_base/bt/template_action_path_list
index b9057eaf4d..da6af42f5a 100644
--- a/bt5/erp5_base/bt/template_action_path_list
+++ b/bt5/erp5_base/bt/template_action_path_list
@@ -81,6 +81,8 @@ Root Applied Rule Causality Movement Group | view
 Rounding Model | predicate_view
 Rounding Model | view
 Rounding Tool | view
+Solver Decision | configuration
+Solver Decision | view
 Solver Tool | view
 Solver Type | action_view
 Solver Type | role_view
diff --git a/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list
index b221f5e823..17889a248d 100644
--- a/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list
@@ -82,6 +82,7 @@ Person | Link
 Person | Telephone
 Query Module | Query
 Rounding Tool | Rounding Model
+Solver Process | Solver Decision
 Solver Process Tool | Solver Process
 Solver Tool | Solver Type
 Solver Type | Action Information
diff --git a/bt5/erp5_base/bt/template_portal_type_base_category_list b/bt5/erp5_base/bt/template_portal_type_base_category_list
index 96acd0a56a..33fa7316be 100644
--- a/bt5/erp5_base/bt/template_portal_type_base_category_list
+++ b/bt5/erp5_base/bt/template_portal_type_base_category_list
@@ -6,4 +6,5 @@ Notification Message Module | business_application
 Organisation Module | business_application
 Person Module | business_application
 Query Module | business_application
-Query | agent
\ No newline at end of file
+Query | agent
+Solver Decision | causality
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_portal_type_id_list b/bt5/erp5_base/bt/template_portal_type_id_list
index eb60bf1ac7..30a6a4112c 100644
--- a/bt5/erp5_base/bt/template_portal_type_id_list
+++ b/bt5/erp5_base/bt/template_portal_type_id_list
@@ -52,6 +52,7 @@ Role Definition
 Root Applied Rule Causality Movement Group
 Rounding Model
 Rounding Tool
+Solver Decision
 Solver Process
 Solver Process Tool
 Solver Tool
diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 97d3d6b7a0..e3df3596b4 100644
--- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -60,7 +60,6 @@
   <item>Adopt Solver</item>
   <item>Production Reduction Solver</item>
   <item>Quantity Split Solver</item>
-  <item>Solver Decision</item>
   <item>Trade Model Solver</item>
   <item>Unify Solver</item>
  </portal_type>
@@ -72,4 +71,4 @@
   <item>String Divergence Tester</item>
   <item>Variation Divergence Tester</item>
  </portal_type>
-</allowed_content_type_list>
+</allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_simulation/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_simulation/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
deleted file mode 100644
index 52dab40ee8..0000000000
--- a/bt5/erp5_simulation/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<base_category_list>
- <portal_type id="Solver Decision">
-  <item>causality</item>
- </portal_type>
-</base_category_list>
\ No newline at end of file
diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision
index 8bc6583717..5a396e28e8 100644
--- a/bt5/erp5_simulation/bt/revision
+++ b/bt5/erp5_simulation/bt/revision
@@ -1 +1 @@
-120
\ No newline at end of file
+121
\ No newline at end of file
diff --git a/bt5/erp5_simulation/bt/template_action_path_list b/bt5/erp5_simulation/bt/template_action_path_list
index 4e90e0c1ce..7d13e0dd0f 100644
--- a/bt5/erp5_simulation/bt/template_action_path_list
+++ b/bt5/erp5_simulation/bt/template_action_path_list
@@ -18,8 +18,6 @@ Quantity Cancel Solver | configuration
 Quantity Cancel Solver | view
 Quantity Split Solver | configuration
 Quantity Split Solver | view
-Solver Decision | configuration
-Solver Decision | view
 Solver Process Tool | view
 Solver Process | target_solver
 Solver Process | view
diff --git a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
index 51b1a9ccf4..288437c3a3 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
@@ -44,7 +44,6 @@ Solver Process | Accept Solver
 Solver Process | Adopt Solver
 Solver Process | Production Reduction Solver
 Solver Process | Quantity Split Solver
-Solver Process | Solver Decision
 Solver Process | Trade Model Solver
 Solver Process | Unify Solver
 Trade Model Simulation Rule | Category Membership Divergence Tester
diff --git a/bt5/erp5_simulation/bt/template_portal_type_base_category_list b/bt5/erp5_simulation/bt/template_portal_type_base_category_list
index 346799eecb..e69de29bb2 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_base_category_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_base_category_list
@@ -1 +0,0 @@
-Solver Decision | causality
\ No newline at end of file
diff --git a/bt5/erp5_simulation/bt/template_portal_type_id_list b/bt5/erp5_simulation/bt/template_portal_type_id_list
index 851832d2e1..927ce63cc4 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_id_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_id_list
@@ -7,7 +7,6 @@ Net Converted Quantity Divergence Tester
 Production Reduction Solver
 Quantity Cancel Solver
 Quantity Split Solver
-Solver Decision
 String Divergence Tester
 Trade Model Solver
 Unify Solver
-- 
2.30.9