diff --git a/applications/accounting/data/AccountingSecurityData.xml b/applications/accounting/data/AccountingSecurityGroupDemoData.xml
similarity index 68%
rename from applications/accounting/data/AccountingSecurityData.xml
rename to applications/accounting/data/AccountingSecurityGroupDemoData.xml
index e1d1ef5f8e..9ae39b114f 100644
--- a/applications/accounting/data/AccountingSecurityData.xml
+++ b/applications/accounting/data/AccountingSecurityGroupDemoData.xml
@@ -19,10 +19,6 @@ under the License.
-->
-
-
-
-
@@ -31,11 +27,6 @@ under the License.
-
-
-
-
-
@@ -45,11 +36,6 @@ under the License.
-
-
-
-
-
@@ -59,36 +45,27 @@ under the License.
-
-
-
-
-
-
-
-
-
@@ -96,11 +73,6 @@ under the License.
accounting transactions should create a permission service SECA to grant
task-specific permissions to post transactions. The following permissions
should be given to accountants only, as that involves changing the books. -->
-
-
-
-
-
diff --git a/applications/accounting/data/AccountingSecurityPermissionSeedData.xml b/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..b783e0500b
--- /dev/null
+++ b/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/accounting/data/DemoPaymentsInvoices.xml b/applications/accounting/data/DemoPaymentsInvoices.xml
index a26feb4c2c..601a2a7e39 100644
--- a/applications/accounting/data/DemoPaymentsInvoices.xml
+++ b/applications/accounting/data/DemoPaymentsInvoices.xml
@@ -22,6 +22,7 @@ under the License.
+
diff --git a/applications/accounting/ofbiz-component.xml b/applications/accounting/ofbiz-component.xml
index 1613e60e5a..3879a601bd 100644
--- a/applications/accounting/ofbiz-component.xml
+++ b/applications/accounting/ofbiz-component.xml
@@ -39,7 +39,8 @@ under the License.
-
+
+
diff --git a/applications/commonext/data/CommonExtSecurityData.xml b/applications/commonext/data/CommonExtSecurityGroupDemoData.xml
similarity index 89%
rename from applications/commonext/data/CommonExtSecurityData.xml
rename to applications/commonext/data/CommonExtSecurityGroupDemoData.xml
index 3ef4ec5e6c..2e46e4a415 100644
--- a/applications/commonext/data/CommonExtSecurityData.xml
+++ b/applications/commonext/data/CommonExtSecurityGroupDemoData.xml
@@ -20,6 +20,5 @@ under the License.
-
diff --git a/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml b/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..7cd6ea4478
--- /dev/null
+++ b/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml b/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..6ff7ec310a
--- /dev/null
+++ b/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
diff --git a/applications/commonext/data/OfbizSetupSecurityData.xml b/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
similarity index 92%
rename from applications/commonext/data/OfbizSetupSecurityData.xml
rename to applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
index 4299dc17f7..00a14006e1 100644
--- a/applications/commonext/data/OfbizSetupSecurityData.xml
+++ b/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
@@ -21,5 +21,5 @@ under the License.
-
+
diff --git a/applications/commonext/ofbiz-component.xml b/applications/commonext/ofbiz-component.xml
index 1b8798ec52..d3da0975ab 100644
--- a/applications/commonext/ofbiz-component.xml
+++ b/applications/commonext/ofbiz-component.xml
@@ -26,11 +26,13 @@ under the License.
-
+
+
-
+
+
diff --git a/applications/content/data/ContentSecurityData.xml b/applications/content/data/ContentSecurityGroupDemoData.xml
similarity index 64%
rename from applications/content/data/ContentSecurityData.xml
rename to applications/content/data/ContentSecurityGroupDemoData.xml
index 0e61e09972..78fe044e89 100644
--- a/applications/content/data/ContentSecurityData.xml
+++ b/applications/content/data/ContentSecurityGroupDemoData.xml
@@ -19,11 +19,6 @@ under the License.
-->
-
-
-
-
-
@@ -33,10 +28,6 @@ under the License.
-
-
-
-
@@ -44,7 +35,6 @@ under the License.
-
diff --git a/applications/content/data/ContentSecurityPermissionSeedData.xml b/applications/content/data/ContentSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..9316babea2
--- /dev/null
+++ b/applications/content/data/ContentSecurityPermissionSeedData.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/content/ofbiz-component.xml b/applications/content/ofbiz-component.xml
index 32d7c17dd7..8886dcd78a 100644
--- a/applications/content/ofbiz-component.xml
+++ b/applications/content/ofbiz-component.xml
@@ -36,7 +36,8 @@ under the License.
-
+
+
diff --git a/applications/humanres/data/HumanResSecurityGroupDemoData.xml b/applications/humanres/data/HumanResSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..3ff000651d
--- /dev/null
+++ b/applications/humanres/data/HumanResSecurityGroupDemoData.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/humanres/data/HumanResSecurityData.xml b/applications/humanres/data/HumanResSecurityPermissionSeedData.xml
similarity index 71%
rename from applications/humanres/data/HumanResSecurityData.xml
rename to applications/humanres/data/HumanResSecurityPermissionSeedData.xml
index 3e82adf636..d2018780cb 100644
--- a/applications/humanres/data/HumanResSecurityData.xml
+++ b/applications/humanres/data/HumanResSecurityPermissionSeedData.xml
@@ -24,11 +24,9 @@ under the License.
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/applications/humanres/data/HumanResTypeData.xml b/applications/humanres/data/HumanResTypeData.xml
index 98fe03af4f..39cefafe09 100644
--- a/applications/humanres/data/HumanResTypeData.xml
+++ b/applications/humanres/data/HumanResTypeData.xml
@@ -123,26 +123,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/humanres/ofbiz-component.xml b/applications/humanres/ofbiz-component.xml
index 92565cf70e..5b9316e576 100644
--- a/applications/humanres/ofbiz-component.xml
+++ b/applications/humanres/ofbiz-component.xml
@@ -28,7 +28,8 @@ under the License.
-
+
+
diff --git a/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml b/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..3d09b641b6
--- /dev/null
+++ b/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/manufacturing/data/ManufacturingSecurityData.xml b/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
similarity index 71%
rename from applications/manufacturing/data/ManufacturingSecurityData.xml
rename to applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
index aaff2a5ed9..1c8d864fa9 100644
--- a/applications/manufacturing/data/ManufacturingSecurityData.xml
+++ b/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
@@ -25,11 +25,7 @@ under the License.
-
-
-
-
-
-
-
+
+
+
diff --git a/applications/manufacturing/ofbiz-component.xml b/applications/manufacturing/ofbiz-component.xml
index d1e07a9a4f..94a9beaddb 100644
--- a/applications/manufacturing/ofbiz-component.xml
+++ b/applications/manufacturing/ofbiz-component.xml
@@ -34,7 +34,8 @@ under the License.
-
+
+
diff --git a/applications/marketing/data/MarketingSecurityGroupDemoData.xml b/applications/marketing/data/MarketingSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..8570dbcd89
--- /dev/null
+++ b/applications/marketing/data/MarketingSecurityGroupDemoData.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/marketing/data/MarketingSecurityData.xml b/applications/marketing/data/MarketingSecurityPermissionSeedData.xml
similarity index 69%
rename from applications/marketing/data/MarketingSecurityData.xml
rename to applications/marketing/data/MarketingSecurityPermissionSeedData.xml
index 365a23c531..8baac1e0e8 100644
--- a/applications/marketing/data/MarketingSecurityData.xml
+++ b/applications/marketing/data/MarketingSecurityPermissionSeedData.xml
@@ -27,13 +27,6 @@ under the License.
-
-
-
-
-
-
-
@@ -43,13 +36,9 @@ under the License.
-
-
-
-
-
-
-
+
+
+
diff --git a/applications/marketing/ofbiz-component.xml b/applications/marketing/ofbiz-component.xml
index ab371b88e3..7dd3ad881a 100644
--- a/applications/marketing/ofbiz-component.xml
+++ b/applications/marketing/ofbiz-component.xml
@@ -27,7 +27,8 @@ under the License.
-
+
+
diff --git a/applications/order/data/OrderSecurityData.xml b/applications/order/data/OrderSecurityGroupDemoData.xml
similarity index 76%
rename from applications/order/data/OrderSecurityData.xml
rename to applications/order/data/OrderSecurityGroupDemoData.xml
index 5dfb9c8ea2..55dffce806 100644
--- a/applications/order/data/OrderSecurityData.xml
+++ b/applications/order/data/OrderSecurityGroupDemoData.xml
@@ -20,30 +20,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/order/data/OrderSecurityPermissionSeedData.xml b/applications/order/data/OrderSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..196a810b3d
--- /dev/null
+++ b/applications/order/data/OrderSecurityPermissionSeedData.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/order/ofbiz-component.xml b/applications/order/ofbiz-component.xml
index 27f92fe460..0fc3b16862 100644
--- a/applications/order/ofbiz-component.xml
+++ b/applications/order/ofbiz-component.xml
@@ -34,7 +34,8 @@ under the License.
-
+
+
diff --git a/applications/party/data/PartySecurityGroupDemoData.xml b/applications/party/data/PartySecurityGroupDemoData.xml
new file mode 100644
index 0000000000..2b7d316c06
--- /dev/null
+++ b/applications/party/data/PartySecurityGroupDemoData.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/party/data/PartySecurityData.xml b/applications/party/data/PartySecurityPermissionSeedData.xml
similarity index 62%
rename from applications/party/data/PartySecurityData.xml
rename to applications/party/data/PartySecurityPermissionSeedData.xml
index 01eeeeeb47..4952c96930 100644
--- a/applications/party/data/PartySecurityData.xml
+++ b/applications/party/data/PartySecurityPermissionSeedData.xml
@@ -48,48 +48,15 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/applications/party/ofbiz-component.xml b/applications/party/ofbiz-component.xml
index 75d8ee393f..01bf254f63 100644
--- a/applications/party/ofbiz-component.xml
+++ b/applications/party/ofbiz-component.xml
@@ -28,7 +28,8 @@ under the License.
-
+
+
diff --git a/applications/product/data/FacilitySecurityGroupDemoData.xml b/applications/product/data/FacilitySecurityGroupDemoData.xml
new file mode 100644
index 0000000000..f2954afd10
--- /dev/null
+++ b/applications/product/data/FacilitySecurityGroupDemoData.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/product/data/FacilitySecurityPermissionSeedData.xml b/applications/product/data/FacilitySecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..f9c7098ec7
--- /dev/null
+++ b/applications/product/data/FacilitySecurityPermissionSeedData.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/product/data/ProductSecurityData.xml b/applications/product/data/ProductSecurityGroupDemoData.xml
similarity index 57%
rename from applications/product/data/ProductSecurityData.xml
rename to applications/product/data/ProductSecurityGroupDemoData.xml
index 148845c749..6b8a837d7e 100644
--- a/applications/product/data/ProductSecurityData.xml
+++ b/applications/product/data/ProductSecurityGroupDemoData.xml
@@ -20,18 +20,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
@@ -65,36 +53,17 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/product/data/ProductSecurityPermissionSeedData.xml b/applications/product/data/ProductSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..0aa0ec005a
--- /dev/null
+++ b/applications/product/data/ProductSecurityPermissionSeedData.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/product/ofbiz-component.xml b/applications/product/ofbiz-component.xml
index 4edbb6a54e..52dce6ce5b 100644
--- a/applications/product/ofbiz-component.xml
+++ b/applications/product/ofbiz-component.xml
@@ -37,7 +37,10 @@ under the License.
-
+
+
+
+
diff --git a/applications/workeffort/data/WorkEffortSecurityData.xml b/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml
similarity index 69%
rename from applications/workeffort/data/WorkEffortSecurityData.xml
rename to applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml
index 37c3bfb68d..40c90f1014 100644
--- a/applications/workeffort/data/WorkEffortSecurityData.xml
+++ b/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml
@@ -20,17 +20,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml b/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..fc094b4d9d
--- /dev/null
+++ b/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/workeffort/ofbiz-component.xml b/applications/workeffort/ofbiz-component.xml
index e58627109e..11d83f307e 100644
--- a/applications/workeffort/ofbiz-component.xml
+++ b/applications/workeffort/ofbiz-component.xml
@@ -29,9 +29,10 @@ under the License.
-
-
+
+
+
diff --git a/framework/bi/data/BiSecurityGroupDemoData.xml b/framework/bi/data/BiSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..fdf6e64562
--- /dev/null
+++ b/framework/bi/data/BiSecurityGroupDemoData.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
diff --git a/framework/bi/data/BiSecurityData.xml b/framework/bi/data/BiSecurityPermissionSeedData.xml
similarity index 93%
rename from framework/bi/data/BiSecurityData.xml
rename to framework/bi/data/BiSecurityPermissionSeedData.xml
index ddf03d703b..dbae18eb3d 100644
--- a/framework/bi/data/BiSecurityData.xml
+++ b/framework/bi/data/BiSecurityPermissionSeedData.xml
@@ -21,5 +21,5 @@ under the License.
-
+
diff --git a/framework/bi/ofbiz-component.xml b/framework/bi/ofbiz-component.xml
index 2452b34f33..1802451098 100644
--- a/framework/bi/ofbiz-component.xml
+++ b/framework/bi/ofbiz-component.xml
@@ -25,7 +25,8 @@ under the License.
-
+
+
diff --git a/framework/common/data/CommonSecurityGroupDemoData.xml b/framework/common/data/CommonSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..05b57a1de5
--- /dev/null
+++ b/framework/common/data/CommonSecurityGroupDemoData.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/common/data/CommonSecurityData.xml b/framework/common/data/CommonSecurityPermissionSeedData.xml
similarity index 67%
rename from framework/common/data/CommonSecurityData.xml
rename to framework/common/data/CommonSecurityPermissionSeedData.xml
index c8374b53cd..f4f24ea7cd 100644
--- a/framework/common/data/CommonSecurityData.xml
+++ b/framework/common/data/CommonSecurityPermissionSeedData.xml
@@ -31,26 +31,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/framework/common/ofbiz-component.xml b/framework/common/ofbiz-component.xml
index 114ba94157..f699743ce2 100644
--- a/framework/common/ofbiz-component.xml
+++ b/framework/common/ofbiz-component.xml
@@ -27,7 +27,8 @@ under the License.
-
+
+
diff --git a/framework/entityext/data/EntityExtSecurityData.xml b/framework/entityext/data/EntityExtSecurityGroupDemoData.xml
similarity index 90%
rename from framework/entityext/data/EntityExtSecurityData.xml
rename to framework/entityext/data/EntityExtSecurityGroupDemoData.xml
index 01e8f280f6..614eb08699 100644
--- a/framework/entityext/data/EntityExtSecurityData.xml
+++ b/framework/entityext/data/EntityExtSecurityGroupDemoData.xml
@@ -19,7 +19,6 @@ under the License.
-->
-
diff --git a/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml b/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..a9a9e35483
--- /dev/null
+++ b/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/entityext/ofbiz-component.xml b/framework/entityext/ofbiz-component.xml
index f1cd4918ba..92b2bc9118 100644
--- a/framework/entityext/ofbiz-component.xml
+++ b/framework/entityext/ofbiz-component.xml
@@ -29,7 +29,8 @@ under the License.
-
+
+
diff --git a/framework/resources/templates/AdminUserLoginData.xml b/framework/resources/templates/AdminUserLoginData.xml
index 9b60388c88..04b6d4bfa1 100644
--- a/framework/resources/templates/AdminUserLoginData.xml
+++ b/framework/resources/templates/AdminUserLoginData.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/framework/security/data/SecurityDemoData.xml b/framework/security/data/SecurityDemoData.xml
deleted file mode 100644
index cdf31b32f8..0000000000
--- a/framework/security/data/SecurityDemoData.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/framework/security/data/SecurityData.xml b/framework/security/data/SecurityGroupDemoData.xml
similarity index 81%
rename from framework/security/data/SecurityData.xml
rename to framework/security/data/SecurityGroupDemoData.xml
index 82fff0b52d..1e318cde1c 100644
--- a/framework/security/data/SecurityData.xml
+++ b/framework/security/data/SecurityGroupDemoData.xml
@@ -19,12 +19,12 @@ under the License.
-->
-
+
@@ -39,11 +39,8 @@ under the License.
-
-
-
@@ -52,9 +49,12 @@ under the License.
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/framework/security/data/SecurityPermissionSeedData.xml b/framework/security/data/SecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..02414861a7
--- /dev/null
+++ b/framework/security/data/SecurityPermissionSeedData.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/security/ofbiz-component.xml b/framework/security/ofbiz-component.xml
index 335cfed135..45328b9421 100644
--- a/framework/security/ofbiz-component.xml
+++ b/framework/security/ofbiz-component.xml
@@ -26,8 +26,8 @@ under the License.
-
+
-
+
diff --git a/framework/service/data/ServiceSecurityData.xml b/framework/service/data/ServiceSecurityGroupDemoData.xml
similarity index 89%
rename from framework/service/data/ServiceSecurityData.xml
rename to framework/service/data/ServiceSecurityGroupDemoData.xml
index e886831de8..704fd222cf 100644
--- a/framework/service/data/ServiceSecurityData.xml
+++ b/framework/service/data/ServiceSecurityGroupDemoData.xml
@@ -19,7 +19,6 @@ under the License.
-->
-
diff --git a/framework/service/data/ServiceSecurityPermissionSeedData.xml b/framework/service/data/ServiceSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..ef45ccf585
--- /dev/null
+++ b/framework/service/data/ServiceSecurityPermissionSeedData.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/service/ofbiz-component.xml b/framework/service/ofbiz-component.xml
index 258307b171..0c4a0390ba 100644
--- a/framework/service/ofbiz-component.xml
+++ b/framework/service/ofbiz-component.xml
@@ -31,7 +31,8 @@ under the License.
-
+
+
diff --git a/framework/webtools/data/WebtoolsSecurityData.xml b/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml
similarity index 69%
rename from framework/webtools/data/WebtoolsSecurityData.xml
rename to framework/webtools/data/WebtoolsSecurityGroupDemoData.xml
index f8d8395717..73980b3aa4 100644
--- a/framework/webtools/data/WebtoolsSecurityData.xml
+++ b/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml
@@ -19,57 +19,43 @@ under the License.
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -80,10 +66,6 @@ under the License.
-
-
-
-
diff --git a/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml b/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..d8c0f1f4f4
--- /dev/null
+++ b/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/webtools/ofbiz-component.xml b/framework/webtools/ofbiz-component.xml
index a5daf854dd..0769b6005f 100644
--- a/framework/webtools/ofbiz-component.xml
+++ b/framework/webtools/ofbiz-component.xml
@@ -24,7 +24,8 @@ under the License.
-
+
+
-
-
-
-
-
-
diff --git a/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml b/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..fc12c2e043
--- /dev/null
+++ b/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/assetmaint/ofbiz-component.xml b/specialpurpose/assetmaint/ofbiz-component.xml
index 355a0a0c7f..c086389fa6 100644
--- a/specialpurpose/assetmaint/ofbiz-component.xml
+++ b/specialpurpose/assetmaint/ofbiz-component.xml
@@ -32,7 +32,8 @@
-
+
+
diff --git a/specialpurpose/ebay/data/EbaySecurityData.xml b/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml
similarity index 84%
rename from specialpurpose/ebay/data/EbaySecurityData.xml
rename to specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml
index 3ccddfff9c..a27abd575d 100644
--- a/specialpurpose/ebay/data/EbaySecurityData.xml
+++ b/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml
@@ -20,9 +20,6 @@ under the License.
-
-
-
diff --git a/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml b/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..549950f3d8
--- /dev/null
+++ b/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/ebay/ofbiz-component.xml b/specialpurpose/ebay/ofbiz-component.xml
index 10c96e319e..6b3227ed86 100644
--- a/specialpurpose/ebay/ofbiz-component.xml
+++ b/specialpurpose/ebay/ofbiz-component.xml
@@ -26,7 +26,8 @@ under the License.
-
+
+
diff --git a/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml b/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml
similarity index 83%
rename from specialpurpose/ebaystore/data/EbayStoreSecurityData.xml
rename to specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml
index 5628bd8550..7b4da6d4d3 100644
--- a/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml
+++ b/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml
@@ -20,9 +20,6 @@ under the License.
-
-
-
diff --git a/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml b/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..14c4617b0c
--- /dev/null
+++ b/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/ebaystore/ofbiz-component.xml b/specialpurpose/ebaystore/ofbiz-component.xml
index 947ea0a2ca..a824f32feb 100644
--- a/specialpurpose/ebaystore/ofbiz-component.xml
+++ b/specialpurpose/ebaystore/ofbiz-component.xml
@@ -28,7 +28,8 @@ under the License.
-
+
+
diff --git a/specialpurpose/example/data/ExampleSecurityGroupDemoData.xml b/specialpurpose/example/data/ExampleSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..43759462bd
--- /dev/null
+++ b/specialpurpose/example/data/ExampleSecurityGroupDemoData.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/example/data/ExampleSecurityData.xml b/specialpurpose/example/data/ExampleSecurityPermissionSeedData.xml
similarity index 72%
rename from specialpurpose/example/data/ExampleSecurityData.xml
rename to specialpurpose/example/data/ExampleSecurityPermissionSeedData.xml
index 93b9fade56..6944460d49 100644
--- a/specialpurpose/example/data/ExampleSecurityData.xml
+++ b/specialpurpose/example/data/ExampleSecurityPermissionSeedData.xml
@@ -24,11 +24,7 @@ under the License.
-
-
-
-
-
-
-
+
+
+
diff --git a/specialpurpose/example/ofbiz-component.xml b/specialpurpose/example/ofbiz-component.xml
index 01b235717e..70794f35ad 100644
--- a/specialpurpose/example/ofbiz-component.xml
+++ b/specialpurpose/example/ofbiz-component.xml
@@ -36,7 +36,8 @@ under the License.
-
+
+
diff --git a/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml b/specialpurpose/googlebase/data/GoogleBaseSecurityGroupDemoData.xml
similarity index 77%
rename from specialpurpose/googlebase/data/GoogleBaseSecurityData.xml
rename to specialpurpose/googlebase/data/GoogleBaseSecurityGroupDemoData.xml
index bab079a1ae..389179b6d1 100644
--- a/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml
+++ b/specialpurpose/googlebase/data/GoogleBaseSecurityGroupDemoData.xml
@@ -20,16 +20,11 @@ under the License.
-
-
-
-
-
diff --git a/specialpurpose/googlebase/data/GoogleBaseSecurityPermissionSeedData.xml b/specialpurpose/googlebase/data/GoogleBaseSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..4824dad2bb
--- /dev/null
+++ b/specialpurpose/googlebase/data/GoogleBaseSecurityPermissionSeedData.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/googlebase/ofbiz-component.xml b/specialpurpose/googlebase/ofbiz-component.xml
index 43b389cb26..056259b697 100644
--- a/specialpurpose/googlebase/ofbiz-component.xml
+++ b/specialpurpose/googlebase/ofbiz-component.xml
@@ -27,7 +27,8 @@ under the License.
-
+
+
diff --git a/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityGroupDemoData.xml b/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..6688f64e15
--- /dev/null
+++ b/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityGroupDemoData.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml b/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityPermissionSeedData.xml
similarity index 72%
rename from specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml
rename to specialpurpose/googlecheckout/data/GoogleCheckoutSecurityPermissionSeedData.xml
index 90a3f3d727..40d76835de 100644
--- a/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml
+++ b/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityPermissionSeedData.xml
@@ -24,11 +24,7 @@ under the License.
-
-
-
-
-
-
-
+
+
+
diff --git a/specialpurpose/googlecheckout/ofbiz-component.xml b/specialpurpose/googlecheckout/ofbiz-component.xml
index 06ecd51f6b..a583103ca4 100644
--- a/specialpurpose/googlecheckout/ofbiz-component.xml
+++ b/specialpurpose/googlecheckout/ofbiz-component.xml
@@ -28,7 +28,8 @@
-
+
+
diff --git a/specialpurpose/hhfacility/data/HhFacilitySecurityGroupDemoData.xml b/specialpurpose/hhfacility/data/HhFacilitySecurityGroupDemoData.xml
new file mode 100644
index 0000000000..057a09e1e8
--- /dev/null
+++ b/specialpurpose/hhfacility/data/HhFacilitySecurityGroupDemoData.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
diff --git a/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml b/specialpurpose/hhfacility/data/HhFacilitySecurityPermissionSeedData.xml
similarity index 90%
rename from specialpurpose/hhfacility/data/HhFacilitySecurityData.xml
rename to specialpurpose/hhfacility/data/HhFacilitySecurityPermissionSeedData.xml
index 01e2a91e90..b7a344d6d1 100644
--- a/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml
+++ b/specialpurpose/hhfacility/data/HhFacilitySecurityPermissionSeedData.xml
@@ -21,5 +21,6 @@ under the License.
-
+
+
diff --git a/specialpurpose/hhfacility/ofbiz-component.xml b/specialpurpose/hhfacility/ofbiz-component.xml
index 4b2a9f2a09..d8cb155a87 100644
--- a/specialpurpose/hhfacility/ofbiz-component.xml
+++ b/specialpurpose/hhfacility/ofbiz-component.xml
@@ -24,7 +24,8 @@ under the License.
-
+
+
diff --git a/specialpurpose/myportal/data/MyPortalTypeData.xml b/specialpurpose/myportal/data/MyPortalPageDemoData.xml
similarity index 100%
rename from specialpurpose/myportal/data/MyPortalTypeData.xml
rename to specialpurpose/myportal/data/MyPortalPageDemoData.xml
diff --git a/specialpurpose/myportal/data/MyPortalSecurityData.xml b/specialpurpose/myportal/data/MyPortalSecurityGroupDemoData.xml
similarity index 97%
rename from specialpurpose/myportal/data/MyPortalSecurityData.xml
rename to specialpurpose/myportal/data/MyPortalSecurityGroupDemoData.xml
index 2b993e590e..d15b2dbe5a 100644
--- a/specialpurpose/myportal/data/MyPortalSecurityData.xml
+++ b/specialpurpose/myportal/data/MyPortalSecurityGroupDemoData.xml
@@ -18,9 +18,6 @@ specific language governing permissions and limitations
under the License.
-->
-
-
-
diff --git a/specialpurpose/myportal/data/MyPortalSecurityPermissionSeedData.xml b/specialpurpose/myportal/data/MyPortalSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..14937b23de
--- /dev/null
+++ b/specialpurpose/myportal/data/MyPortalSecurityPermissionSeedData.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/myportal/ofbiz-component.xml b/specialpurpose/myportal/ofbiz-component.xml
index a0682d91f4..3782b9e544 100644
--- a/specialpurpose/myportal/ofbiz-component.xml
+++ b/specialpurpose/myportal/ofbiz-component.xml
@@ -24,8 +24,9 @@
-
-
+
+
+
diff --git a/specialpurpose/oagis/data/OagisSecurityData.xml b/specialpurpose/oagis/data/OagisSecurityGroupDemoData.xml
similarity index 91%
rename from specialpurpose/oagis/data/OagisSecurityData.xml
rename to specialpurpose/oagis/data/OagisSecurityGroupDemoData.xml
index a2ce94ef39..ce46928101 100644
--- a/specialpurpose/oagis/data/OagisSecurityData.xml
+++ b/specialpurpose/oagis/data/OagisSecurityGroupDemoData.xml
@@ -20,8 +20,6 @@ under the License.
-
-
diff --git a/specialpurpose/oagis/data/OagisSecurityPermissionSeedData.xml b/specialpurpose/oagis/data/OagisSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..cc854a78d0
--- /dev/null
+++ b/specialpurpose/oagis/data/OagisSecurityPermissionSeedData.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/oagis/ofbiz-component.xml b/specialpurpose/oagis/ofbiz-component.xml
index dcc0cfaa7e..2ae939c49d 100644
--- a/specialpurpose/oagis/ofbiz-component.xml
+++ b/specialpurpose/oagis/ofbiz-component.xml
@@ -28,7 +28,8 @@ under the License.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml b/specialpurpose/projectmgr/data/ProjectMgrSecurityPermissionSeedData.xml
similarity index 65%
rename from specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml
rename to specialpurpose/projectmgr/data/ProjectMgrSecurityPermissionSeedData.xml
index 08887f2ba5..f5ddb38beb 100644
--- a/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml
+++ b/specialpurpose/projectmgr/data/ProjectMgrSecurityPermissionSeedData.xml
@@ -36,21 +36,7 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/specialpurpose/projectmgr/ofbiz-component.xml b/specialpurpose/projectmgr/ofbiz-component.xml
index 1094497eaf..cc55209820 100644
--- a/specialpurpose/projectmgr/ofbiz-component.xml
+++ b/specialpurpose/projectmgr/ofbiz-component.xml
@@ -29,7 +29,8 @@ under the License.
-
+
+
diff --git a/specialpurpose/scrum/data/scrumSecurityData.xml b/specialpurpose/scrum/data/scrumSecurityGroupDemoData.xml
similarity index 64%
rename from specialpurpose/scrum/data/scrumSecurityData.xml
rename to specialpurpose/scrum/data/scrumSecurityGroupDemoData.xml
index f08068d1b9..64f843fd98 100644
--- a/specialpurpose/scrum/data/scrumSecurityData.xml
+++ b/specialpurpose/scrum/data/scrumSecurityGroupDemoData.xml
@@ -18,77 +18,6 @@ specific language governing permissions and limitations
under the License.
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/specialpurpose/scrum/data/scrumSecurityPermissionSeedData.xml b/specialpurpose/scrum/data/scrumSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..3940bd6eaa
--- /dev/null
+++ b/specialpurpose/scrum/data/scrumSecurityPermissionSeedData.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/scrum/ofbiz-component.xml b/specialpurpose/scrum/ofbiz-component.xml
index 659f5a759d..0cdd682bf9 100644
--- a/specialpurpose/scrum/ofbiz-component.xml
+++ b/specialpurpose/scrum/ofbiz-component.xml
@@ -35,7 +35,8 @@ under the License.
-
+
+
diff --git a/specialpurpose/webpos/data/WebPosSecurityGroupDemoData.xml b/specialpurpose/webpos/data/WebPosSecurityGroupDemoData.xml
new file mode 100644
index 0000000000..5a506100e7
--- /dev/null
+++ b/specialpurpose/webpos/data/WebPosSecurityGroupDemoData.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/specialpurpose/webpos/data/WebPosSecurityData.xml b/specialpurpose/webpos/data/WebPosSecurityPermissionSeedData.xml
similarity index 83%
rename from specialpurpose/webpos/data/WebPosSecurityData.xml
rename to specialpurpose/webpos/data/WebPosSecurityPermissionSeedData.xml
index 6697fde7d0..e2cba56c6c 100644
--- a/specialpurpose/webpos/data/WebPosSecurityData.xml
+++ b/specialpurpose/webpos/data/WebPosSecurityPermissionSeedData.xml
@@ -18,10 +18,10 @@ specific language governing permissions and limitations
under the License.
-->
-
+
-
-
+
+
diff --git a/specialpurpose/webpos/ofbiz-component.xml b/specialpurpose/webpos/ofbiz-component.xml
index ccaedd0fa3..dba9cb145b 100644
--- a/specialpurpose/webpos/ofbiz-component.xml
+++ b/specialpurpose/webpos/ofbiz-component.xml
@@ -26,7 +26,8 @@ under the License.
-
+
+
diff --git a/specialpurpose/workflow/data/WorkFlowSecurityData.xml b/specialpurpose/workflow/data/WorkFlowSecurityGroupDemoData.xml
similarity index 91%
rename from specialpurpose/workflow/data/WorkFlowSecurityData.xml
rename to specialpurpose/workflow/data/WorkFlowSecurityGroupDemoData.xml
index be2055473a..ff472f251a 100644
--- a/specialpurpose/workflow/data/WorkFlowSecurityData.xml
+++ b/specialpurpose/workflow/data/WorkFlowSecurityGroupDemoData.xml
@@ -19,7 +19,6 @@ under the License.
-->
-
diff --git a/specialpurpose/workflow/data/WorkFlowSecurityPermissionSeedData.xml b/specialpurpose/workflow/data/WorkFlowSecurityPermissionSeedData.xml
new file mode 100644
index 0000000000..35bfd87e55
--- /dev/null
+++ b/specialpurpose/workflow/data/WorkFlowSecurityPermissionSeedData.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/workflow/ofbiz-component.xml b/specialpurpose/workflow/ofbiz-component.xml
index 1e478816df..5083bdf15c 100644
--- a/specialpurpose/workflow/ofbiz-component.xml
+++ b/specialpurpose/workflow/ofbiz-component.xml
@@ -28,7 +28,8 @@ under the License.
-
+
+