svn commit: r1812383 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/data/ applications/commonext/data/ applications/content/data/ applications/humanres/data/ applications/manufacturing/dat
Locked
svn commit: r1812383 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/data/ applications/commonext/data/ applications/content/data/ applications/humanres/data/ applications/manufacturing/dat
 
|
Modified: ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml Tue Oct 17 10:47:47 2017 @@ -38,10 +38,10 @@ under the License. <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"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="CATALOG_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="CATALOG_PRICE_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="CATALOG_VIEW_ALLOW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="CATALOG_PURCHASE_ALLOW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="IMAGE_MANAGEMENT_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml Tue Oct 17 10:47:47 2017 @@ -20,25 +20,25 @@ under the License. <entity-engine-xml> <!-- Work Effort security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="WORKEFFORTMGR_ADMIN"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_CREATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_DELETE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_UPDATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_ROLE_CREATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_ROLE_UPDATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_ROLE_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="WORKEFFORTMGR_VIEW"/> - <SecurityGroupPermission groupId="BIZADMIN" permissionId="WORKEFFORTMGR_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="WORKEFFORTMGR_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_CREATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_DELETE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_UPDATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_ROLE_CREATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_ROLE_UPDATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="WORKEFFORTMGR_ROLE_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="WORKEFFORTMGR_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="WORKEFFORTMGR_ADMIN"/> <SecurityGroup groupId="WORKEFFORT_USER" description="WorkEffort user group; all limited workeffort permissions." groupName="WorkEffort User"/> - <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_VIEW"/> - <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_VIEW"/> - <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_CREATE"/> - <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_UPDATE"/> - <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_DELETE"/> - <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="OFBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_CREATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_UPDATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_DELETE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="WORKEFFORT_USER" permissionId="OFBTOOLS_VIEW"/> <SecurityGroup description="WorkEffort Admin group, has all workeffort permissions." groupId="WORKEFFORTADMIN" groupName="WorkEffort Admin"/> - <SecurityGroupPermission groupId="WORKEFFORTADMIN" permissionId="WORKEFFORTMGR_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="WORKEFFORTADMIN" permissionId="WORKEFFORTMGR_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml Tue Oct 17 10:47:47 2017 @@ -31,5 +31,5 @@ under the License. <SecurityPermission description="ALL operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_ADMIN"/> <!-- add admin to SUPER permission group --> - <SecurityGroupPermission groupId="SUPER" permissionId="WORKEFFORTMGR_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="WORKEFFORTMGR_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSecurityGroupDemoData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSecurityGroupDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSecurityGroupDemoData.xml Tue Oct 17 10:47:47 2017 @@ -20,24 +20,24 @@ <entity-engine-xml> <!-- Common Services security --> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="COMMON_CREATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="COMMON_DELETE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="COMMON_UPDATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="COMMON_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="VISUALTHEME_CREATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="VISUALTHEME_UPDATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="VISUALTHEME_DELETE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PORTALPAGE_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="COMMON_CREATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="COMMON_DELETE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="COMMON_UPDATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="COMMON_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="VISUALTHEME_CREATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="VISUALTHEME_UPDATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="VISUALTHEME_DELETE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PORTALPAGE_ADMIN"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="VISUALTHEME_ADMIN"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="COMMON_ADMIN"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="PORTALPAGE_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="VISUALTHEME_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="COMMON_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="PORTALPAGE_ADMIN"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="COMMON_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="COMMON_VIEW"/> <!-- User preferences security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="USERPREF_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="USERPREF_ADMIN"/> <!-- Temporal expression security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="TEMPEXPR_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="TEMPEXPR_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml Tue Oct 17 10:47:47 2017 @@ -38,10 +38,10 @@ <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"/> - <SecurityGroupPermission groupId="SUPER" permissionId="PORTALPAGE_ADMIN"/> - <SecurityGroupPermission groupId="SUPER" permissionId="VISUALTHEME_ADMIN"/> - <SecurityGroupPermission groupId="SUPER" permissionId="USERPREF_ADMIN"/> - <SecurityGroupPermission groupId="SUPER" permissionId="TEMPEXPR_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="COMMON_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="PORTALPAGE_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="VISUALTHEME_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="USERPREF_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="TEMPEXPR_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml Tue Oct 17 10:47:47 2017 @@ -58,12 +58,28 @@ under the License. <permission-service service-name="securityPermissionCheck" main-action="CREATE"/> <attribute name="groupId" type="String" mode="IN" optional="false"/> <attribute name="permissionId" type="String" mode="IN" optional="false"/> + <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/> + <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/> + </service> + <service name="updateSecurityPermissionToSecurityGroup" engine="entity-auto" invoke="update" default-entity-name="SecurityGroupPermission" auth="true"> + <description>Update a SecurityPermission from a SecurityGroup</description> + <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/> + <attribute name="groupId" type="String" mode="IN" optional="false"/> + <attribute name="permissionId" type="String" mode="IN" optional="false"/> + <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/> + <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/> + </service> + <service name="expireSecurityPermissionToSecurityGroup" engine="entity-auto" invoke="expire" default-entity-name="SecurityGroupPermission" auth="true"> + <description>Expire a SecurityPermission from a SecurityGroup</description> + <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/> + <auto-attributes include="pk" mode="IN"/> </service> <service name="removeSecurityPermissionFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="SecurityGroupPermission" auth="true"> <description>Remove a SecurityPermission from a SecurityGroup</description> <permission-service service-name="securityPermissionCheck" main-action="DELETE"/> <attribute name="groupId" type="String" mode="IN" optional="false"/> <attribute name="permissionId" type="String" mode="IN" optional="false"/> + <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/> </service> <!-- UserLogin to SecurityGroup services --> Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml Tue Oct 17 10:47:47 2017 @@ -32,6 +32,8 @@ under the License. </entity-options> </drop-down> </field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}" required-field="true"><date-time default-value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> @@ -39,7 +41,9 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="addSecurityPermissionToSecurityGroup"/> <field name="groupId"><hidden/></field> - <field name="permissionId" title="${uiLabelMap.PermissionId}"/> + <field name="permissionId" title="${uiLabelMap.PermissionId}" required-field="true"/> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}" required-field="true"><date-time default-value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> @@ -145,10 +149,13 @@ under the License. </actions> <field name="groupId"><hidden/></field> <field name="permissionId" title="${uiLabelMap.PermissionId}"><display-entity entity-name="SecurityPermission" description="${permissionId} ${description}"/></field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}" sort-field="true"><display/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}" sort-field="true"><date-time/></field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink description="${uiLabelMap.CommonRemove}" target="removeSecurityPermissionFromSecurityGroup"> <parameter param-name="permissionId"/> <parameter param-name="groupId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> </form> Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java Tue Oct 17 10:47:47 2017 @@ -30,6 +30,7 @@ import org.apache.ofbiz.base.config.Gene import org.apache.ofbiz.base.config.MainResourceHandler; import org.apache.ofbiz.base.config.ResourceHandler; import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; @@ -293,7 +294,7 @@ public class EntityDataLoader { baseName + "_ADMIN", "description", "Permission to Administer a " + entity.getEntityName() + " entity.")); - toBeStored.add(delegator.makeValue("SecurityGroupPermission", "groupId", "FULLADMIN", "permissionId", baseName + "_ADMIN")); + toBeStored.add(delegator.makeValue("SecurityGroupPermission", "groupId", "FULLADMIN", "permissionId", baseName + "_ADMIN", "fromDate", UtilDateTime.nowTimestamp())); rowsChanged += delegator.storeAll(toBeStored); } catch (GenericEntityException e) { errorMessages.add("[generateData] ERROR: Failed Security Generation for entity \"" + baseName + "\""); Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml Tue Oct 17 10:47:47 2017 @@ -19,6 +19,6 @@ under the License. --> <entity-engine-xml> <!-- Entity Sync Admin security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENTITY_SYNC_ADMIN"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENTITY_SYNC_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ENTITY_SYNC_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ENTITY_SYNC_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml Tue Oct 17 10:47:47 2017 @@ -22,6 +22,6 @@ under the License. <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"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="ENTITY_SYNC_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/resources/templates/SecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/resources/templates/SecurityGroupDemoData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/resources/templates/SecurityGroupDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/resources/templates/SecurityGroupDemoData.xml Tue Oct 17 10:47:47 2017 @@ -19,11 +19,11 @@ under the License. --> <entity-engine-xml> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="@base-permission@_ADMIN"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="@base-permission@_CREATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="@base-permission@_DELETE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="@base-permission@_UPDATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="@base-permission@_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="@base-permission@_VIEW"/> - <SecurityGroupPermission groupId="BIZADMIN" permissionId="@base-permission@_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="@base-permission@_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="@base-permission@_CREATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="@base-permission@_DELETE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="@base-permission@_UPDATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="@base-permission@_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="@base-permission@_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="@base-permission@_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/resources/templates/SecurityPermissionSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/resources/templates/SecurityPermissionSeedData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/resources/templates/SecurityPermissionSeedData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/resources/templates/SecurityPermissionSeedData.xml Tue Oct 17 10:47:47 2017 @@ -25,6 +25,6 @@ under the License. <SecurityPermission description="Delete operations in the @component-resource-name@ Component." permissionId="@base-permission@_DELETE"/> <SecurityPermission description="ALL operations in the @component-resource-name@ Component." permissionId="@base-permission@_ADMIN"/> - <SecurityGroupPermission groupId="SUPER" permissionId="@base-permission@_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="@base-permission@_ADMIN"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml Tue Oct 17 10:47:47 2017 @@ -28,10 +28,10 @@ under the License. <!-- general admin tools permission --> <SecurityPermission description="Permission to access the Stock OFBiz Manager Applications." permissionId="OFBTOOLS_VIEW"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="OFBTOOLS_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="OFBTOOLS_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="OFBTOOLS_VIEW"/> - <SecurityGroupPermission groupId="BIZADMIN" permissionId="OFBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="OFBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="OFBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="OFBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="OFBTOOLS_VIEW"/> <!-- allocate userLoginId's --> <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="admin" fromDate="2001-01-01 12:00:00.0"/> Modified: ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml Tue Oct 17 10:47:47 2017 @@ -32,7 +32,7 @@ under the License. <!-- 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" groupName="Super"/> - <SecurityGroupPermission groupId="SUPER" permissionId="OFBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="OFBTOOLS_VIEW"/> <!-- System UserLogin Account - see additional data in SecurityExtData --> <UserLogin userLoginId="system" enabled="N" isSystem="Y"/> @@ -40,10 +40,10 @@ under the License. <!-- 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"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="access"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="create"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="read"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="update"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="delete"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml Tue Oct 17 10:47:47 2017 @@ -144,8 +144,11 @@ under the License. <description>Defines a permission available to a security group; there is no FK to SecurityPermission because we want to leave open the possibility of ad-hoc permissions, especially for the Entity Data Maintenance pages which have TONS of permissions</description> <field name="groupId" type="id"></field> <field name="permissionId" type="id-long"></field> + <field name="fromDate" type="date-time"></field> + <field name="thruDate" type="date-time"></field> <prim-key field="groupId"/> <prim-key field="permissionId"/> + <prim-key field="fromDate"/> <relation type="one" fk-name="SEC_GRP_PERM_GRP" rel-entity-name="SecurityGroup"> <key-map field-name="groupId"/> </relation> Modified: ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java Tue Oct 17 10:47:47 2017 @@ -263,7 +263,7 @@ public final class SecurityFactory { @Deprecated public boolean securityGroupPermissionExists(String groupId, String permission) { try { - return EntityQuery.use(delegator).from("SecurityGroupPermission").where("groupId", groupId, "permissionId", permission).cache(true).queryOne() != null; + return EntityQuery.use(delegator).from("SecurityGroupPermission").where("groupId", groupId, "permissionId", permission).cache(true).filterByDate().queryFirst() != null; } catch (GenericEntityException e) { Debug.logWarning(e, module); return false; Modified: ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml Tue Oct 17 10:47:47 2017 @@ -19,6 +19,6 @@ under the License. --> <entity-engine-xml> <!-- Remote Service security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="SERVICE_INVOKE_ANY"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SERVICE_INVOKE_ANY"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="SERVICE_INVOKE_ANY"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="SERVICE_INVOKE_ANY"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml Tue Oct 17 10:47:47 2017 @@ -22,6 +22,6 @@ under the License. <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"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="SERVICE_INVOKE_ANY"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml Tue Oct 17 10:47:47 2017 @@ -19,63 +19,63 @@ under the License. --> <entity-engine-xml> <!-- Webtools security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="WEBTOOLS_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="WEBTOOLS_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="WEBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="WEBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="WEBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="WEBTOOLS_VIEW"/> <!-- Server Stats security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="SERVER_STATS_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SERVER_STATS_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="SERVER_STATS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="SERVER_STATS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="SERVER_STATS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="SERVER_STATS_VIEW"/> <!-- Artifact Info security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="ARTIFACT_INFO_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ARTIFACT_INFO_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="ARTIFACT_INFO_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ARTIFACT_INFO_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ARTIFACT_INFO_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="ARTIFACT_INFO_VIEW"/> <!-- Labels Info security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="LABEL_MANAGER_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="LABEL_MANAGER_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="LABEL_MANAGER_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="LABEL_MANAGER_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="LABEL_MANAGER_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="LABEL_MANAGER_VIEW"/> <!-- Data File Maintenance security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="DATAFILE_MAINT"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="DATAFILE_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="DATAFILE_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="DATAFILE_MAINT"/> <!-- Service Maintenance security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="SERVICE_MAINT"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="SERVICE_JM_LOCK"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SERVICE_MAINT"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SERVICE_JM_LOCK"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="SERVICE_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="SERVICE_JM_LOCK"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="SERVICE_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="SERVICE_JM_LOCK"/> <!-- Period Maintenance security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="PERIOD_MAINT"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PERIOD_MAINT"/> - <SecurityGroupPermission groupId="BIZADMIN" permissionId="PERIOD_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="PERIOD_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PERIOD_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="PERIOD_MAINT"/> <!-- Enum & Status Maintenance security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENUM_STATUS_MAINT"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENUM_STATUS_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ENUM_STATUS_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ENUM_STATUS_MAINT"/> <!-- Entity Maintenance security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENTITY_MAINT"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENTITY_DATA_ADMIN"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENTITY_MAINT"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENTITY_DATA_CREATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENTITY_DATA_DELETE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENTITY_DATA_UPDATE"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ENTITY_DATA_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="ENTITY_DATA_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ENTITY_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ENTITY_DATA_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ENTITY_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ENTITY_DATA_CREATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ENTITY_DATA_DELETE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ENTITY_DATA_UPDATE"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ENTITY_DATA_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="ENTITY_DATA_VIEW"/> <!-- UtilCache security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="UTIL_CACHE_EDIT"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="UTIL_CACHE_VIEW"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="UTIL_DEBUG_EDIT"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="UTIL_DEBUG_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="UTIL_CACHE_EDIT"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="UTIL_CACHE_VIEW"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="UTIL_DEBUG_EDIT"/> - <SecurityGroupPermission groupId="FLEXADMIN" permissionId="UTIL_DEBUG_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="UTIL_CACHE_VIEW"/> - <SecurityGroupPermission groupId="VIEWADMIN" permissionId="UTIL_DEBUG_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="UTIL_CACHE_EDIT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="UTIL_CACHE_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="UTIL_DEBUG_EDIT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="UTIL_DEBUG_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="UTIL_CACHE_EDIT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="UTIL_CACHE_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="UTIL_DEBUG_EDIT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="UTIL_DEBUG_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="UTIL_CACHE_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="UTIL_DEBUG_VIEW"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml?rev=1812383&r1=1812382&r2=1812383&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml Tue Oct 17 10:47:47 2017 @@ -58,21 +58,21 @@ under the License. <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="SERVICE_JM_LOCK"/> - <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"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="WEBTOOLS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="SERVER_STATS_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="ARTIFACT_INFO_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="LABEL_MANAGER_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="DATAFILE_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="DATAFILE_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="SERVICE_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="SERVICE_JM_LOCK"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="PERIOD_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="ENUM_STATUS_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="ENTITY_MAINT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="ENTITY_DATA_ADMIN"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="UTIL_CACHE_EDIT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="UTIL_CACHE_VIEW"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="UTIL_DEBUG_EDIT"/> + <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="UTIL_DEBUG_VIEW"/> </entity-engine-xml> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |