You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2012/06/21 09:21:54 UTC

svn commit: r1352431 [1/3] - in /ofbiz/trunk: applications/accounting/ applications/accounting/data/ applications/commonext/ applications/commonext/data/ applications/content/ applications/content/data/ applications/humanres/ applications/humanres/data...

Author: hansbak
Date: Thu Jun 21 07:21:49 2012
New Revision: 1352431

URL: http://svn.apache.org/viewvc?rev=1352431&view=rev
Log:
split up securitypermissions as seed data and securitygroups as demo data with a single exception: the creation of a super security group which has general access to the system and which is used with the 'ant create-admin-user-login' command.

Added:
    ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/accounting/data/AccountingSecurityData.xml
    ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/commonext/data/CommonExtSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/commonext/data/CommonExtSecurityData.xml
    ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityData.xml
    ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/content/data/ContentSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/content/data/ContentSecurityData.xml
    ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/humanres/data/HumanResSecurityData.xml
    ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml
    ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/marketing/data/MarketingSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml
    ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/order/data/OrderSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/order/data/OrderSecurityData.xml
    ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/party/data/PartySecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/party/data/PartySecurityData.xml
    ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.xml   (with props)
    ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/product/data/ProductSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/product/data/ProductSecurityData.xml
    ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityData.xml
    ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/framework/bi/data/BiSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/framework/bi/data/BiSecurityData.xml
    ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/framework/common/data/CommonSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/framework/common/data/CommonSecurityData.xml
    ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/framework/entityext/data/EntityExtSecurityData.xml
    ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/framework/security/data/SecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/framework/security/data/SecurityData.xml
    ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/framework/service/data/ServiceSecurityData.xml
    ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml
    ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml
    ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityData.xml
    ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml
    ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/example/data/ExampleSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/example/data/ExampleSecurityData.xml
    ofbiz/trunk/specialpurpose/example/data/ExampleSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml
    ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml
    ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/hhfacility/data/HhFacilitySecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml
    ofbiz/trunk/specialpurpose/hhfacility/data/HhFacilitySecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalPageDemoData.xml
      - copied unchanged from r1351941, ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityData.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/oagis/data/OagisSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/oagis/data/OagisSecurityData.xml
    ofbiz/trunk/specialpurpose/oagis/data/OagisSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityData.xml
    ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/webpos/data/WebPosSecurityGroupDemoData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/webpos/data/WebPosSecurityData.xml
    ofbiz/trunk/specialpurpose/webpos/data/WebPosSecurityPermissionSeedData.xml   (with props)
    ofbiz/trunk/specialpurpose/workflow/data/WorkFlowSecurityGroupDemoData.xml   (with props)
    ofbiz/trunk/specialpurpose/workflow/data/WorkFlowSecurityPermissionSeedData.xml
      - copied, changed from r1351941, ofbiz/trunk/specialpurpose/workflow/data/WorkFlowSecurityData.xml
Removed:
    ofbiz/trunk/applications/accounting/data/AccountingSecurityData.xml
    ofbiz/trunk/applications/commonext/data/CommonExtSecurityData.xml
    ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityData.xml
    ofbiz/trunk/applications/content/data/ContentSecurityData.xml
    ofbiz/trunk/applications/humanres/data/HumanResSecurityData.xml
    ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml
    ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml
    ofbiz/trunk/applications/order/data/OrderSecurityData.xml
    ofbiz/trunk/applications/party/data/PartySecurityData.xml
    ofbiz/trunk/applications/product/data/ProductSecurityData.xml
    ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityData.xml
    ofbiz/trunk/framework/bi/data/BiSecurityData.xml
    ofbiz/trunk/framework/common/data/CommonSecurityData.xml
    ofbiz/trunk/framework/entityext/data/EntityExtSecurityData.xml
    ofbiz/trunk/framework/security/data/SecurityData.xml
    ofbiz/trunk/framework/security/data/SecurityDemoData.xml
    ofbiz/trunk/framework/service/data/ServiceSecurityData.xml
    ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml
    ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml
    ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityData.xml
    ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml
    ofbiz/trunk/specialpurpose/example/data/ExampleSecurityData.xml
    ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml
    ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml
    ofbiz/trunk/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityData.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
    ofbiz/trunk/specialpurpose/oagis/data/OagisSecurityData.xml
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml
    ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityData.xml
    ofbiz/trunk/specialpurpose/webpos/data/WebPosSecurityData.xml
    ofbiz/trunk/specialpurpose/workflow/data/WorkFlowSecurityData.xml
Modified:
    ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml
    ofbiz/trunk/applications/accounting/ofbiz-component.xml
    ofbiz/trunk/applications/commonext/ofbiz-component.xml
    ofbiz/trunk/applications/content/ofbiz-component.xml
    ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
    ofbiz/trunk/applications/humanres/ofbiz-component.xml
    ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
    ofbiz/trunk/applications/marketing/ofbiz-component.xml
    ofbiz/trunk/applications/order/ofbiz-component.xml
    ofbiz/trunk/applications/party/ofbiz-component.xml
    ofbiz/trunk/applications/product/ofbiz-component.xml
    ofbiz/trunk/applications/workeffort/ofbiz-component.xml
    ofbiz/trunk/framework/bi/ofbiz-component.xml
    ofbiz/trunk/framework/common/ofbiz-component.xml
    ofbiz/trunk/framework/entityext/ofbiz-component.xml
    ofbiz/trunk/framework/resources/templates/AdminUserLoginData.xml
    ofbiz/trunk/framework/security/ofbiz-component.xml
    ofbiz/trunk/framework/service/ofbiz-component.xml
    ofbiz/trunk/framework/webtools/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/hhfacility/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml

