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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

hansbak-2
Added: ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,62 @@
+<?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>
+    <!-- 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"/>
+
+    <!-- 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"/>
+
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="PARTYMGR_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="SECURITY_ADMIN"/>
+    
+    </entity-engine-xml>

Propchange: ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/party/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.xml"/>
     <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/PartyTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/PartySecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/PartyDemoData.xml"/>

Added: ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.xml (added)
+++ ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.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>
+
+    <!-- Facility Manager security -->
+    <SecurityGroupPermission groupId="FULLADMIN" permissionId="FACILITY_ADMIN"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_CREATE"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_DELETE"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_UPDATE"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_VIEW"/>
+    <SecurityGroupPermission groupId="VIEWADMIN" permissionId="FACILITY_VIEW"/>
+    <SecurityGroupPermission groupId="BIZADMIN" permissionId="FACILITY_ADMIN"/>
+    
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,35 @@
+<?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>
+
+    <!-- Facility Manager security -->
+    <SecurityPermission description="View operations in the Facility Manager." permissionId="FACILITY_VIEW"/>
+    <SecurityPermission description="Create operations in the Facility Manager." permissionId="FACILITY_CREATE"/>
+    <SecurityPermission description="Update operations in the Facility Manager." permissionId="FACILITY_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Facility Manager." permissionId="FACILITY_DELETE"/>
+    <SecurityPermission description="ALL operations in the Facility Manager." permissionId="FACILITY_ADMIN"/>
+    <SecurityPermission description="Limited view operations in the Facility Manager." permissionId="FACILITY_ROLE_VIEW"/>
+    <SecurityPermission description="Limited update operations in the Facility Manager." permissionId="FACILITY_ROLE_UPDATE"/>
+    
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="FACILITY_ADMIN"/>
+
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: ofbiz/trunk/applications/product/data/ProductSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/product/data/ProductSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/product/data/ProductSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/product/data/ProductSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductSecurityData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,18 +20,6 @@ under the License.
 
 <entity-engine-xml>
     <!-- Catalog Manager security -->
-    <SecurityPermission description="View operations in the Catalog Manager." permissionId="CATALOG_VIEW"/>
-    <SecurityPermission description="Create operations in the Catalog Manager." permissionId="CATALOG_CREATE"/>
-    <SecurityPermission description="Update operations in the Catalog Manager." permissionId="CATALOG_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Catalog Manager." permissionId="CATALOG_DELETE"/>
-    <SecurityPermission description="ALL operations in the Catalog Manager." permissionId="CATALOG_ADMIN"/>
-    <SecurityPermission description="Limited Create operations in the Catalog Manager." permissionId="CATALOG_ROLE_CREATE"/>
-    <SecurityPermission description="Limited Update operations in the Catalog Manager." permissionId="CATALOG_ROLE_UPDATE"/>
-    <SecurityPermission description="Limited Delete operations in the Catalog Manager." permissionId="CATALOG_ROLE_DELETE"/>
-    <SecurityPermission description="To be able to maintain product prices, promotions, and price rules." permissionId="CATALOG_PRICE_MAINT"/>
-    <SecurityPermission description="Allow create/update of 'View Allow' in the Catalog Manager." permissionId="CATALOG_VIEW_ALLOW"/>
-    <SecurityPermission description="Allow create/update of 'Purchase Allow' in the Catalog Manager." permissionId="CATALOG_PURCHASE_ALLOW"/>
-
     <SecurityGroup description="Limited Catalog Admin group, has limited catalog permissions." groupId="CATALOGADMIN_LTD"/>
     <SecurityGroupPermission groupId="CATALOGADMIN_LTD" permissionId="CATALOG_VIEW"/>
     <SecurityGroupPermission groupId="CATALOGADMIN_LTD" permissionId="CATALOG_ROLE_CREATE"/>
@@ -65,36 +53,17 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="CATALOG_ADMIN"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="CATALOG_PRICE_MAINT"/>
 
