You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ri...@apache.org on 2018/02/05 14:13:04 UTC
svn commit: r1823177 [13/13] - in /ofbiz/ofbiz-framework/trunk/applications:
accounting/ accounting/data/ commonext/ commonext/data/ content/
content/data/ datamodel/ datamodel/data/demo/ humanres/ humanres/data/
manufacturing/ manufacturing/data/ mark...
Modified: ofbiz/ofbiz-framework/trunk/applications/securityext/data/UserDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/securityext/data/UserDemoData.xml?rev=1823177&r1=1823176&r2=1823177&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/securityext/data/UserDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/securityext/data/UserDemoData.xml Mon Feb 5 14:13:04 2018
@@ -1,83 +0,0 @@
-<?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 -->
- <Party partyId="_NA_" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
- <Person partyId="_NA_"/>
- <PartyRole partyId="_NA_" roleTypeId="CARRIER"/>
- <PartyRole partyId="_NA_" roleTypeId="_NA_"/>
-
- <Party partyId="admin" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
- <Person firstName="THE" lastName="ADMINISTRATOR" middleName="PRIVILEGED" partyId="admin" personalTitle="Mr."/>
- <PartyRole partyId="admin" roleTypeId="BUYER"/>
- <PartyRole partyId="admin" roleTypeId="MANAGER"/>
- <PartyRole partyId="admin" roleTypeId="ORDER_CLERK"/>
- <PartyRole partyId="admin" roleTypeId="SHIPMENT_CLERK"/>
- <PartyRole partyId="admin" roleTypeId="SALES_REP"/>
- <PartyRole partyId="admin" roleTypeId="_NA_"/>
- <PartyStatus partyId="admin" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
-
- <Party partyId="ltdadmin" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
- <Person firstName="Limited" lastName="Administrator" middleName="" partyId="ltdadmin" personalTitle="Mr."/>
- <PartyRole partyId="ltdadmin" roleTypeId="ORDER_CLERK"/>
- <PartyRole partyId="ltdadmin" roleTypeId="LTD_ADMIN"/>
- <PartyRole partyId="ltdadmin" roleTypeId="_NA_"/>
- <PartyStatus partyId="ltdadmin" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
- <PartyContactMech partyId="ltdadmin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
-
- <!-- Adding another limited admin record(i.e with partyId ltdadmin1) to test role based security -->
-
- <Party partyId="ltdadmin1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
- <Person firstName="Limited" lastName="Administrator1" middleName="" partyId="ltdadmin1" personalTitle="Mr."/>
- <PartyRole partyId="ltdadmin1" roleTypeId="ORDER_CLERK"/>
- <PartyRole partyId="ltdadmin1" roleTypeId="LTD_ADMIN"/>
- <PartyRole partyId="ltdadmin1" roleTypeId="_NA_"/>
- <PartyStatus partyId="ltdadmin1" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
- <PartyContactMech partyId="ltdadmin1" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
-
- <Party partyId="externaluser" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
- <Person firstName="External" lastName="User" middleName="" partyId="externaluser" personalTitle="Mr."/>
- <PartyRole partyId="externaluser" roleTypeId="SUPPLIER"/>
- <PartyStatus partyId="externaluser" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
- <PartyContactMech partyId="externaluser" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
-
- <Party partyId="bizadmin" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
- <Person partyId="bizadmin" firstName="Business" lastName="Administrator"/>
- <PartyRole partyId="bizadmin" roleTypeId="BUYER"/>
- <PartyRole partyId="bizadmin" roleTypeId="MANAGER"/>
- <PartyRole partyId="bizadmin" roleTypeId="ORDER_CLERK"/>
- <PartyRole partyId="bizadmin" roleTypeId="SHIPMENT_CLERK"/>
- <PartyRole partyId="bizadmin" roleTypeId="SALES_REP"/>
- <PartyRole partyId="bizadmin" roleTypeId="_NA_"/>
- <PartyStatus partyId="bizadmin" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
- <PartyContactMech partyId="bizadmin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
-
- <UserLogin userLoginId="admin" partyId="admin"/>
- <UserLogin userLoginId="flexadmin" partyId="admin"/>
- <UserLogin userLoginId="demoadmin" partyId="admin"/>
- <UserLogin userLoginId="ltdadmin" partyId="ltdadmin"/>
- <UserLogin userLoginId="ltdadmin1" partyId="ltdadmin1"/>
- <UserLogin userLoginId="bizadmin" partyId="bizadmin"/>
-
- <EmailTemplateSetting emailTemplateSettingId="EMAIL_PASSWORD" subject="New Password Sent (${userLoginId})" fromAddress="ofbiztest@example.com"
- description="Used to send a new password at user request"/>
-
-</entity-engine-xml>
Modified: ofbiz/ofbiz-framework/trunk/applications/securityext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/securityext/ofbiz-component.xml?rev=1823177&r1=1823176&r2=1823177&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/securityext/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/securityext/ofbiz-component.xml Mon Feb 5 14:13:04 2018
@@ -24,6 +24,5 @@ under the License.
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/UserDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
</ofbiz-component>
Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortDemoData.xml?rev=1823177&r1=1823176&r2=1823177&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortDemoData.xml Mon Feb 5 14:13:04 2018
@@ -1,73 +0,0 @@
-<?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>
- <!-- Recurring calendar event demo - set up a staff meeting on the first Monday of each month -->
- <TemporalExpression tempExprId="STAFF_MTG" tempExprTypeId="INTERSECTION" description="First Monday of Each Month"/>
- <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="1ST_MONDAY_IN_MONTH"/>
- <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="MINUTE_00"/>
- <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="HOUR_10"/>
- <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting" description="Staff Meeting" tempExprId="STAFF_MTG" estimatedStartDate="2008-01-01 00:00:00.0" estimatedMilliSeconds="3600000"/>
- <FixedAsset fixedAssetId="DEMO_PROJECTOR" fixedAssetName="Overhead Projector" fixedAssetTypeId="EQUIPMENT" purchaseCost="2000" purchaseCostUomId="USD"/>
- <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG" fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED" availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
-
- <Party partyId="WorkEffortUser" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
- <Person partyId="WorkEffortUser" firstName="WorkEffort" lastName="User" />
- <PartyStatus partyId="WorkEffortUser" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="WorkEffortUser" partyId="WorkEffortUser" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" />
- <UserLoginSecurityGroup groupId="WORKEFFORT_USER" userLoginId="WorkEffortUser" fromDate="2011-01-01 00:00:00.0" />
-
- <PartyRole partyId="admin" roleTypeId="CAL_OWNER"/>
- <PartyRole partyId="admin" roleTypeId="CAL_ATTENDEE"/>
-
- <!-- Publish the staff meeting calendar event in iCalendar format -->
- <WorkEffort workEffortId="CALENDAR_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" workEffortName="iCalendar Publish Demonstration"/>
- <WorkEffortPartyAssignment workEffortId="CALENDAR_PUB_DEMO" partyId="admin" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" workEffortIdTo="STAFF_MTG" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
-
- <!-- Project Manager demo data -->
- <Party partyId="DemoEmployee1" statusId="PARTY_ENABLED"/><!-- further defined in the projectmanager -->
- <Party partyId="DemoEmployee2" statusId="PARTY_ENABLED"/>
- <Party partyId="DemoEmployee3" statusId="PARTY_ENABLED"/>
-
- <PartyRole partyId="DemoEmployee1" roleTypeId="CAL_OWNER"/>
- <PartyRole partyId="DemoEmployee2" roleTypeId="CAL_ATTENDEE"/>
- <PartyRole partyId="DemoEmployee3" roleTypeId="CAL_ATTENDEE"/>
-
- <WorkEffort workEffortId="PROJECT_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" scopeEnumId="WES_PRIVATE" description="Demo Project 1 Customer 1" workEffortName="Project iCalendar Publish Demonstration"/>
- <WorkEffortPartyAssignment workEffortId="PROJECT_PUB_DEMO" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee3" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="admin" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <!-- one off event -->
- <WorkEffort workEffortId="OneOffMeeting" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PRIVATE" workEffortName="One off Meeting june 12" description="Staff Meeting" estimatedStartDate="2009-06-12 09:00:00.0" estimatedCompletionDate="2009-06-12 10:00:00.0"/>
- <WorkEffortAssoc workEffortIdFrom="PROJECT_PUB_DEMO" workEffortIdTo="OneOffMeeting" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="OneOffMeeting" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="OneOffMeeting" partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="OneOffMeeting" partyId="admin" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <!-- private one off event for employee1 should not show with admin-->
- <WorkEffort workEffortId="PrivateDemoEmployee1" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PRIVATE" workEffortName="My Wifes birthday june 29" description="The birthday i should never forget" estimatedStartDate="2009-06-29 00:00:00.0" estimatedCompletionDate="2009-06-29 23:00:00.0"/>
- <WorkEffortAssoc workEffortIdFrom="PROJECT_PUB_DEMO" workEffortIdTo="PrivateDemoEmployee1" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="PrivateDemoEmployee1" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <!-- public event -->
- <WorkEffort workEffortId="PublicEvent" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="The general company party june 17" description="General Party" locationDesc="Tom's Banquet Hall" estimatedStartDate="2009-06-17 19:00:00.0" estimatedCompletionDate="2009-06-17 23:00:00.0"/>
- <WorkEffortAssoc workEffortIdFrom="PROJECT_PUB_DEMO" workEffortIdTo="PublicEvent" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
-
-</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=1823177&r1=1823176&r2=1823177&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml Mon Feb 5 14:13:04 2018
@@ -1,44 +0,0 @@
-<?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 -->
- <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 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 fromDate="2001-05-13 12:00:00.0" groupId="WORKEFFORTADMIN" permissionId="WORKEFFORTMGR_ADMIN"/>
-</entity-engine-xml>
Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml?rev=1823177&r1=1823176&r2=1823177&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml Mon Feb 5 14:13:04 2018
@@ -28,10 +28,7 @@ under the License.
<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/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_workeffort.xml"/>