Copied: ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/accounting/data/AccountingSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/accounting/data/AccountingSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingSecurityData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -19,10 +19,6 @@ under the License.
 -->
 <entity-engine-xml>
     <!-- Payment Processors security -->
-    <SecurityPermission description="View operations in the Payment Processors Setup." permissionId="PAYPROC_VIEW"/>
-    <SecurityPermission description="Create operations in the Payment Processors Setup." permissionId="PAYPROC_CREATE"/>
-    <SecurityPermission description="Delete operations in the Payment Processors Setup." permissionId="PAYPROC_DELETE"/>
-    <SecurityPermission description="ALL operations in the Payment Processors Setup." permissionId="PAYPROC_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="PAYPROC_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PAYPROC_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PAYPROC_DELETE"/>
@@ -31,11 +27,6 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="PAYPROC_ADMIN"/>
 
     <!-- Payment Information security -->
-    <SecurityPermission description="View Payment Information." permissionId="PAY_INFO_VIEW"/>
-    <SecurityPermission description="Create Payment Information." permissionId="PAY_INFO_CREATE"/>
-    <SecurityPermission description="Update Payment Information." permissionId="PAY_INFO_UPDATE"/>
-    <SecurityPermission description="Delete Payment Information." permissionId="PAY_INFO_DELETE"/>
-    <SecurityPermission description="ALL Payment Information Operations." permissionId="PAY_INFO_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="PAY_INFO_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PAY_INFO_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PAY_INFO_DELETE"/>
@@ -45,11 +36,6 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="PAY_INFO_ADMIN"/>
 
     <!-- Accounting Manager security -->
-    <SecurityPermission description="View operations in the Accounting Manager." permissionId="ACCOUNTING_VIEW"/>
-    <SecurityPermission description="Create operations in the Accounting Manager." permissionId="ACCOUNTING_CREATE"/>
-    <SecurityPermission description="Update operations in the Accounting Manager." permissionId="ACCOUNTING_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Accounting Manager." permissionId="ACCOUNTING_DELETE"/>
-    <SecurityPermission description="ALL operations in the Accounting Manager." permissionId="ACCOUNTING_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ACCOUNTING_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ACCOUNTING_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ACCOUNTING_DELETE"/>
@@ -59,36 +45,27 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCOUNTING_ADMIN"/>
 
     <!-- Manual Payment security -->
-    <SecurityPermission description="Manual Payment Transaction." permissionId="MANUAL_PAYMENT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="MANUAL_PAYMENT"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="MANUAL_PAYMENT"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="MANUAL_PAYMENT"/>
 
     <!-- ACCOUNTING_COMMs security -->
-    <SecurityPermission description="View commission rates" permissionId="ACCOUNTING_COMM_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
 
     <!-- Ability to print checks -->
-    <SecurityPermission description="Print checks." permissionId="ACCOUNTING_PRINT_CHECKS"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ACCOUNTING_PRINT_CHECKS"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ACCOUNTING_PRINT_CHECKS"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCOUNTING_PRINT_CHECKS"/>
 
     <!-- Set up accounting organization preferences security -->
-    <SecurityPermission description="View organization accounting preferences" permissionId="ACCTG_PREF_VIEW"/>
-    <SecurityPermission description="Set organization accounting preferences" permissionId="ACCTG_PREF_CREATE"/>
-    <SecurityPermission description="Update organization accounting preferences" permissionId="ACCTG_PREF_UPDATE"/>
-    <SecurityPermission description="Delete organization accounting preferences" permissionId="ACCTG_PREF_DELETE"/>
-    <SecurityPermission description="ALL organization accounting preferences operations" permissionId="ACCTG_PREF_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ACCTG_PREF_ADMIN"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCTG_PREF_CREATE"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCTG_PREF_UPDATE"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCTG_PREF_DELETE"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCTG_PREF_VIEW"/>
 
-    <SecurityPermission description="Set foreign exchange rates" permissionId="ACCTG_FX_UPDATE"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ACCTG_FX_UPDATE"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCTG_FX_UPDATE"/>
 
@@ -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. -->
-    <SecurityPermission description="ALL operations involving general ledger accounting transactions and entries." permissionId="ACCTG_ATX_ADMIN"/>
-    <SecurityPermission description="Create general ledger accounting transaction and entries." permissionId="ACCTG_ATX_CREATE"/>
-    <SecurityPermission description="Update general ledger accounting transaction and entries." permissionId="ACCTG_ATX_UPDATE"/>
-    <SecurityPermission description="Delete general ledger accounting transaction and entries." permissionId="ACCTG_ATX_DELETE"/>
-    <SecurityPermission description="View general ledger accounting transaction and entries." permissionId="ACCTG_ATX_VIEW"/>
 
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ACCTG_ATX_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ACCTG_ATX_VIEW"/>