-    <!-- Facility Manager security -->
-    <SecurityPermission description="View operations in the Facility Manager." permissionId="FACILITY_VIEW"/>
-    <SecurityPermission description="Create operations in the Facility Manager." permissionId="FACILITY_CREATE"/>
-    <SecurityPermission description="Update operations in the Facility Manager." permissionId="FACILITY_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Facility Manager." permissionId="FACILITY_DELETE"/>
-    <SecurityPermission description="ALL operations in the Facility Manager." permissionId="FACILITY_ADMIN"/>
-    <SecurityPermission description="Limited view operations in the Facility Manager." permissionId="FACILITY_ROLE_VIEW"/>
-    <SecurityPermission description="Limited update operations in the Facility Manager." permissionId="FACILITY_ROLE_UPDATE"/>
-    <SecurityGroupPermission groupId="FULLADMIN" permissionId="FACILITY_ADMIN"/>
-    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_CREATE"/>
-    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_DELETE"/>
-    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_UPDATE"/>
-    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_VIEW"/>
-    <SecurityGroupPermission groupId="VIEWADMIN" permissionId="FACILITY_VIEW"/>
-    <SecurityGroupPermission groupId="BIZADMIN" permissionId="FACILITY_ADMIN"/>
-    
     <!-- Image Management security -->
     <SecurityGroup description="Image Management Admin." groupId="IMAGEADMIN"/>
-    <SecurityPermission description="All operations in the Image Management." permissionId="IMAGE_MANAGEMENT_ADMIN"/>
     <SecurityGroupPermission groupId="IMAGEADMIN" permissionId="IMAGE_MANAGEMENT_ADMIN"/>
     <SecurityGroupPermission groupId="IMAGEADMIN" permissionId="IMAGE_MANAGEMENT_APPROVE"/>
     <SecurityGroupPermission groupId="IMAGEADMIN" permissionId="IMAGE_MANAGEMENT_UPLOAD"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="IMAGE_MANAGEMENT_ADMIN"/>
     
     <SecurityGroup description="Image Management Approve" groupId="IMAGEAPPROVE"/>
-    <SecurityPermission description="Approve photos in the Image Management." permissionId="IMAGE_MANAGEMENT_APPROVE"/>
     <SecurityGroupPermission groupId="IMAGEAPPROVE" permissionId="IMAGE_MANAGEMENT_APPROVE"/>
     
     <SecurityGroup description="Image Management Upload." groupId="IMAGEUPLOAD"/>
-    <SecurityPermission description="Upload photos in the Image Management." permissionId="IMAGE_MANAGEMENT_UPLOAD"/>
     <SecurityGroupPermission groupId="IMAGEUPLOAD" permissionId="IMAGE_MANAGEMENT_UPLOAD"/>
     
 </entity-engine-xml>

Added: ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,47 @@
+<?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>
+    <!-- Catalog Manager security -->
+    <SecurityPermission description="View operations in the Catalog Manager." permissionId="CATALOG_VIEW"/>
+    <SecurityPermission description="Create operations in the Catalog Manager." permissionId="CATALOG_CREATE"/>
+    <SecurityPermission description="Update operations in the Catalog Manager." permissionId="CATALOG_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Catalog Manager." permissionId="CATALOG_DELETE"/>
+    <SecurityPermission description="ALL operations in the Catalog Manager." permissionId="CATALOG_ADMIN"/>
+    <SecurityPermission description="Limited Create operations in the Catalog Manager." permissionId="CATALOG_ROLE_CREATE"/>
+    <SecurityPermission description="Limited Update operations in the Catalog Manager." permissionId="CATALOG_ROLE_UPDATE"/>
+    <SecurityPermission description="Limited Delete operations in the Catalog Manager." permissionId="CATALOG_ROLE_DELETE"/>
+    <SecurityPermission description="To be able to maintain product prices, promotions, and price rules." permissionId="CATALOG_PRICE_MAINT"/>
+    <SecurityPermission description="Allow create/update of 'View Allow' in the Catalog Manager." permissionId="CATALOG_VIEW_ALLOW"/>
+    <SecurityPermission description="Allow create/update of 'Purchase Allow' in the Catalog Manager." permissionId="CATALOG_PURCHASE_ALLOW"/>
+
+    <!-- Image Management security -->
+    <SecurityPermission description="All operations in the Image Management." permissionId="IMAGE_MANAGEMENT_ADMIN"/>
+    <SecurityPermission description="Approve photos in the Image Management." permissionId="IMAGE_MANAGEMENT_APPROVE"/>
+    <SecurityPermission description="Upload photos in the Image Management." permissionId="IMAGE_MANAGEMENT_UPLOAD"/>
+    
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="CATALOG_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="CATALOG_PRICE_MAINT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="CATALOG_VIEW_ALLOW"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="CATALOG_PURCHASE_ALLOW"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="IMAGE_MANAGEMENT_ADMIN"/>
+        
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -37,7 +37,10 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ShipmentTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductSecurityGroupDemoData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/FacilitySecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/FacilitySecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/>

Copied: ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml?p2=ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml&p1=ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,17 +20,6 @@ under the License.
 
 <entity-engine-xml>
     <!-- Work Effort security -->
-    <SecurityPermission description="View operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_VIEW"/>
-    <SecurityPermission description="Create operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_CREATE"/>
-    <SecurityPermission description="Update operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_DELETE"/>
-    <SecurityPermission description="Limited View operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ROLE_VIEW"/>
-    <SecurityPermission description="Limited Create operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ROLE_CREATE"/>
-    <SecurityPermission description="Limited Update operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ROLE_UPDATE"/>
-    <SecurityPermission description="Limited Delete operations the Work Effort Manager." permissionId="WORKEFFORTMGR_ROLE_DELETE"/>
-    <SecurityPermission description="ALL operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ADMIN"/>
-
-
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="WORKEFFORTMGR_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_DELETE"/>

Added: ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,35 @@
+<?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>
+    <!-- Work Effort security -->
+    <SecurityPermission description="View operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_VIEW"/>
+    <SecurityPermission description="Create operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_CREATE"/>
+    <SecurityPermission description="Update operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_DELETE"/>
+    <SecurityPermission description="Limited View operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ROLE_VIEW"/>
+    <SecurityPermission description="Limited Create operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ROLE_CREATE"/>
+    <SecurityPermission description="Limited Update operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ROLE_UPDATE"/>
+    <SecurityPermission description="Limited Delete operations the Work Effort Manager." permissionId="WORKEFFORTMGR_ROLE_DELETE"/>
+    <SecurityPermission description="ALL operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ADMIN"/>
+
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="WORKEFFORTMGR_ADMIN"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/workeffort/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -29,9 +29,10 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortTypeData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortPortletData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortSecurityGroupDemoData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortDemoData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/>

Copied: ofbiz/trunk/framework/bi/data/BiSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/framework/bi/data/BiSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/data/BiSecurityGroupDemoData.xml?p2=ofbiz/trunk/framework/bi/data/BiSecurityGroupDemoData.xml&p1=ofbiz/trunk/framework/bi/data/BiSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/data/BiSecurityData.xml (original)
+++ ofbiz/trunk/framework/bi/data/BiSecurityGroupDemoData.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 Business Intelligence operations." permissionId="BI_ADMIN"/>
-    <SecurityPermission description="Business Intelligence View permission." permissionId="BI_VIEW"/>
-
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="BI_ADMIN"/>
 </entity-engine-xml>

Added: ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.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 Business Intelligence operations." permissionId="BI_ADMIN"/>
+    <SecurityPermission description="Business Intelligence View permission." permissionId="BI_VIEW"/>
+
+    <SecurityGroupPermission groupId="SUPER" permissionId="BI_ADMIN"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/framework/bi/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/bi/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -25,7 +25,8 @@ under the License.
     <classpath type="dir" location="config"/>
     <classpath type="jar" location="build/lib/*"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BiTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/BiSecurityGroupDemoData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
 

Copied: ofbiz/trunk/framework/common/data/CommonSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/framework/common/data/CommonSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonSecurityGroupDemoData.xml?p2=ofbiz/trunk/framework/common/data/CommonSecurityGroupDemoData.xml&p1=ofbiz/trunk/framework/common/data/CommonSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonSecurityData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,17 +20,6 @@
 
 <entity-engine-xml>
     <!-- Common Services security -->
-    <SecurityPermission description="View operations in the Common Component." permissionId="COMMON_VIEW"/>
-    <SecurityPermission description="Admin operations in the Common Component." permissionId="COMMON_ADMIN"/>
-    <SecurityPermission description="Create operations in the Common Component." permissionId="COMMON_CREATE"/>
-    <SecurityPermission description="Update operations in the Common Component." permissionId="COMMON_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Common Component." permissionId="COMMON_DELETE"/>
-    <SecurityPermission description="Create Visual Themes and Visual Theme Resources." permissionId="VISUALTHEME_CREATE"/>
-    <SecurityPermission description="Update Visual Themes and Visual Theme Resources." permissionId="VISUALTHEME_UPDATE"/>
-    <SecurityPermission description="Delete Visual Themes and Visual Theme Resources." permissionId="VISUALTHEME_DELETE"/>
-    <SecurityPermission description="ALL operations on Visual Themes and Visual Theme Resources." permissionId="VISUALTHEME_ADMIN"/>
-    <SecurityPermission description="Admin operations on Portal Pages." permissionId="PORTALPAGE_ADMIN"/>
-
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="COMMON_CREATE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="COMMON_DELETE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="COMMON_UPDATE"/>
@@ -47,10 +36,8 @@
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="COMMON_VIEW"/>
 
     <!-- User preferences security -->
