This is an automated email from the ASF dual-hosted git repository.
dixitdeepak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new bc2638ad9d Added userFullName in UserLogin related demo/test data
bc2638ad9d is described below
commit bc2638ad9d6a43459f4212ae77dc53c0a6a97a97
Author: Deepak Dixit <[email protected]>
AuthorDate: Tue May 26 11:00:55 2026 +0530
Added userFullName in UserLogin related demo/test data
---
.../datamodel/data/demo/AccountingDemoData.xml | 4 ++--
.../datamodel/data/demo/ContentDemoData.xml | 22 +++++++++++-----------
.../datamodel/data/demo/HumanresDemoData.xml | 4 ++--
.../datamodel/data/demo/MarketingDemoData.xml | 4 ++--
applications/datamodel/data/demo/OrderDemoData.xml | 18 +++++++++---------
applications/datamodel/data/demo/PartyDemoData.xml | 4 ++--
.../datamodel/data/demo/ProductDemoData.xml | 6 +++---
.../datamodel/data/demo/SecurityExtDemoData.xml | 12 ++++++------
.../datamodel/data/demo/WorkEffortDemoData.xml | 2 +-
.../datamodel/data/seed/SecurityExtSeedData.xml | 2 +-
.../testdef/data/ManufacturingTestsData.xml | 4 ++--
applications/party/testdef/data/PartyTestsData.xml | 2 +-
.../resources/templates/AdminUserLoginData.xml | 2 +-
.../testdef/data/PermissionServiceTestData.xml | 8 ++------
14 files changed, 45 insertions(+), 49 deletions(-)
diff --git a/applications/datamodel/data/demo/AccountingDemoData.xml
b/applications/datamodel/data/demo/AccountingDemoData.xml
index f9a399ea99..d8979075c2 100644
--- a/applications/datamodel/data/demo/AccountingDemoData.xml
+++ b/applications/datamodel/data/demo/AccountingDemoData.xml
@@ -1330,7 +1330,7 @@ under the License.
<Party partyId="AcctBuyer" partyTypeId="PERSON"/>
<Person partyId="AcctBuyer" firstName="Acct" lastName="Buyer"/>
<PartyRole partyId="AcctBuyer" roleTypeId="BUYER"/>
- <UserLogin partyId="AcctBuyer" userLoginId="AcctBuyer"/>
+ <UserLogin partyId="AcctBuyer" userLoginId="AcctBuyer" userFullName="Acct
Buyer"/>
<SecurityGroup groupId="ORDERPURCH"/><!-- is needed because accounting is
before order -->
<UserLoginSecurityGroup userLoginId="AcctBuyer" groupId="ORDERPURCH"
fromDate="2001-05-13 00:00:00"/>
@@ -1545,7 +1545,7 @@ under the License.
<PartyRole partyId="accountingadmin" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="accountingadmin" roleTypeId="_NA_"/>
<PartyStatus partyId="accountant_group" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="accountingadmin"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
partyId="accountingadmin"/>
+ <UserLogin userLoginId="accountingadmin" userFullName="Accounting
Administrator" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
partyId="accountingadmin"/>
<UserLoginSecurityGroup groupId="ACCTG_FUNCTNL_ADMIN"
userLoginId="accountingadmin" fromDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="accountingadmin"
partyRelationshipTypeId="EMPLOYMENT" roleTypeIdFrom="INTERNAL_ORGANIZATIO"
roleTypeIdTo="EMPLOYEE" fromDate="2001-01-01 12:00:00.0"/>
diff --git a/applications/datamodel/data/demo/ContentDemoData.xml
b/applications/datamodel/data/demo/ContentDemoData.xml
index bb74fc07e8..d78b667b05 100644
--- a/applications/datamodel/data/demo/ContentDemoData.xml
+++ b/applications/datamodel/data/demo/ContentDemoData.xml
@@ -39,13 +39,13 @@ under the License.
<!-- User Demo Data -->
<Party partyId="BLOG_GUEST" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="BLOG_GUEST" lastName="Guest" firstName="Blog"/>
- <UserLogin userLoginId="blog_guest" partyId="BLOG_GUEST"/>
+ <UserLogin userLoginId="blog_guest" userFullName="Guest Blog"
partyId="BLOG_GUEST"/>
<PartyRole partyId="BLOG_GUEST" roleTypeId="_NA_"/>
<PartyStatus partyId="BLOG_GUEST" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
<Party partyId="BLOG_ADMIN" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="BLOG_ADMIN" lastName="Admin" firstName="Blog"/>
- <UserLogin userLoginId="blog_admin" partyId="BLOG_ADMIN"/>
+ <UserLogin userLoginId="blog_admin" userFullName="Admin Blog"
partyId="BLOG_ADMIN"/>
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_ADMIN"/>
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_AUTHOR"/>
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_EDITOR"/>
@@ -55,7 +55,7 @@ under the License.
<Party partyId="BLOG_AUTHOR" partyTypeId="PERSON"
statusId="PARTY_ENABLED"/>
<Person partyId="BLOG_AUTHOR" lastName="Author" firstName="Blog"/>
- <UserLogin userLoginId="blog_author" partyId="BLOG_AUTHOR"/>
+ <UserLogin userLoginId="blog_author" userFullName="Author Blog"
partyId="BLOG_AUTHOR"/>
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="CONTENT_AUTHOR"/>
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="CONTENT_PUBLISHER"/>
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="_NA_"/>
@@ -63,7 +63,7 @@ under the License.
<Party partyId="BLOG_EDITOR" partyTypeId="PERSON"
statusId="PARTY_ENABLED"/>
<Person partyId="BLOG_EDITOR" lastName="Editor" firstName="Blog"/>
- <UserLogin userLoginId="blog_editor" partyId="BLOG_EDITOR"/>
+ <UserLogin userLoginId="blog_editor" userFullName="Blog Editor"
partyId="BLOG_EDITOR"/>
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_EDITOR"/>
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_EDITOR"/>
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_PUBLISHER"/>
@@ -132,7 +132,7 @@ under the License.
<!-- Blog Users Demo Data -->
<Party partyId="BLOGUSER_ADMIN" partyTypeId="PERSON"
statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<Person partyId="BLOGUSER_ADMIN" lastName="Blog" firstName="Admin"/>
- <UserLogin userLoginId="blog_admin" partyId="BLOGUSER_ADMIN"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="blog_admin" userFullName="Admin Blog"
partyId="BLOGUSER_ADMIN"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<PartyRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN"/>
<PartyStatus partyId="BLOGUSER_ADMIN" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
<ContentRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN"
contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/>
@@ -140,7 +140,7 @@ under the License.
<Party partyId="BLOGUSER_EDITOR" partyTypeId="PERSON"
statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<Person partyId="BLOGUSER_EDITOR" lastName="Blog" firstName="Editor"/>
- <UserLogin userLoginId="blog_editor" partyId="BLOGUSER_EDITOR"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="blog_editor" userFullName="Blog Editor"
partyId="BLOGUSER_EDITOR"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<PartyRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN"/>
<PartyStatus partyId="BLOGUSER_EDITOR" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
<ContentRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN"
contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/>
@@ -148,7 +148,7 @@ under the License.
<Party partyId="BLOGUSER_USER" partyTypeId="PERSON"
statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<Person partyId="BLOGUSER_USER" lastName="Blog" firstName="User"/>
- <UserLogin userLoginId="blog_user" partyId="BLOGUSER_USER"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="blog_user" userFullName="Blog User"
partyId="BLOGUSER_USER"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_ADMIN"/>
<PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_AUTHOR"/>
<PartyStatus partyId="BLOGUSER_USER" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
@@ -156,11 +156,11 @@ under the License.
<Party partyId="BLOGUSER_GUEST" partyTypeId="PERSON"
statusId="PARTY_ENABLED" createdDate="2004-10-20 09:37:40.989"
createdByUserLogin="admin" lastModifiedDate="2004-10-20 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<Person partyId="BLOGUSER_GUEST" lastName="Blog" firstName="Guest"/>
<PartyStatus partyId="BLOGUSER_GUEST" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="blog_guest" partyId="BLOGUSER_GUEST"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="blog_guest" userFullName="Blog Guest"
partyId="BLOGUSER_GUEST"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<Party partyId="AUTHOR_BIGAL" partyTypeId="PERSON"
statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<Person partyId="AUTHOR_BIGAL" lastName="Al" firstName="Big"/>
- <UserLogin userLoginId="bigal" partyId="AUTHOR_BIGAL"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="bigal" userFullName="Big Al"
partyId="AUTHOR_BIGAL"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<PartyRole partyId="AUTHOR_BIGAL" roleTypeId="CONTENT_AUTHOR"/>
<PartyStatus partyId="AUTHOR_BIGAL" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
<ContentRole partyId="AUTHOR_BIGAL" roleTypeId="CONTENT_AUTHOR"
contentId="BLOGROOTBIGAL" fromDate="2004-03-27 09:37:40.989"/>
@@ -202,7 +202,7 @@ under the License.
<Party partyId="AUTHOR_MADMAX" partyTypeId="PERSON"
statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<Person partyId="AUTHOR_MADMAX" lastName="Max" firstName="Mad"/>
- <UserLogin userLoginId="madmax" partyId="AUTHOR_MADMAX"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="madmax" userFullName="Mad Max"
partyId="AUTHOR_MADMAX"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<PartyRole partyId="AUTHOR_MADMAX" roleTypeId="CONTENT_AUTHOR"/>
<PartyStatus partyId="AUTHOR_MADMAX" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
<ContentRole partyId="AUTHOR_MADMAX" roleTypeId="CONTENT_AUTHOR"
contentId="BLOGROOTMADMAX" fromDate="2004-03-27 09:37:40.989"/>
@@ -354,7 +354,7 @@ David won't like it. He will probably delete this seed data
from the DB, but it
<PartyRole partyId="approver" roleTypeId="REVIEWER"/>
<PartyRole partyId="admin" roleTypeId="APPROVER"/>
<PartyStatus partyId="approver" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="approver" partyId="approver"/>
+ <UserLogin userLoginId="approver" userFullName="Robert Smith"
partyId="approver"/>
<DataResource dataResourceId="DR1103b" dataResourceTypeId="OFBIZ_FILE_BIN"
objectInfo="/applications/content/data/pdftest2.pdf"
mimeTypeId="application/pdf" dataResourceName="Personal Profile"/>
diff --git a/applications/datamodel/data/demo/HumanresDemoData.xml
b/applications/datamodel/data/demo/HumanresDemoData.xml
index 085438b241..a453c961e2 100644
--- a/applications/datamodel/data/demo/HumanresDemoData.xml
+++ b/applications/datamodel/data/demo/HumanresDemoData.xml
@@ -60,10 +60,10 @@ under the License.
<Person partyId="DemoApprover" firstName="Demo" lastName="Approver"/>
<PartyStatus partyId="DemoApprover" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="demoapprover"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
requirePasswordChange="N" partyId="DemoApprover"/>
+ <UserLogin userLoginId="demoapprover" userFullName="Demo Approver"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
requirePasswordChange="N" partyId="DemoApprover"/>
<UserLoginSecurityGroup groupId="HUMANRES_APPROVER"
userLoginId="demoapprover" fromDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="demoemployee"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
requirePasswordChange="N" partyId="DemoEmployee"/>
+ <UserLogin userLoginId="demoemployee" userFullName="Demo Employee"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
requirePasswordChange="N" partyId="DemoEmployee"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0"
groupId="HUMANRES_EMPLOYEE" permissionId="EMPLOYEE_VIEW"/>
<UserLoginSecurityGroup groupId="HUMANRES_EMPLOYEE"
userLoginId="demoemployee" fromDate="2001-01-01 12:00:00.0"/>
diff --git a/applications/datamodel/data/demo/MarketingDemoData.xml
b/applications/datamodel/data/demo/MarketingDemoData.xml
index ac8955b31e..6bdea596d1 100644
--- a/applications/datamodel/data/demo/MarketingDemoData.xml
+++ b/applications/datamodel/data/demo/MarketingDemoData.xml
@@ -80,7 +80,7 @@ under the License.
<PartyRole partyId="DemoLeadOwner" roleTypeId="OWNER"/>
<PartyStatus partyId="DemoLeadOwner" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" roleTypeIdFrom="_NA_"
partyIdTo="DemoLeadOwner" roleTypeIdTo="_NA_"
partyRelationshipTypeId="EMPLOYMENT" fromDate="2000-01-01 00:00:00"/>
- <UserLogin userLoginId="DemoLeadOwner"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
partyId="DemoLeadOwner" enabled="Y"/>
+ <UserLogin userLoginId="DemoLeadOwner" userFullName="Demo LeadOwner"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
partyId="DemoLeadOwner" enabled="Y"/>
<UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="DemoLeadOwner"
fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="DemoLeadOwner1" partyTypeId="PERSON"
statusId="PARTY_ENABLED"/>
@@ -89,7 +89,7 @@ under the License.
<PartyRole partyId="DemoLeadOwner1" roleTypeId="OWNER"/>
<PartyStatus partyId="DemoLeadOwner1" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" roleTypeIdFrom="_NA_"
partyIdTo="DemoLeadOwner1" roleTypeIdTo="_NA_"
partyRelationshipTypeId="EMPLOYMENT" fromDate="2000-01-01 00:00:00"/>
- <UserLogin userLoginId="DemoLeadOwner1"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
partyId="DemoLeadOwner1" enabled="Y"/>
+ <UserLogin userLoginId="DemoLeadOwner1" userFullName="Demo LeadOwner1"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
partyId="DemoLeadOwner1" enabled="Y"/>
<UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="DemoLeadOwner1"
fromDate="2001-05-13 00:00:00.000"/>
<!-- Demo Leads -->
diff --git a/applications/datamodel/data/demo/OrderDemoData.xml
b/applications/datamodel/data/demo/OrderDemoData.xml
index ff56878059..b47c75c2c2 100644
--- a/applications/datamodel/data/demo/OrderDemoData.xml
+++ b/applications/datamodel/data/demo/OrderDemoData.xml
@@ -136,7 +136,7 @@ under the License.
<UserLogin userLoginId="DemoCustCompany"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<UserLogin userLoginId="DemoCustAgent"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<UserLogin userLoginId="DemoCustomer"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
- <UserLogin userLoginId="supplier" partyId="externaluser"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="supplier" userFullName="External User"
partyId="externaluser"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<UserLoginSecurityGroup groupId="ORDERSUPPLIER_LTD" userLoginId="supplier"
fromDate="2001-01-01 12:00:00.0"/>
<Party partyId="DemoCustomer"/>
@@ -2171,7 +2171,7 @@ under the License.
<Person partyId="DemoBuyer" firstName="Demo" lastName="Buyer"/>
<PartyRole partyId="DemoBuyer" roleTypeId="BUYER"/>
<PartyStatus partyId="DemoBuyer" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin partyId="DemoBuyer" userLoginId="DemoBuyer"/>
+ <UserLogin partyId="DemoBuyer" userLoginId="DemoBuyer" userFullName="Demo
Buyer"/>
<UserLoginSecurityGroup userLoginId="DemoBuyer" groupId="ORDERPURCH"
fromDate="2001-05-13 00:00:00"/>
<!-- this person can create sales orders for any store -->
@@ -2179,7 +2179,7 @@ under the License.
<Person partyId="DemoRepAll" firstName="Demo" lastName="Sales Rep for All
Stores"/>
<PartyRole partyId="DemoRepAll" roleTypeId="SALES_REP"/>
<PartyStatus partyId="DemoRepAll" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin partyId="DemoRepAll" userLoginId="DemoRepAll"/>
+ <UserLogin partyId="DemoRepAll" userLoginId="DemoRepAll"
userFullName="Demo Sales Rep for All Stores"/>
<UserLoginSecurityGroup userLoginId="DemoRepAll" groupId="ORDERENTRY_ALL"
fromDate="2001-05-13 00:00:00"/>
<!-- this person can only create sales orders for stores for which he is a
sales rep -->
@@ -2187,7 +2187,7 @@ under the License.
<Person partyId="DemoRepStore" firstName="Demo" lastName="Sales Rep for
Specified Stores Only"/>
<PartyRole partyId="DemoRepStore" roleTypeId="SALES_REP"/>
<PartyStatus partyId="DemoRepStore" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin partyId="DemoRepStore" userLoginId="DemoRepStore"/>
+ <UserLogin partyId="DemoRepStore" userLoginId="DemoRepStore"
userFullName="Demo Sales Rep for Specified Stores Only"/>
<UserLoginSecurityGroup userLoginId="DemoRepStore" groupId="ORDERENTRY"
fromDate="2001-05-13 00:00:00"/>
<ProductStoreRole partyId="DemoRepStore" roleTypeId="SALES_REP"
productStoreId="9000" fromDate="2001-05-13 12:00:00.0"/>
@@ -2207,7 +2207,7 @@ under the License.
<PartyRole partyId="DemoCustCompany" roleTypeId="ACCOUNT"/>
<PartyStatus partyId="DemoCustCompany" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
<PartyGroup partyId="DemoCustCompany" groupName="Demo Customer Company"/>
- <UserLogin partyId="DemoCustCompany" userLoginId="DemoCustCompany"/>
+ <UserLogin partyId="DemoCustCompany" userLoginId="DemoCustCompany"
userFullName="Demo Customer Company"/>
<PartyRole partyId="DemoCustCompany" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustCompany" roleTypeId="BILL_TO_CUSTOMER"/>
<PartyRole partyId="DemoCustCompany" roleTypeId="_NA_"/>
@@ -2243,7 +2243,7 @@ under the License.
<!-- DemoCustAgent -->
<Party partyId="DemoCustAgent" partyTypeId="PERSON"
statusId="PARTY_ENABLED"/>
<Person partyId="DemoCustAgent" firstName="Demo" lastName="Agent"/>
- <UserLogin partyId="DemoCustAgent" userLoginId="DemoCustAgent"/>
+ <UserLogin partyId="DemoCustAgent" userLoginId="DemoCustAgent"
userFullName="Demo Agent"/>
<PartyRole partyId="DemoCustAgent" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustAgent" roleTypeId="AGENT"/>
<PartyRole partyId="DemoCustAgent" roleTypeId="_NA_"/>
@@ -2269,7 +2269,7 @@ under the License.
<!-- DemoCustomer -->
<Party partyId="DemoCustomer" partyTypeId="PERSON"
statusId="PARTY_ENABLED"/>
<Person partyId="DemoCustomer" firstName="Demo" lastName="Customer"/>
- <UserLogin partyId="DemoCustomer" userLoginId="DemoCustomer"/>
+ <UserLogin partyId="DemoCustomer" userLoginId="DemoCustomer"
userFullName="Demo Customer"/>
<PartyRole partyId="DemoCustomer" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustomer" roleTypeId="CONTACT"/>
<PartyRole partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER"/>
@@ -2302,7 +2302,7 @@ under the License.
<!-- EuroCustomer wants invoices in Euro(s), located in Amsterdam
(Netherlands) -->
<Party partyId="EuroCustomer" partyTypeId="PERSON"
statusId="PARTY_ENABLED" preferredCurrencyUomId="EUR"/>
<Person partyId="EuroCustomer" firstName="Euro" lastName="Customer"/>
- <UserLogin partyId="EuroCustomer" userLoginId="EuroCustomer"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
lastLocale="nl_NL"/>
+ <UserLogin partyId="EuroCustomer" userLoginId="EuroCustomer"
userFullName="Euro Customer"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
lastLocale="nl_NL"/>
<PartyClassification partyId="EuroCustomer"
partyClassificationGroupId="EMEA" fromDate="2001-01-01 00:00:00.0"/>
<PartyRole partyId="EuroCustomer" roleTypeId="CUSTOMER"/>
<PartyRole partyId="EuroCustomer" roleTypeId="BILL_TO_CUSTOMER"/>
@@ -2330,7 +2330,7 @@ under the License.
<!-- FrenchCustomer want invoices in euro and be located in Poussan -->
<Party partyId="FrenchCustomer" partyTypeId="PERSON"
statusId="PARTY_ENABLED" preferredCurrencyUomId="EUR"/>
<Person partyId="FrenchCustomer" firstName="French" lastName="Customer"/>
- <UserLogin partyId="FrenchCustomer" userLoginId="FrenchCustomer"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
lastLocale="fr_FR"/>
+ <UserLogin partyId="FrenchCustomer" userLoginId="FrenchCustomer"
userFullName="French Customer"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
lastLocale="fr_FR"/>
<PartyClassification partyId="FrenchCustomer"
partyClassificationGroupId="EMEA" fromDate="2001-01-01 00:00:00.0"/>
<PartyRole partyId="FrenchCustomer" roleTypeId="CUSTOMER"/>
<PartyRole partyId="FrenchCustomer" roleTypeId="BILL_TO_CUSTOMER"/>
diff --git a/applications/datamodel/data/demo/PartyDemoData.xml
b/applications/datamodel/data/demo/PartyDemoData.xml
index 2e1f2a3d4a..645fc1e8f6 100644
--- a/applications/datamodel/data/demo/PartyDemoData.xml
+++ b/applications/datamodel/data/demo/PartyDemoData.xml
@@ -91,7 +91,7 @@ under the License.
<PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001"
contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001"
contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001"
contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
- <UserLogin userLoginId="DemoSupplier"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
partyId="DemoSupplier"/>
+ <UserLogin userLoginId="DemoSupplier" userFullName="Demo Supplier"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
partyId="DemoSupplier"/>
<PartyIdentificationType partyIdentificationTypeId="CARD_ID"
description="Person card identification number"/>
<PartyIdentificationType partyIdentificationTypeId="SIRET"
description="French company identification number (SIRET)"/>
<PartyIdentification partyId="DemoSupplier"
partyIdentificationTypeId="SIRET" idValue="1234 5678 90123"/>
@@ -115,7 +115,7 @@ under the License.
<SecurityGroup groupName="Auditor" description="Auditors group, having
only VIEW permissions." groupId="AUDITOR"/>
<Party partyId="DemoAuditor" statusId="PARTY_ENABLED"
partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="DemoAuditor" groupName="Demo Auditor"/>
- <UserLogin userLoginId="auditor" partyId="DemoAuditor"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="auditor" userFullName="Demo Auditor"
partyId="DemoAuditor"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="auditor"
fromDate="2001-01-01 12:00:00.0"/>
<!-- Government Agency Demo Data -->
diff --git a/applications/datamodel/data/demo/ProductDemoData.xml
b/applications/datamodel/data/demo/ProductDemoData.xml
index 9f57709208..d48926ccb1 100644
--- a/applications/datamodel/data/demo/ProductDemoData.xml
+++ b/applications/datamodel/data/demo/ProductDemoData.xml
@@ -93,21 +93,21 @@ under the License.
<Party partyId="imageAdmin" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="imageAdmin" firstName="Image Management"
lastName="Administrator"/>
<PartyStatus partyId="imageAdmin" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="imageAdmin" partyId="imageAdmin"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="imageAdmin" userFullName="Image Management
Administrator" partyId="imageAdmin"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<UserLoginSecurityGroup userLoginId="imageAdmin" groupId="FULLADMIN"
fromDate="2010-01-01 12:00:00.0"/>
<UserLoginSecurityGroup userLoginId="imageAdmin" groupId="IMAGEADMIN"
fromDate="2010-01-01 12:00:00.0"/>
<Party partyId="imageApprove" partyTypeId="PERSON"
statusId="PARTY_ENABLED"/>
<Person partyId="imageApprove" firstName="Image Management"
lastName="Approve"/>
<PartyStatus partyId="imageApprove" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="imageApprove" partyId="imageApprove"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="imageApprove" userFullName="Image Management
Approve" partyId="imageApprove"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<UserLoginSecurityGroup userLoginId="imageApprove" groupId="FLEXADMIN"
fromDate="2010-01-01 12:00:00.0"/>
<UserLoginSecurityGroup userLoginId="imageApprove" groupId="IMAGEAPPROVE"
fromDate="2010-01-01 12:00:00.0"/>
<Party partyId="imageUpload" partyTypeId="PERSON"
statusId="PARTY_ENABLED"/>
<Person partyId="imageUpload" firstName="Image Management"
lastName="Upload"/>
<PartyStatus partyId="imageUpload" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="imageUpload" partyId="imageUpload"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
+ <UserLogin userLoginId="imageUpload" userFullName="Image Management
Upload" partyId="imageUpload"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
<UserLoginSecurityGroup userLoginId="imageUpload" groupId="CATALOGADMIN"
fromDate="2010-01-01 12:00:00.0"/>
<UserLoginSecurityGroup userLoginId="imageUpload" groupId="IMAGEUPLOAD"
fromDate="2010-01-01 12:00:00.0"/>
diff --git a/applications/datamodel/data/demo/SecurityExtDemoData.xml
b/applications/datamodel/data/demo/SecurityExtDemoData.xml
index 6ff4f76186..68afdeee03 100644
--- a/applications/datamodel/data/demo/SecurityExtDemoData.xml
+++ b/applications/datamodel/data/demo/SecurityExtDemoData.xml
@@ -67,12 +67,12 @@ under the License.
<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"/>
+ <UserLogin userLoginId="admin" userFullName="THE ADMINISTRATOR"
partyId="admin"/>
+ <UserLogin userLoginId="flexadmin" userFullName="THE FLEX ADMINISTRATOR"
partyId="admin"/>
+ <UserLogin userLoginId="demoadmin" userFullName="Demo Admin"
partyId="admin"/>
+ <UserLogin userLoginId="ltdadmin" userFullName="Limited Administrator"
partyId="ltdadmin"/>
+ <UserLogin userLoginId="ltdadmin1" userFullName="Limited Administrator1"
partyId="ltdadmin1"/>
+ <UserLogin userLoginId="bizadmin" userFullName="Business Administrator"
partyId="bizadmin"/>
<EmailTemplateSetting emailTemplateSettingId="EMAIL_PASSWORD" subject="New
Password Sent (${userLoginId})" fromAddress="[email protected]"
description="Used to send a new password at user
request"/>
diff --git a/applications/datamodel/data/demo/WorkEffortDemoData.xml
b/applications/datamodel/data/demo/WorkEffortDemoData.xml
index fd13041308..14315a695f 100644
--- a/applications/datamodel/data/demo/WorkEffortDemoData.xml
+++ b/applications/datamodel/data/demo/WorkEffortDemoData.xml
@@ -54,7 +54,7 @@ under the License.
<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" />
+ <UserLogin userLoginId="WorkEffortUser" userFullName="WorkEffort User"
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"/>
diff --git a/applications/datamodel/data/seed/SecurityExtSeedData.xml
b/applications/datamodel/data/seed/SecurityExtSeedData.xml
index 2bf074c0ff..c1d307d39e 100644
--- a/applications/datamodel/data/seed/SecurityExtSeedData.xml
+++ b/applications/datamodel/data/seed/SecurityExtSeedData.xml
@@ -26,5 +26,5 @@ under the License.
<!-- various automated processes will cause it to be put in this role
anyway -->
<PartyRole partyId="system" roleTypeId="PACKER"/>
- <UserLogin userLoginId="system" partyId="system"/>
+ <UserLogin userLoginId="system" userFullName="System Account"
partyId="system"/>
</entity-engine-xml>
diff --git a/applications/manufacturing/testdef/data/ManufacturingTestsData.xml
b/applications/manufacturing/testdef/data/ManufacturingTestsData.xml
index 97be258d37..bf524fda4d 100644
--- a/applications/manufacturing/testdef/data/ManufacturingTestsData.xml
+++ b/applications/manufacturing/testdef/data/ManufacturingTestsData.xml
@@ -34,7 +34,7 @@ under the License.
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0"
groupId="MANUFADMIN" permissionId="FACILITY_CREATE"/>
<Party partyId="TestManufAdmin" partyTypeId="PERSON"/>
<Person partyId="TestManufAdmin" firstName="Manufacturing"
lastName="Admin"/>
- <UserLogin partyId="TestManufAdmin" userLoginId="TestManufAdmin"/>
+ <UserLogin partyId="TestManufAdmin" userLoginId="TestManufAdmin"
userFullName="Manufacturing Admin"/>
<UserLoginSecurityGroup userLoginId="TestManufAdmin" groupId="MANUFADMIN"
fromDate="2001-05-13 00:00:00"/>
<SecurityGroup groupId="SUPPLYADMIN" description="Supply Chain Admin
group, has permissions to execute requirement based manufacturing tasks."
groupName="Supply Admin"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0"
groupId="SUPPLYADMIN" permissionId="MANUFACTURING_VIEW"/>
@@ -43,6 +43,6 @@ under the License.
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0"
groupId="SUPPLYADMIN" permissionId="ACCOUNTING_CREATE"/>
<Party partyId="TestSupplyAdmin" partyTypeId="PERSON"/>
<Person partyId="TestSupplyAdmin" firstName="Supply" lastName="Admin"/>
- <UserLogin partyId="TestSupplyAdmin" userLoginId="TestSupplyAdmin"/>
+ <UserLogin partyId="TestSupplyAdmin" userLoginId="TestSupplyAdmin"
userFullName="Supply Admin"/>
<UserLoginSecurityGroup userLoginId="TestSupplyAdmin"
groupId="SUPPLYADMIN" fromDate="2001-05-13 00:00:00"/>
</entity-engine-xml>
diff --git a/applications/party/testdef/data/PartyTestsData.xml
b/applications/party/testdef/data/PartyTestsData.xml
index d8ae87526e..2f4b8ad53f 100644
--- a/applications/party/testdef/data/PartyTestsData.xml
+++ b/applications/party/testdef/data/PartyTestsData.xml
@@ -42,7 +42,7 @@ under the License.
<Person partyId="TestParty" firstName="Test" lastName="Party"/>
<PartyRole partyId="TestParty" roleTypeId="CONTACT"/>
<PartyStatus partyId="TestParty" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
- <UserLogin userLoginId="TestParty" partyId="TestParty"/>
+ <UserLogin userLoginId="TestParty" userFullName="Test Party"
partyId="TestParty"/>
<PartyRelationship partyIdFrom="TestCompany" roleTypeIdFrom="_NA_"
partyIdTo="TestCustomer" roleTypeIdTo="CONTACT" fromDate="2000-01-01 00:00:00"
partyRelationshipTypeId="EMPLOYMENT"/>
<PartyRelationship partyIdFrom="TestCompany" roleTypeIdFrom="_NA_"
partyIdTo="TestParty" roleTypeIdTo="CONTACT" fromDate="2000-01-01 00:00:00"
partyRelationshipTypeId="EMPLOYMENT"/>
diff --git a/framework/resources/templates/AdminUserLoginData.xml
b/framework/resources/templates/AdminUserLoginData.xml
index 045201467d..e9ea4f5c56 100644
--- a/framework/resources/templates/AdminUserLoginData.xml
+++ b/framework/resources/templates/AdminUserLoginData.xml
@@ -19,6 +19,6 @@ under the License.
-->
<entity-engine-xml>
- <UserLogin userLoginId="@userLoginId@"
currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a"
requirePasswordChange="Y"/>
+ <UserLogin userLoginId="@userLoginId@" userFullName="@userLoginId@"
currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a"
requirePasswordChange="Y"/>
<UserLoginSecurityGroup groupId="SUPER" userLoginId="@userLoginId@"
fromDate="2001-01-01 12:00:00.0"/>
</entity-engine-xml>
\ No newline at end of file
diff --git a/framework/service/testdef/data/PermissionServiceTestData.xml
b/framework/service/testdef/data/PermissionServiceTestData.xml
index c6a3651b62..2f55106725 100644
--- a/framework/service/testdef/data/PermissionServiceTestData.xml
+++ b/framework/service/testdef/data/PermissionServiceTestData.xml
@@ -27,12 +27,8 @@ under the License.
<SecurityGroup groupId="TESTPERMVIEW" description="permissions reader."/>
<SecurityGroupPermission groupId="TESTPERMVIEW"
permissionId="TESTPERM_VIEW" fromDate="2001-05-13 12:00:00.0"/>
- <Party partyId="permUser1" partyTypeId="PERSON"/>
- <Person partyId="permUser1" firstName="Permission" lastName="User 1"/>
- <UserLogin userLoginId="permUser1" partyId="permUser1"/>
- <Party partyId="permUser2" partyTypeId="PERSON"/>
- <Person partyId="permUser2" firstName="Permission" lastName="User 2"/>
- <UserLogin userLoginId="permUser2" partyId="permUser2"/>
+ <UserLogin userLoginId="permUser1" userFullName="Permission User 1"/>
+ <UserLogin userLoginId="permUser2" userFullName="Permission User 2"/>
<UserLoginSecurityGroup groupId="TESTPERMADMIN" userLoginId="permUser1"
fromDate="2001-01-01 12:00:00.0"/>
<UserLoginSecurityGroup groupId="TESTPERMVIEW" userLoginId="permUser2"
fromDate="2001-01-01 12:00:00.0"/>