Added: ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<entity-engine-xml>
+    <!-- Payment Processors security -->
+    <SecurityPermission description="View operations in the Payment Processors Setup." permissionId="PAYPROC_VIEW"/>
+    <SecurityPermission description="Create operations in the Payment Processors Setup." permissionId="PAYPROC_CREATE"/>
+    <SecurityPermission description="Delete operations in the Payment Processors Setup." permissionId="PAYPROC_DELETE"/>
+    <SecurityPermission description="ALL operations in the Payment Processors Setup." permissionId="PAYPROC_ADMIN"/>
+
+    <!-- Payment Information security -->
+    <SecurityPermission description="View Payment Information." permissionId="PAY_INFO_VIEW"/>
+    <SecurityPermission description="Create Payment Information." permissionId="PAY_INFO_CREATE"/>
+    <SecurityPermission description="Update Payment Information." permissionId="PAY_INFO_UPDATE"/>
+    <SecurityPermission description="Delete Payment Information." permissionId="PAY_INFO_DELETE"/>
+    <SecurityPermission description="ALL Payment Information Operations." permissionId="PAY_INFO_ADMIN"/>
+
+    <!-- Accounting Manager security -->
+    <SecurityPermission description="View operations in the Accounting Manager." permissionId="ACCOUNTING_VIEW"/>
+    <SecurityPermission description="Create operations in the Accounting Manager." permissionId="ACCOUNTING_CREATE"/>
+    <SecurityPermission description="Update operations in the Accounting Manager." permissionId="ACCOUNTING_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Accounting Manager." permissionId="ACCOUNTING_DELETE"/>
+    <SecurityPermission description="ALL operations in the Accounting Manager." permissionId="ACCOUNTING_ADMIN"/>
+
+    <!-- Manual Payment security -->
+    <SecurityPermission description="Manual Payment Transaction." permissionId="MANUAL_PAYMENT"/>
+
+    <!-- ACCOUNTING_COMMs security -->
+    <SecurityPermission description="View commission rates" permissionId="ACCOUNTING_COMM_VIEW"/>
+
+    <!-- Ability to print checks -->
+    <SecurityPermission description="Print checks." permissionId="ACCOUNTING_PRINT_CHECKS"/>
+
+    <!-- Set up accounting organization preferences security -->
+    <SecurityPermission description="View organization accounting preferences" permissionId="ACCTG_PREF_VIEW"/>
+    <SecurityPermission description="Set organization accounting preferences" permissionId="ACCTG_PREF_CREATE"/>
+    <SecurityPermission description="Update organization accounting preferences" permissionId="ACCTG_PREF_UPDATE"/>
+    <SecurityPermission description="Delete organization accounting preferences" permissionId="ACCTG_PREF_DELETE"/>
+    <SecurityPermission description="ALL organization accounting preferences operations" permissionId="ACCTG_PREF_ADMIN"/>
+
+    <SecurityPermission description="Set foreign exchange rates" permissionId="ACCTG_FX_UPDATE"/>
+
+    <!-- For general ledger accounting transactions. Note that any component that needs to post
+        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. -->
+    <SecurityPermission description="ALL operations involving general ledger accounting transactions and entries." permissionId="ACCTG_ATX_ADMIN"/>
+    <SecurityPermission description="Create general ledger accounting transaction and entries." permissionId="ACCTG_ATX_CREATE"/>
+    <SecurityPermission description="Update general ledger accounting transaction and entries." permissionId="ACCTG_ATX_UPDATE"/>
+    <SecurityPermission description="Delete general ledger accounting transaction and entries." permissionId="ACCTG_ATX_DELETE"/>
+    <SecurityPermission description="View general ledger accounting transaction and entries." permissionId="ACCTG_ATX_VIEW"/>
+    
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="PAYPROC_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="PAY_INFO_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="MANUAL_PAYMENT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_COMM_VIEW"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_PRINT_CHECKS"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ACCTG_PREF_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ACCTG_FX_UPDATE"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ACCTG_ATX_ADMIN"/>
+    
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml Thu Jun 21 07:21:49 2012
@@ -22,6 +22,7 @@ under the License.
     <Person partyId="AcctBuyer" firstName="Acct" lastName="Buyer"/>
     <PartyRole partyId="AcctBuyer" roleTypeId="BUYER"/>
     <UserLogin partyId="AcctBuyer" userLoginId="AcctBuyer"/>
+    <SecurityGroup groupId="ORDERPURCH"/><!-- is needed because accounting is before order -->
     <UserLoginSecurityGroup userLoginId="AcctBuyer" groupId="ORDERPURCH" fromDate="2001-05-13 00:00:00"/>
 
     <Party partyId="AcctBigSupplier" partyTypeId="PARTY_GROUP"/>

Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -39,7 +39,8 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/AccountingSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/PaymentGatewayConfData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/AccountingScheduledServiceData.xml"/>

Copied: ofbiz/trunk/applications/commonext/data/CommonExtSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/commonext/data/CommonExtSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/CommonExtSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/commonext/data/CommonExtSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/commonext/data/CommonExtSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/CommonExtSecurityData.xml (original)
+++ ofbiz/trunk/applications/commonext/data/CommonExtSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,6 +20,5 @@ under the License.
 
 <entity-engine-xml>
     <!-- Common Ext security -->