-    <SecurityPermission description="User preferences admin" permissionId="USERPREF_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="USERPREF_ADMIN"/>
 
     <!-- Temporal expression security -->
-    <SecurityPermission description="Temporal expression admin" permissionId="TEMPEXPR_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="TEMPEXPR_ADMIN"/>
 </entity-engine-xml>

Added: ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,43 @@
+<?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 Services security -->
+    <SecurityPermission description="View operations in the Common Component." permissionId="COMMON_VIEW"/>
+    <SecurityPermission description="Admin operations in the Common Component." permissionId="COMMON_ADMIN"/>
+    <SecurityPermission description="Create operations in the Common Component." permissionId="COMMON_CREATE"/>
+    <SecurityPermission description="Update operations in the Common Component." permissionId="COMMON_UPDATE"/>
+    <SecurityPermission description="Delete operations in the Common Component." permissionId="COMMON_DELETE"/>
+    <SecurityPermission description="Create Visual Themes and Visual Theme Resources." permissionId="VISUALTHEME_CREATE"/>
+    <SecurityPermission description="Update Visual Themes and Visual Theme Resources." permissionId="VISUALTHEME_UPDATE"/>
+    <SecurityPermission description="Delete Visual Themes and Visual Theme Resources." permissionId="VISUALTHEME_DELETE"/>
+    <SecurityPermission description="ALL operations on Visual Themes and Visual Theme Resources." permissionId="VISUALTHEME_ADMIN"/>
+    <SecurityPermission description="Admin operations on Portal Pages." permissionId="PORTALPAGE_ADMIN"/>
+
+    <!-- User preferences security -->
+    <SecurityPermission description="User preferences admin" permissionId="USERPREF_ADMIN"/>
+
+    <!-- Temporal expression security -->
+    <SecurityPermission description="Temporal expression admin" permissionId="TEMPEXPR_ADMIN"/>
+    
+    <!-- exception for SUPER user and group shoul be loaded as seed-->
+    <SecurityGroupPermission groupId="SUPER" permissionId="COMMON_ADMIN"/>
+    
+</entity-engine-xml>

Propchange: ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/framework/common/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/common/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -27,7 +27,8 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_olap.xml"/>
     <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSystemPropertyData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CountryCodeData.xml"/>

Copied: ofbiz/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/framework/entityext/data/EntityExtSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml?p2=ofbiz/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml&p1=ofbiz/trunk/framework/entityext/data/EntityExtSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/data/EntityExtSecurityData.xml (original)
+++ ofbiz/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -19,7 +19,6 @@ under the License.
 -->
 <entity-engine-xml>
     <!-- Entity Sync Admin security -->
-    <SecurityPermission description="Use the Entity Sync Admin pages." permissionId="ENTITY_SYNC_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENTITY_SYNC_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENTITY_SYNC_ADMIN"/>
 </entity-engine-xml>

Added: ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.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>
+    <!-- Entity Sync Admin security -->
+    <SecurityPermission description="Use the Entity Sync Admin pages." permissionId="ENTITY_SYNC_ADMIN"/>
+    
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="ENTITY_SYNC_ADMIN"/>
+    
+</entity-engine-xml>

Propchange: ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/framework/entityext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/entityext/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -29,7 +29,8 @@ under the License.
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtTypeData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/EntityScheduledServices.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/EntityExtSecurityGroupDemoData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="group" loader="main" location="servicedef/groups.xml"/>

Modified: ofbiz/trunk/framework/resources/templates/AdminUserLoginData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/templates/AdminUserLoginData.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/resources/templates/AdminUserLoginData.xml (original)
+++ ofbiz/trunk/framework/resources/templates/AdminUserLoginData.xml Thu Jun 21 07:21:49 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity-engine-xml>
     <UserLogin userLoginId="@userLoginId@" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" requirePasswordChange="Y"/>