-    <SecurityPermission description="Create public system information messages." permissionId="COMMONEXT_PUBLMSG"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="COMMONEXT_PUBLMSG"/>
 </entity-engine-xml>

Added: ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <!-- Common Ext security -->
+    <SecurityPermission description="Create public system information messages." permissionId="COMMONEXT_PUBLMSG"/>
+    
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="COMMONEXT_PUBLMSG"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityData.xml (original)
+++ ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -18,8 +18,5 @@ specific language governing permissions 
 under the License.
 -->
 <entity-engine-xml>
-    <SecurityPermission description="ALL OFBiz Setup operations." permissionId="SETUP_ADMIN"/>
-    <SecurityPermission description="OFBiz Setup View permission." permissionId="SETUP_VIEW"/>
-
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="SETUP_ADMIN"/>
 </entity-engine-xml>

Added: ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<entity-engine-xml>
+    <SecurityPermission description="ALL OFBiz Setup operations." permissionId="SETUP_ADMIN"/>
+    <SecurityPermission description="OFBiz Setup View permission." permissionId="SETUP_VIEW"/>
+
+    <SecurityGroupPermission groupId="SUPER" permissionId="SETUP_ADMIN"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/commonext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/commonext/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -26,11 +26,13 @@ under the License.
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonExtSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/OfbizSetupSecurityGroupDemoData.xml"/>
     
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     

Copied: ofbiz/trunk/applications/content/data/ContentSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/content/data/ContentSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/content/data/ContentSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/content/data/ContentSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentSecurityData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -19,11 +19,6 @@ under the License.
 -->
 <entity-engine-xml>
     <!-- Content Manager security -->
-    <SecurityPermission description="View operations in the Content Manager." permissionId="CONTENTMGR_VIEW"/>
-    <SecurityPermission description="Create operations in the Content Manager." permissionId="CONTENTMGR_CREATE"/>
-    <SecurityPermission description="Update operations in the Content Manager." permissionId="CONTENTMGR_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Content Manager." permissionId="CONTENTMGR_DELETE"/>
-    <SecurityPermission description="ALL operations in the Content Manager." permissionId="CONTENTMGR_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="CONTENTMGR_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="CONTENTMGR_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="CONTENTMGR_DELETE"/>
@@ -33,10 +28,6 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="CONTENTMGR_ADMIN"/>
 
     <!-- Content ROLE security -->
-    <SecurityPermission description="Limited View operations in the Content Manager." permissionId="CONTENTMGR_ROLE_VIEW"/>
-    <SecurityPermission description="Limited Create operations in the Content Manager." permissionId="CONTENTMGR_ROLE_CREATE"/>
-    <SecurityPermission description="Limited Update operations in the Content Manager." permissionId="CONTENTMGR_ROLE_UPDATE"/>
-    <SecurityPermission description="Limited Delete operations in the Content Manager." permissionId="CONTENTMGR_ROLE_DELETE"/>
     <SecurityGroup groupId="CONTENT_USER" description="Content user group; all limited content permissions."/>
     <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_VIEW"/>
     <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_CREATE"/>
@@ -44,7 +35,6 @@ under the License.
     <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_DELETE"/>
 
     <!-- Control Applet security -->
-    <SecurityPermission description="Send to the Control Applet." permissionId="SEND_CONTROL_APPLET"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="SEND_CONTROL_APPLET"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SEND_CONTROL_APPLET"/>
 </entity-engine-xml>

Added: ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<entity-engine-xml>
+    <!-- Content Manager security -->
+    <SecurityPermission description="View operations in the Content Manager." permissionId="CONTENTMGR_VIEW"/>
+    <SecurityPermission description="Create operations in the Content Manager." permissionId="CONTENTMGR_CREATE"/>
+    <SecurityPermission description="Update operations in the Content Manager." permissionId="CONTENTMGR_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Content Manager." permissionId="CONTENTMGR_DELETE"/>
+    <SecurityPermission description="ALL operations in the Content Manager." permissionId="CONTENTMGR_ADMIN"/>
+
+    <!-- Content ROLE security -->
+    <SecurityPermission description="Limited View operations in the Content Manager." permissionId="CONTENTMGR_ROLE_VIEW"/>
+    <SecurityPermission description="Limited Create operations in the Content Manager." permissionId="CONTENTMGR_ROLE_CREATE"/>
+    <SecurityPermission description="Limited Update operations in the Content Manager." permissionId="CONTENTMGR_ROLE_UPDATE"/>
+    <SecurityPermission description="Limited Delete operations in the Content Manager." permissionId="CONTENTMGR_ROLE_DELETE"/>
+
+    <!-- Control Applet security -->
+    <SecurityPermission description="Send to the Control Applet." permissionId="SEND_CONTROL_APPLET"/>
+    
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="CONTENTMGR_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="SEND_CONTROL_APPLET"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -36,7 +36,8 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ContentSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHttpErrorData.xml"/>

Copied: ofbiz/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/humanres/data/HumanResSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/humanres/data/HumanResSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResSecurityData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -19,11 +19,6 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <SecurityPermission description="All operations in the HumanRes Manager." permissionId="HUMANRES_ADMIN"/>
-    <SecurityPermission description="View operations in the HumanRes Manager." permissionId="HUMANRES_VIEW"/>
-    <SecurityPermission description="Create operations in the HumanRes Manager." permissionId="HUMANRES_CREATE"/>
-    <SecurityPermission description="Update operations in the HumanRes Manager." permissionId="HUMANRES_UPDATE"/>
-    <SecurityPermission description="Delete operations in the HumanRes Manager." permissionId="HUMANRES_DELETE"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="HUMANRES_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="HUMANRES_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="HUMANRES_DELETE"/>
@@ -31,4 +26,23 @@ under the License.
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="HUMANRES_VIEW"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="HUMANRES_VIEW"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="HUMANRES_ADMIN"/>
+    
+         <!-- OFBiz Recruitment security -->
+    <SecurityGroup groupId="HUMANRES_ADMIN" description="This security group is for those who have full access to the human resource component."/>
+    <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application."/>
+    <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting."/>
+    
+    <SecurityGroupPermission groupId="HUMANRES_ADMIN" permissionId="HUMANRES_ADMIN"/>
+    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_VIEW"/>
+    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_CREATE"/>
+    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="PARTYMGR_VIEW"/>
+    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="OFBTOOLS_VIEW"/>
+    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_UPDATE"/>
+    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_APPROVE"/>
+    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_VIEW"/>
+    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_CREATE"/>
+    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="PARTYMGR_VIEW"/>
+    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="OFBTOOLS_VIEW"/>
+    
+    
 </entity-engine-xml>

Added: ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <SecurityPermission description="All operations in the HumanRes Manager." permissionId="HUMANRES_ADMIN"/>
+    <SecurityPermission description="View operations in the HumanRes Manager." permissionId="HUMANRES_VIEW"/>
+    <SecurityPermission description="Create operations in the HumanRes Manager." permissionId="HUMANRES_CREATE"/>
+    <SecurityPermission description="Update operations in the HumanRes Manager." permissionId="HUMANRES_UPDATE"/>
+    <SecurityPermission description="Delete operations in the HumanRes Manager." permissionId="HUMANRES_DELETE"/>
+    <!-- Recruitment  permission -->
+    <SecurityPermission description="Approver can update the IJP approval status with this permission." permissionId="HUMANRES_APPROVE"/>
+    
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="HUMANRES_ADMIN"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Thu Jun 21 07:21:49 2012
@@ -123,26 +123,6 @@ under the License.
     <EmplPositionType emplPositionTypeId="BIZ_ANALYST" hasTable="N" description="Business Analyst"/>
     <EmplPositionType emplPositionTypeId="_NA_"/>
 
-     <!-- OFBiz Recruitment security -->
-    <SecurityGroup groupId="HUMANRES_ADMIN" description="This security group is for those who have full access to the human resource component."/>
-    <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application."/>
-    <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting."/>
-
-    <!-- Recruitment  permission -->
-    <SecurityPermission description="Approver can update the IJP approval status with this permission." permissionId="HUMANRES_APPROVE"/>
-    
-    <SecurityGroupPermission groupId="HUMANRES_ADMIN" permissionId="HUMANRES_ADMIN"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_CREATE"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="PARTYMGR_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="OFBTOOLS_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_UPDATE"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_APPROVE"/>
-    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_CREATE"/>
-    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="PARTYMGR_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="OFBTOOLS_VIEW"/>
-    
     <JobInterviewType jobInterviewTypeId="JOB_INTERVW" description="It is a process in which an employee is evaluated by an employer for prospective employment in their company"/>
     <JobInterviewType jobInterviewTypeId="EXIT_INTERVW" description="It is conducted by an employer of a departing employee"/>
     <JobInterviewType jobInterviewTypeId="INFORMAL_INTERVW" description="It is a meeting in which a job seeker asks for advice rather than employment"/>

Modified: ofbiz/trunk/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/humanres/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -28,7 +28,8 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResDemoData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Copied: ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml (original)
+++ ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,11 +20,6 @@ under the License.
 
 <entity-engine-xml>
     <!-- Manufacturing Manager security -->
-    <SecurityPermission description="View operations in the Manufacturing Manager." permissionId="MANUFACTURING_VIEW"/>
-    <SecurityPermission description="Create operations in the Manufacturing Manager." permissionId="MANUFACTURING_CREATE"/>
-    <SecurityPermission description="Update operations in the Manufacturing Manager." permissionId="MANUFACTURING_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Manufacturing Manager." permissionId="MANUFACTURING_DELETE"/>
-    <SecurityPermission description="ALL operations in the Manufacturing Manager." permissionId="MANUFACTURING_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="MANUFACTURING_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="MANUFACTURING_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="MANUFACTURING_DELETE"/>

Added: ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <!-- Manufacturing Manager security -->
+    <SecurityPermission description="View operations in the Manufacturing Manager." permissionId="MANUFACTURING_VIEW"/>
+    <SecurityPermission description="Create operations in the Manufacturing Manager." permissionId="MANUFACTURING_CREATE"/>
+    <SecurityPermission description="Update operations in the Manufacturing Manager." permissionId="MANUFACTURING_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Manufacturing Manager." permissionId="MANUFACTURING_DELETE"/>
+    <SecurityPermission description="ALL operations in the Manufacturing Manager." permissionId="MANUFACTURING_ADMIN"/>
+    
+        <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="MANUFACTURING_ADMIN"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/manufacturing/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -34,7 +34,8 @@ under the License.
     <!-- entity resources: model(s), eca(s) and group definitions -->
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ManufacturingSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/>
     <!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>-->