-    <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="@userLoginId@" fromDate="2001-01-01 12:00:00.0"/>
+    <UserLoginSecurityGroup groupId="SUPER" userLoginId="@userLoginId@" fromDate="2001-01-01 12:00:00.0"/>
 </entity-engine-xml>
\ No newline at end of file

Copied: ofbiz/trunk/framework/security/data/SecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/framework/security/data/SecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/data/SecurityGroupDemoData.xml?p2=ofbiz/trunk/framework/security/data/SecurityGroupDemoData.xml&p1=ofbiz/trunk/framework/security/data/SecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/data/SecurityData.xml (original)
+++ ofbiz/trunk/framework/security/data/SecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -19,12 +19,12 @@ under the License.
 -->
 <entity-engine-xml>
     <!-- OFBiz Core security -->
-    <!-- Target file: framework/security/data/SecurityData.xml -->
     
     <!--  administrative security groups -->
     <SecurityGroup groupId="FULLADMIN" description="Full Admin group, has all general permissions."/>
     <SecurityGroup groupId="FLEXADMIN" description="Flexible Admin group, has all granular permissions."/>
     <SecurityGroup groupId="VIEWADMIN" description="Demo Admin group, has all view permissions."/>
+    <SecurityGroup groupId="BIZADMIN" description="Full Business Applications permission group, has all business app admin permissions, not technical permissions."/>
     
     <!--  Security 2.0 base permissions -->
     <SecurityPermission permissionId="access" description="Base ACCESS permission"/>
@@ -39,11 +39,8 @@ under the License.
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="read"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="update"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="delete"/>
-    
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="access"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="read"/>
-      
-    <SecurityGroup groupId="BIZADMIN" description="Full Business Applications permission group, has all business app admin permissions, not technical permissions."/>
 
     <!-- general admin tools permission -->
     <SecurityPermission description="Permission to access the Stock OFBiz Manager Applications." permissionId="OFBTOOLS_VIEW"/>
@@ -52,9 +49,12 @@ under the License.
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="OFBTOOLS_VIEW"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="OFBTOOLS_VIEW"/>
 
-    <!-- System UserLogin Account - see additional data in SecurityExtData -->
-    <UserLogin userLoginId="system" enabled="N" isSystem="Y"/>
-    <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="system" fromDate="2001-01-01 12:00:00.0"/>
-    <!-- Anonymous UserLogin is referenced by services in various components -->
-    <UserLogin userLoginId="anonymous" enabled="N"/>
+    <!-- allocate userLoginId's -->
+    <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="admin" fromDate="2001-01-01 12:00:00.0"/>
+    <UserLoginSecurityGroup groupId="FLEXADMIN" userLoginId="flexadmin" fromDate="2001-01-01 12:00:00.0"/>
+    <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="demoadmin" fromDate="2001-01-01 12:00:00.0"/>
+    <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="ltdadmin" fromDate="2001-01-01 12:00:00.0"/>
+    <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="ltdadmin1" fromDate="2001-01-01 12:00:00.0"/>
+    <UserLoginSecurityGroup groupId="BIZADMIN" userLoginId="bizadmin" fromDate="2001-01-01 12:00:00.0"/>
+
 </entity-engine-xml>

Added: ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,49 @@
+<?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>
+    <!-- OFBiz Core security -->
+    
+    <!--  administrative security groups -->
+
+    <!--  Security 2.0 base permissions -->
+    <SecurityPermission permissionId="access" description="Base ACCESS permission"/>
+    <SecurityPermission permissionId="create" description="Base CREATE permission"/>
+    <SecurityPermission permissionId="read" description="Base READ permission"/>
+    <SecurityPermission permissionId="update" description="Base UPDATE permission"/>
+    <SecurityPermission permissionId="delete" description="Base DELETE permission"/>
+    <SecurityPermission permissionId="OFBTOOLS_VIEW" description="Permission to access the Stock OFBiz Manager Applications."/>
+
+    <!-- normally only permissions in this file, however permission group SUPER is an exception -->
+    <SecurityGroup groupId="SUPER" description="Super admin group, has all *_ADMIN permission loaded as seed data"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="OFBTOOLS_VIEW"/>
+
+    <!-- System UserLogin Account - see additional data in SecurityExtData -->
+    <UserLogin userLoginId="system" enabled="N" isSystem="Y"/>
+    <UserLoginSecurityGroup groupId="SUPER" userLoginId="system" fromDate="2001-01-01 12:00:00.0"/>
+    <!-- Anonymous UserLogin is referenced by services in various components -->
+    <UserLogin userLoginId="anonymous" enabled="N"/>
+    
+    <SecurityGroupPermission groupId="SUPER" permissionId="access"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="create"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="read"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="update"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="delete"/>
+    
+</entity-engine-xml>