Copied: ofbiz/trunk/applications/marketing/data/MarketingSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/marketing/data/MarketingSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml (original)
+++ ofbiz/trunk/applications/marketing/data/MarketingSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,13 +20,6 @@ under the License.
 
 <entity-engine-xml>
     <!-- Marketing Manager security -->
-    <SecurityPermission description="View operations in the Marketing Manager." permissionId="MARKETING_VIEW"/>
-    <SecurityPermission description="Create operations in the Marketing Manager." permissionId="MARKETING_CREATE"/>
-    <SecurityPermission description="Update operations in the Marketing Manager." permissionId="MARKETING_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Marketing Manager." permissionId="MARKETING_DELETE"/>
-    <SecurityPermission description="ALL operations in the Marketing Manager." permissionId="MARKETING_ADMIN"/>
-    <SecurityPermission description="Limited view operations in the Marketing Manager." permissionId="MARKETING_ROLE_VIEW"/>
-    <SecurityPermission description="Limited update operations in the Marketing Manager." permissionId="MARKETING_ROLE_UPDATE"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="MARKETING_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="MARKETING_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="MARKETING_DELETE"/>
@@ -36,13 +29,6 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="MARKETING_ADMIN"/>
 
     <!-- SFA security -->
-    <SecurityPermission description="View operations in the SFA Manager." permissionId="SFA_VIEW"/>
-    <SecurityPermission description="Create operations in the SFA Manager." permissionId="SFA_CREATE"/>
-    <SecurityPermission description="Update operations in the SFA Manager." permissionId="SFA_UPDATE"/>
-    <SecurityPermission description="Delete operations in the SFA Manager." permissionId="SFA_DELETE"/>
-    <SecurityPermission description="ALL operations in the SFA Manager." permissionId="SFA_ADMIN"/>
-    <SecurityPermission description="Limited view operations in the SFA Manager." permissionId="SFA_ROLE_VIEW"/>
-    <SecurityPermission description="Limited update operations in the SFA Manager." permissionId="SFA_ROLE_UPDATE"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="SFA_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SFA_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SFA_DELETE"/>
@@ -51,5 +37,4 @@ under the License.
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="SFA_VIEW"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="SFA_ADMIN"/>
     
-    
 </entity-engine-xml>

Added: ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <!-- Marketing Manager security -->
+    <SecurityPermission description="View operations in the Marketing Manager." permissionId="MARKETING_VIEW"/>
+    <SecurityPermission description="Create operations in the Marketing Manager." permissionId="MARKETING_CREATE"/>
+    <SecurityPermission description="Update operations in the Marketing Manager." permissionId="MARKETING_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Marketing Manager." permissionId="MARKETING_DELETE"/>
+    <SecurityPermission description="ALL operations in the Marketing Manager." permissionId="MARKETING_ADMIN"/>
+    <SecurityPermission description="Limited view operations in the Marketing Manager." permissionId="MARKETING_ROLE_VIEW"/>
+    <SecurityPermission description="Limited update operations in the Marketing Manager." permissionId="MARKETING_ROLE_UPDATE"/>
+
+    <!-- SFA security -->
+    <SecurityPermission description="View operations in the SFA Manager." permissionId="SFA_VIEW"/>
+    <SecurityPermission description="Create operations in the SFA Manager." permissionId="SFA_CREATE"/>
+    <SecurityPermission description="Update operations in the SFA Manager." permissionId="SFA_UPDATE"/>
+    <SecurityPermission description="Delete operations in the SFA Manager." permissionId="SFA_DELETE"/>
+    <SecurityPermission description="ALL operations in the SFA Manager." permissionId="SFA_ADMIN"/>
+    <SecurityPermission description="Limited view operations in the SFA Manager." permissionId="SFA_ROLE_VIEW"/>
+    <SecurityPermission description="Limited update operations in the SFA Manager." permissionId="SFA_ROLE_UPDATE"/>
+    
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="MARKETING_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="SFA_ADMIN"/>
+    
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/marketing/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -27,7 +27,8 @@ under the License.
     <classpath type="dir" location="config"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/>

Copied: ofbiz/trunk/applications/order/data/OrderSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/order/data/OrderSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/order/data/OrderSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/order/data/OrderSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderSecurityData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,30 +20,6 @@ under the License.
 
 <entity-engine-xml>
     <!-- Order Manager security -->
-    <SecurityPermission description="View operations in the Order Manager." permissionId="ORDERMGR_VIEW"/>
-    <SecurityPermission description="Create operations in the Order Manager." permissionId="ORDERMGR_CREATE"/>
-    <SecurityPermission description="Update operations in the Order Manager." permissionId="ORDERMGR_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Order Manager." permissionId="ORDERMGR_DELETE"/>
-    <SecurityPermission description="ALL operations in the Order Manager." permissionId="ORDERMGR_ADMIN"/>
-    <SecurityPermission description="Limited view operations in the Order Manager." permissionId="ORDERMGR_ROLE_VIEW"/>
-    <SecurityPermission description="Limited Create operations in the Order Manager." permissionId="ORDERMGR_ROLE_CREATE"/>
-    <SecurityPermission description="Limited Update operations in the Order Manager." permissionId="ORDERMGR_ROLE_UPDATE"/>
-    <SecurityPermission description="Limited Delete operations in the Order Manager." permissionId="ORDERMGR_ROLE_DELETE"/>
-    <SecurityPermission description="Create notes in the Order Manager." permissionId="ORDERMGR_NOTE"/>
-    <SecurityPermission description="Process returns in the Order Manager." permissionId="ORDERMGR_RETURN"/>
-    <SecurityPermission description="Sales Order Entry in the Order Manager." permissionId="ORDERMGR_SALES_ENTRY"/>
-    <SecurityPermission description="Price change permission for sales orders." permissionId="ORDERMGR_SALES_PRICEMOD"/>
-    <SecurityPermission description="Purchase Order Entry in the Order Manager." permissionId="ORDERMGR_PURCHASE_ENTRY"/>
-    <SecurityPermission description="View purchase orders in the Order Manager." permissionId="ORDERMGR_PURCHASE_VIEW"/>
-    <SecurityPermission description="Create purchase orders in the Order Manager." permissionId="ORDERMGR_PURCHASE_CREATE"/>
-    <SecurityPermission description="Create sales orders for all stores in the Order Manager." permissionId="ORDERMGR_SALES_CREATE"/>
-    <SecurityPermission description="Update sales orders for all stores in the Order Manager." permissionId="ORDERMGR_SALES_UPDATE"/>
-    <SecurityPermission description="Send order confirmation notification." permissionId="ORDERMGR_SEND_CONFIRMATION"/>
-    <SecurityPermission description="Quote price manager in the Order Manager." permissionId="ORDERMGR_QUOTE_PRICE"/>
-    <SecurityPermission description="Create Customer Requests in the Order Manager." permissionId="ORDERMGR_CRQ_CREATE"/>
-    <SecurityPermission description="Create sales forecasts in the Order Manager." permissionId="ORDERMGR_4C_CREATE"/>
-    <SecurityPermission description="Update sales forecasts in the Order Manager." permissionId="ORDERMGR_4C_UPDATE"/>
-
     <SecurityGroup description="Admin group for restricted order processing." groupId="ORDERPROC"/>
     <SecurityGroup description="Order Entry Admin group; permissions for creating orders." groupId="ORDERENTRY"/>
     <SecurityGroup description="Order Admin group, has all order permissions." groupId="ORDERADMIN"/>

Added: ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <!-- Order Manager security -->
+    <SecurityPermission description="View operations in the Order Manager." permissionId="ORDERMGR_VIEW"/>
+    <SecurityPermission description="Create operations in the Order Manager." permissionId="ORDERMGR_CREATE"/>
+    <SecurityPermission description="Update operations in the Order Manager." permissionId="ORDERMGR_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Order Manager." permissionId="ORDERMGR_DELETE"/>
+    <SecurityPermission description="ALL operations in the Order Manager." permissionId="ORDERMGR_ADMIN"/>
+    <SecurityPermission description="Limited view operations in the Order Manager." permissionId="ORDERMGR_ROLE_VIEW"/>
+    <SecurityPermission description="Limited Create operations in the Order Manager." permissionId="ORDERMGR_ROLE_CREATE"/>
+    <SecurityPermission description="Limited Update operations in the Order Manager." permissionId="ORDERMGR_ROLE_UPDATE"/>
+    <SecurityPermission description="Limited Delete operations in the Order Manager." permissionId="ORDERMGR_ROLE_DELETE"/>
+    <SecurityPermission description="Create notes in the Order Manager." permissionId="ORDERMGR_NOTE"/>
+    <SecurityPermission description="Process returns in the Order Manager." permissionId="ORDERMGR_RETURN"/>
+    <SecurityPermission description="Sales Order Entry in the Order Manager." permissionId="ORDERMGR_SALES_ENTRY"/>
+    <SecurityPermission description="Price change permission for sales orders." permissionId="ORDERMGR_SALES_PRICEMOD"/>
+    <SecurityPermission description="Purchase Order Entry in the Order Manager." permissionId="ORDERMGR_PURCHASE_ENTRY"/>
+    <SecurityPermission description="View purchase orders in the Order Manager." permissionId="ORDERMGR_PURCHASE_VIEW"/>
+    <SecurityPermission description="Create purchase orders in the Order Manager." permissionId="ORDERMGR_PURCHASE_CREATE"/>
+    <SecurityPermission description="Create sales orders for all stores in the Order Manager." permissionId="ORDERMGR_SALES_CREATE"/>
+    <SecurityPermission description="Update sales orders for all stores in the Order Manager." permissionId="ORDERMGR_SALES_UPDATE"/>
+    <SecurityPermission description="Send order confirmation notification." permissionId="ORDERMGR_SEND_CONFIRMATION"/>
+    <SecurityPermission description="Quote price manager in the Order Manager." permissionId="ORDERMGR_QUOTE_PRICE"/>
+    <SecurityPermission description="Create Customer Requests in the Order Manager." permissionId="ORDERMGR_CRQ_CREATE"/>
+    <SecurityPermission description="Create sales forecasts in the Order Manager." permissionId="ORDERMGR_4C_CREATE"/>
+    <SecurityPermission description="Update sales forecasts in the Order Manager." permissionId="ORDERMGR_4C_UPDATE"/>
+
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="ORDERMGR_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ORDERMGR_CRQ_ADMIN"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -34,7 +34,8 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderHelpData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoData.xml"/>

Copied: ofbiz/trunk/applications/party/data/PartySecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/party/data/PartySecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartySecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/party/data/PartySecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/party/data/PartySecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartySecurityData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartySecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,34 +20,6 @@ under the License.
 
 <entity-engine-xml>
     <!-- Party Manager security -->
-    <SecurityPermission description="View operations in the Party Manager." permissionId="PARTYMGR_VIEW"/>
-    <SecurityPermission description="Create operations in the Party Manager." permissionId="PARTYMGR_CREATE"/>
-    <SecurityPermission description="Update operations in the Party Manager." permissionId="PARTYMGR_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Party Manager." permissionId="PARTYMGR_DELETE"/>
-    <SecurityPermission description="ALL operations in the Party Manager." permissionId="PARTYMGR_ADMIN"/>
-    <SecurityPermission description="Create notes in the Party Manager." permissionId="PARTYMGR_NOTE"/>
-    <SecurityPermission description="Update party status in the Party Manager." permissionId="PARTYMGR_STS_UPDATE"/>
-    <SecurityPermission description="Update PartyGroup or Person detail information." permissionId="PARTYMGR_GRP_UPDATE"/>
-    <SecurityPermission description="Create party relationships in the Party Manager." permissionId="PARTYMGR_REL_CREATE"/>
-    <SecurityPermission description="Update party relationships in the Party Manager." permissionId="PARTYMGR_REL_UPDATE"/>
-    <SecurityPermission description="Delete party relationships in the Party Manager." permissionId="PARTYMGR_REL_DELETE"/>
-    <SecurityPermission description="Create party roles in the Party Manager." permissionId="PARTYMGR_ROLE_CREATE"/>
-    <SecurityPermission description="Delete party roles in the Party Manager." permissionId="PARTYMGR_ROLE_DELETE"/>
-    <SecurityPermission description="Create party contact mechs in the Party Manager." permissionId="PARTYMGR_PCM_CREATE"/>
-    <SecurityPermission description="Update party contact mechs in the Party Manager." permissionId="PARTYMGR_PCM_UPDATE"/>
-    <SecurityPermission description="Delete party contact mechs in the Party Manager." permissionId="PARTYMGR_PCM_DELETE"/>
-    <SecurityPermission description="Create party to data source relations." permissionId="PARTYMGR_SRC_CREATE"/>
-    <SecurityPermission description="Create party quals in the Party Manager." permissionId="PARTYMGR_QAL_CREATE"/>
-    <SecurityPermission description="Update party quals in the Party Manager." permissionId="PARTYMGR_QAL_UPDATE"/>
-    <SecurityPermission description="Delete party quals in the Party Manager." permissionId="PARTYMGR_QAL_DELETE"/>
-    <SecurityPermission description="Create communication event, any from/to party." permissionId="PARTYMGR_CME_CREATE"/>
-    <SecurityPermission description="Update communication event, any from/to party." permissionId="PARTYMGR_CME_UPDATE"/>
-    <SecurityPermission description="Delete communication event, any from/to party." permissionId="PARTYMGR_CME_DELETE"/>
-    <SecurityPermission description="Can create Email communication events for logged-in user." permissionId="PARTYMGR_CME-EMAIL_CREATE"/>
-    <SecurityPermission description="Can update Email communication events for logged-in user." permissionId="PARTYMGR_CME-EMAIL_UPDATE"/>
-    <SecurityPermission description="Can delete Email communication events for logged-in user." permissionId="PARTYMGR_CME-EMAIL_DELETE"/>
-    <SecurityPermission description="Can create Internal note communication event for logged-in user." permissionId="PARTYMGR_CME-NOTE_CREATE"/>
-
     <SecurityGroup description="Party Admin group, has all party permissions." groupId="PARTYADMIN"/>
     <SecurityGroupPermission groupId="PARTYADMIN" permissionId="PARTYMGR_ADMIN"/>
     <SecurityGroupPermission groupId="PARTYADMIN" permissionId="OFBTOOLS_VIEW"/>
@@ -77,11 +49,6 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="PARTYMGR_ADMIN"/>
 
     <!-- Security Management security -->
-    <SecurityPermission description="View operations in the Security Management Screens." permissionId="SECURITY_VIEW"/>
-    <SecurityPermission description="Create operations in the Security Management Screens." permissionId="SECURITY_CREATE"/>
-    <SecurityPermission description="Update operations in the Security Management Screens." permissionId="SECURITY_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Security Management Screens." permissionId="SECURITY_DELETE"/>
-    <SecurityPermission description="ALL operations in the Security Management Screens." permissionId="SECURITY_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="SECURITY_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SECURITY_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SECURITY_DELETE"/>