Propchange: ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/framework/security/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/security/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -26,8 +26,8 @@ under the License.
     <classpath type="dir" location="dtd"/>
     <classpath type="jar" location="build/lib/*"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/SecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/SecurityPermissionSeedData.xml"/>
     <!-- NOTE: comment this line out to ensure no resetting of passwords -->
     <entity-resource type="data" reader-name="demo" loader="main" location="data/PasswordSecurityData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/SecurityDemoData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/SecurityGroupDemoData.xml"/>
 </ofbiz-component>

Copied: ofbiz/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/framework/service/data/ServiceSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml?p2=ofbiz/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml&p1=ofbiz/trunk/framework/service/data/ServiceSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/data/ServiceSecurityData.xml (original)
+++ ofbiz/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -19,7 +19,6 @@ under the License.
 -->
 <entity-engine-xml>
     <!-- Remote Service security -->
-    <SecurityPermission description="Permission to invoke any service remotely." permissionId="SERVICE_INVOKE_ANY"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="SERVICE_INVOKE_ANY"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SERVICE_INVOKE_ANY"/>
 </entity-engine-xml>

Added: ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.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>
+    <!-- Remote Service security -->
+    <SecurityPermission description="Permission to invoke any service remotely." permissionId="SERVICE_INVOKE_ANY"/>
+
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="SERVICE_INVOKE_ANY"/>
+
+</entity-engine-xml>

Propchange: ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/framework/service/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/service/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -31,7 +31,8 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ScheduledServiceData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ScheduledServices.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ServiceSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ServiceDemoData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Copied: ofbiz/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml?p2=ofbiz/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml&p1=ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml (original)
+++ ofbiz/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -19,57 +19,43 @@ under the License.
 -->
 <entity-engine-xml>
     <!-- Webtools security -->
-    <SecurityPermission description="Permission to access the WebTools Menu." permissionId="WEBTOOLS_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="WEBTOOLS_VIEW"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WEBTOOLS_VIEW"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="WEBTOOLS_VIEW"/>
 
     <!-- Server Stats security -->
-    <SecurityPermission description="View the Server Statistics pages." permissionId="SERVER_STATS_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="SERVER_STATS_VIEW"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SERVER_STATS_VIEW"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="SERVER_STATS_VIEW"/>
 
     <!-- Artifact Info security -->
-    <SecurityPermission description="View the Artifact Info pages." permissionId="ARTIFACT_INFO_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ARTIFACT_INFO_VIEW"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ARTIFACT_INFO_VIEW"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="ARTIFACT_INFO_VIEW"/>
 
     <!-- Labels Info security -->
-    <SecurityPermission description="View the Labels Info pages." permissionId="LABEL_MANAGER_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="LABEL_MANAGER_VIEW"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="LABEL_MANAGER_VIEW"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="LABEL_MANAGER_VIEW"/>
 
     <!-- Data File Maintenance security -->
-    <SecurityPermission description="Use the Data File Maintenance pages." permissionId="DATAFILE_MAINT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="DATAFILE_MAINT"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="DATAFILE_MAINT"/>
 
     <!-- Service Maintenance security -->
-    <SecurityPermission description="Use the Service Maintenance pages." permissionId="SERVICE_MAINT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="SERVICE_MAINT"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SERVICE_MAINT"/>
 
     <!-- Period Maintenance security -->
-    <SecurityPermission description="Use the Period Maintenance pages." permissionId="PERIOD_MAINT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="PERIOD_MAINT"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PERIOD_MAINT"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="PERIOD_MAINT"/>
 
     <!-- Enum & Status Maintenance security -->
-    <SecurityPermission description="Use the Enum and Status Maintenance pages." permissionId="ENUM_STATUS_MAINT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENUM_STATUS_MAINT"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENUM_STATUS_MAINT"/>
 
     <!-- Entity Maintenance security -->
-    <SecurityPermission description="Use the Entity Maintenance pages." permissionId="ENTITY_MAINT"/>
-    <SecurityPermission description="View with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_VIEW"/>
-    <SecurityPermission description="Create with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_CREATE"/>
-    <SecurityPermission description="Update with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_UPDATE"/>
-    <SecurityPermission description="Delete with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_DELETE"/>
-    <SecurityPermission description="ALL with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_ADMIN"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENTITY_MAINT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENTITY_DATA_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENTITY_MAINT"/>
@@ -80,10 +66,6 @@ under the License.
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="ENTITY_DATA_VIEW"/>
 
     <!-- UtilCache security -->
-    <SecurityPermission description="View a UtilCache instance." permissionId="UTIL_CACHE_VIEW"/>
-    <SecurityPermission description="Edit a UtilCache instance." permissionId="UTIL_CACHE_EDIT"/>
-    <SecurityPermission description="View a UtilDebug instance." permissionId="UTIL_DEBUG_VIEW"/>
-    <SecurityPermission description="Edit a UtilDebug instance." permissionId="UTIL_DEBUG_EDIT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="UTIL_CACHE_EDIT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="UTIL_CACHE_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="UTIL_DEBUG_EDIT"/>

Added: ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,76 @@
+<?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>
+    <!-- Webtools security -->
+    <SecurityPermission description="Permission to access the WebTools Menu." permissionId="WEBTOOLS_VIEW"/>
+
+    <!-- Server Stats security -->
+    <SecurityPermission description="View the Server Statistics pages." permissionId="SERVER_STATS_VIEW"/>
+
+    <!-- Artifact Info security -->
+    <SecurityPermission description="View the Artifact Info pages." permissionId="ARTIFACT_INFO_VIEW"/>
+
+    <!-- Labels Info security -->
+    <SecurityPermission description="View the Labels Info pages." permissionId="LABEL_MANAGER_VIEW"/>
+
+    <!-- Data File Maintenance security -->
+    <SecurityPermission description="Use the Data File Maintenance pages." permissionId="DATAFILE_MAINT"/>
+
+    <!-- Service Maintenance security -->
+    <SecurityPermission description="Use the Service Maintenance pages." permissionId="SERVICE_MAINT"/>
+
+    <!-- Period Maintenance security -->
+    <SecurityPermission description="Use the Period Maintenance pages." permissionId="PERIOD_MAINT"/>
+
+    <!-- Enum & Status Maintenance security -->
+    <SecurityPermission description="Use the Enum and Status Maintenance pages." permissionId="ENUM_STATUS_MAINT"/>
+
+    <!-- Entity Maintenance security -->
+    <SecurityPermission description="Use the Entity Maintenance pages." permissionId="ENTITY_MAINT"/>
+    <SecurityPermission description="View with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_VIEW"/>
+    <SecurityPermission description="Create with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_CREATE"/>
+    <SecurityPermission description="Update with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_UPDATE"/>
+    <SecurityPermission description="Delete with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_DELETE"/>
+    <SecurityPermission description="ALL with the Entity Data Maintenance pages." permissionId="ENTITY_DATA_ADMIN"/>
+
+    <!-- UtilCache security -->
+    <SecurityPermission description="View a UtilCache instance." permissionId="UTIL_CACHE_VIEW"/>
+    <SecurityPermission description="Edit a UtilCache instance." permissionId="UTIL_CACHE_EDIT"/>
+    <SecurityPermission description="View a UtilDebug instance." permissionId="UTIL_DEBUG_VIEW"/>
+    <SecurityPermission description="Edit a UtilDebug instance." permissionId="UTIL_DEBUG_EDIT"/>
+
+    <!-- add admin to SUPER permission group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="WEBTOOLS_VIEW"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="SERVER_STATS_VIEW"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ARTIFACT_INFO_VIEW"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="LABEL_MANAGER_VIEW"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="DATAFILE_MAINT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="DATAFILE_MAINT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="SERVICE_MAINT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="PERIOD_MAINT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ENUM_STATUS_MAINT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ENTITY_MAINT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="ENTITY_DATA_ADMIN"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="UTIL_CACHE_EDIT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="UTIL_CACHE_VIEW"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="UTIL_DEBUG_EDIT"/>
+    <SecurityGroupPermission groupId="SUPER" permissionId="UTIL_DEBUG_VIEW"/>
+
+</entity-engine-xml>

Propchange: ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/framework/webtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/webtools/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -24,7 +24,8 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/WebtoolsSecurityGroupDemoData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <webapp name="webtools"
         title="WebTools"

Copied: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml?p2=ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml&p1=ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -19,12 +19,6 @@ under the License.
 -->
 <entity-engine-xml>
     <!-- Asset Maintenance security -->
-    <SecurityPermission description="ALL Asset Maintenance operations." permissionId="ASSETMAINT_ADMIN"/>
-    <SecurityPermission description="Asset Maintenance View permission." permissionId="ASSETMAINT_VIEW"/>
-    <SecurityPermission description="Asset Maintenance Create operations." permissionId="ASSETMAINT_CREATE"/>
-    <SecurityPermission description="Asset Maintenance Update operations." permissionId="ASSETMAINT_UPDATE"/>
-    <SecurityPermission description="Asset Maintenance Delete operations." permissionId="ASSETMAINT_DELETE"/>
-
     <SecurityGroup description="Asset Maintenance Admin group, has all maintenance permissions." groupId="ASSETMAINTADMIN"/>
     <SecurityGroup description="Asset Maintenance Technician group, has view and update." groupId="ASSETMAINTTECH"/>
 

Added: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,30 @@
+<?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>
+    <!-- Asset Maintenance security -->
+    <SecurityPermission description="ALL Asset Maintenance operations." permissionId="ASSETMAINT_ADMIN"/>
+    <SecurityPermission description="Asset Maintenance View permission." permissionId="ASSETMAINT_VIEW"/>
+    <SecurityPermission description="Asset Maintenance Create operations." permissionId="ASSETMAINT_CREATE"/>
+    <SecurityPermission description="Asset Maintenance Update operations." permissionId="ASSETMAINT_UPDATE"/>
+    <SecurityPermission description="Asset Maintenance Delete operations." permissionId="ASSETMAINT_DELETE"/>
+
+    <!-- Super Security group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="ASSETMAINT_ADMIN"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -32,7 +32,8 @@
 
     <!-- entity resources: model(s), eca(s), group, and data 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/AssetMaintSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/AssetMaintSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSeedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoAssetMaintData.xml"/>
 

Copied: ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml?p2=ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml&p1=ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,9 +20,6 @@ under the License.
 
 <entity-engine-xml>
     <!-- eBay component security -->
-    <SecurityPermission description="All operations in the eBay application." permissionId="EBAY_ADMIN"/>
-    <SecurityPermission description="View operations in the eBay application." permissionId="EBAY_VIEW"/>
-
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="EBAY_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="EBAY_ADMIN"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="EBAY_VIEW"/>

Added: ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,29 @@
+<?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>
+    <!-- eBay component security -->
+    <SecurityPermission description="All operations in the eBay application." permissionId="EBAY_ADMIN"/>
+    <SecurityPermission description="View operations in the eBay application." permissionId="EBAY_VIEW"/>
+
+    <!--  super group -->
+    <SecurityGroupPermission groupId="SUPER" permissionId="EBAY_ADMIN"/>
+
+</entity-engine-xml>

Propchange: ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml?rev=1352431&r1=1352430&r2=1352431&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml Thu Jun 21 07:21:49 2012
@@ -26,7 +26,8 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
     
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/EbaySecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayHelpData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoEbayData.xml"/>

Copied: ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml (from r1351941, ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml?p2=ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml&p1=ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml&r1=1351941&r2=1352431&rev=1352431&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml Thu Jun 21 07:21:49 2012
@@ -20,9 +20,6 @@ under the License.
 
 <entity-engine-xml>
     <!-- eBay component security -->
-    <SecurityPermission description="All operations in the eBay Store application." permissionId="EBAYSTORE_ADMIN"/>
-    <SecurityPermission description="View operations in the eBay Store application." permissionId="EBAYSTORE_VIEW"/>
-
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="EBAYSTORE_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="EBAYSTORE_ADMIN"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="EBAYSTORE_VIEW"/>

Added: ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml?rev=1352431&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml (added)
+++ ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml Thu Jun 21 07:21:49 2012
@@ -0,0 +1,28 @@
+<?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>
+    <!-- eBay component security -->
+    <SecurityPermission description="All operations in the eBay Store application." permissionId="EBAYSTORE_ADMIN"/>
+    <SecurityPermission description="View operations in the eBay Store application." permissionId="EBAYSTORE_VIEW"/>
+
+    <SecurityGroupPermission groupId="SUPER" permissionId="EBAYSTORE_ADMIN"/>
+
+</entity-engine-xml>

Propchange: ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml