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/04/10 13:36:52 UTC

svn commit: r1828817 - in /ofbiz/ofbiz-framework/trunk/applications: content/ content/data/ datamodel/data/seed/ party/ party/data/ workeffort/ workeffort/data/

Author: rishi
Date: Tue Apr 10 13:36:51 2018
New Revision: 1828817

URL: http://svn.apache.org/viewvc?rev=1828817&view=rev
Log:
Improved: Move all data in applications to the datamodel component. Move the PortalPortlet, PortletPortletCategory and PortletCategory data to party, workeffort and content components from datamodel.
(OFBIZ-9501)
Thanks to Taher for reporting.

Added:
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentPortletData.xml   (with props)
    ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml   (with props)
    ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortPortletData.xml   (with props)
Modified:
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/party/ofbiz-component.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml?rev=1828817&r1=1828816&r2=1828817&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml Tue Apr 10 13:36:51 2018
@@ -20,6 +20,8 @@ under the License.
 <entity-engine-xml>
 
     <!-- content help data -->
+    <Content contentId="HELP_MYPORTAL"/><!--  portlets are in most components -->
+    <Content contentId="HELP_ROOT"/><!-- should be in the first application loaded -->
     <PortletCategory portletCategoryId="REPORT" description="Reports"/>
     <DataResource dataResourceId="HELP_TEMPL"/><!--  further defined in the content application -->
 

Added: ofbiz/ofbiz-framework/trunk/applications/content/data/ContentPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/ContentPortletData.xml?rev=1828817&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentPortletData.xml (added)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentPortletData.xml Tue Apr 10 13:36:51 2018
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<entity-engine-xml>
+    <!-- content protlet data -->
+    <PortletCategory portletCategoryId="CONTENT" description="CMS Portlets"/>
+
+    <PortalPortlet portalPortletId="showContent"
+        portletName="Show Content" description="Shows a content in a Portal page"
+        screenName="ShowContentPortlet" screenLocation="component://content/widget/content/ContentScreens.xml"
+        editFormName="EditShowContentPortlet" editFormLocation="component://content/widget/content/ContentForms.xml"/>
+    <PortletPortletCategory portalPortletId="showContent" portletCategoryId="CONTENT"/>
+
+</entity-engine-xml>
\ No newline at end of file

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

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

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

Modified: ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml?rev=1828817&r1=1828816&r2=1828817&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml Tue Apr 10 13:36:51 2018
@@ -29,6 +29,7 @@ under the License.
 
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHttpErrorData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentPortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml?rev=1828817&r1=1828816&r2=1828817&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml Tue Apr 10 13:36:51 2018
@@ -2101,16 +2101,4 @@ mimeTypeId="text/html" createdDate="2004
     <Content contentId="NOTEXTFOUND" contentTypeId="DOCUMENT" ownerContentId="" dataResourceId="NOTEXTFOUND" contentName="No Text Found" description="No Text Found"
 createdDate="2004-08-06 11:40:15.818"/>
 
-    <!-- content help data -->
-    <Content contentId="HELP_MYPORTAL"/><!--  portlets are in most components -->
-    <Content contentId="HELP_ROOT"/><!-- should be in the first application loaded -->
-    <!-- content protlet data -->
-    <PortletCategory portletCategoryId="CONTENT" description="CMS Portlets"/>
-
-    <PortalPortlet portalPortletId="showContent"
-        portletName="Show Content" description="Shows a content in a Portal page"
-        screenName="ShowContentPortlet" screenLocation="component://content/widget/content/ContentScreens.xml"
-        editFormName="EditShowContentPortlet" editFormLocation="component://content/widget/content/ContentForms.xml"/>
-    <PortletPortletCategory portalPortletId="showContent" portletCategoryId="CONTENT"/>
-
 </entity-engine-xml>
\ No newline at end of file

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml?rev=1828817&r1=1828816&r2=1828817&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml Tue Apr 10 13:36:51 2018
@@ -471,150 +471,4 @@ under the License.
     <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="PARTYMGR_ADMIN"/>
     <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="SECURITY_ADMIN"/>
 
-    <!-- party portlet data -->
-    <PortletCategory portletCategoryId="PARTY_PROFILE" description="Profiles"/>
-    <PortalPortlet portalPortletId="party"
-        portletName="Party Info"
-        screenName="Party"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="General information about a person or party group"
-        screenshot="/images/portlets/party.png"/>
-    <PortletPortletCategory portalPortletId="party" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="Attributes" portletName="Attributes"
-        screenName="Attributes"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Attributes of a party"
-        screenshot="/images/portlets/Attributes.png"/>
-    <PortletPortletCategory portalPortletId="Attributes" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="PartyIdentifications" portletName="Party Identification"
-        screenName="PartyIdentifications"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Identification associate to a party"
-        screenshot=""/>
-    <PortletPortletCategory portalPortletId="PartyIdentifications" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings"
-        screenName="AvsSettings"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Avs Settings of a party"
-        screenshot="/images/portlets/AvsSettings.png"/>
-    <PortletPortletCategory portalPortletId="AvsSettings" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="Content" portletName="Content"
-        screenName="Content"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Attached Content of a party"
-        screenshot="/images/portlets/Content.png"/>
-    <PortletPortletCategory portalPortletId="Content" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="LoyaltyPoints" portletName="Loyalty Points"
-        screenName="LoyaltyPoints"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Loyalty Points of a party"
-        screenshot="/images/portlets/LoyaltyPoints.png"/>
-    <PortletPortletCategory portalPortletId="LoyaltyPoints" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="MYTASKSPARTY" portletName="My Tasks From Party"
-        screenName="mytasks"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Assigned Tasks of a party"
-        screenshot="/images/portlets/MYTASKSPARTY.png"/>
-    <PortletPortletCategory portalPortletId="MYTASKSPARTY" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="Notes" portletName="Notes"
-        screenName="Notes"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Notes of a party"
-        screenshot="/images/portlets/Notes.png"/>
-    <PortletPortletCategory portalPortletId="Notes" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="PaymentMethods" portletName="Payment Methods"
-        screenName="PaymentMethods"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="PaymentMethods of a party"
-        screenshot="/images/portlets/PaymentMethods.png"/>
-    <PortletPortletCategory portalPortletId="PaymentMethods" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="ShipperAccount" portletName="Shipper Account"
-        screenName="ShipperAccount"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Shipper Accounts of a party"
-        screenshot="/images/portlets/ShipperAccount.png"/>
-    <PortletPortletCategory portalPortletId="ShipperAccount" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="UserLogin" portletName="User Login"
-        screenName="UserLogin"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="User Logins of a party"
-        screenshot="/images/portlets/UserLogin.png"/>
-    <PortletPortletCategory portalPortletId="UserLogin" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="Visits" portletName="Visits"
-        screenName="Visits"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Visits of a certain party"
-        screenshot="/images/portlets/Visits.png"/>
-    <PortletPortletCategory portalPortletId="Visits" portletCategoryId="PARTY_PROFILE"/>
-    
-    <PortalPortlet portalPortletId="ProductStores" portletName="ProductStores"
-        screenName="ProductStores"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="ProductStores of a certain party"/>
-    <PortletPortletCategory portalPortletId="ProductStores" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="contact" portletName="Contact"
-        screenName="Contact"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="contact methods of a party"
-        screenshot="/images/portlets/contact.png"/>
-    <PortletPortletCategory portalPortletId="contact" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="partyRelContacts" portletName="Account Related Contacts"
-        screenName="partyRelContacts"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Related contacts of an account"/>
-    <PortletPortletCategory portalPortletId="partyRelContacts" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="partyRelAccounts" portletName="Contact Related Accounts"
-        screenName="partyRelAccounts"
-        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
-        description="Related accounts of an contact"/>
-    <PortletPortletCategory portalPortletId="partyRelAccounts" portletCategoryId="PARTY_PROFILE"/>
-
-    <PortalPortlet portalPortletId="partyLoggedIn" portletName="List all logged in users"
-        screenName="LoggedInUsersScreen"
-        screenLocation="component://party/widget/partymgr/VisitScreens.xml"
-        description="A list of all logged in users"/>
-    <PortletPortletCategory portalPortletId="partyLoggedIn" portletCategoryId="PARTY_PROFILE"/>
-
-    <!-- communications -->
-    <PortletCategory portletCategoryId="COMMUNICATIONS" description="Communication(s)"/>
-    <PortalPortlet portalPortletId="MyCommunications" portletName="My Communications"  description="IN and outgoing Communication list of a party"
-        screenName="MyCommunicationEvents"
-        screenLocation="component://party/widget/partymgr/CommunicationEventScreens.xml"
-        editFormName="EditCommPortletParams" editFormLocation="component://party/widget/partymgr/CommunicationEventForms.xml"
-        screenshot="/images/portlets/MyCommunications.png"/>
-    <PortletPortletCategory portalPortletId="MyCommunications" portletCategoryId="COMMUNICATIONS"/>
-
-    <PortalPage portalPageId="PartyProfile" sequenceNum="0" portalPageName="Parties" description="Party profile page using flexible Portal technology" ownerUserLoginId="_NA_"/>
-    <PortalPageColumn portalPageId="PartyProfile" columnSeqId="00001" columnWidthPercentage="50"/>
-    <PortalPageColumn portalPageId="PartyProfile" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available -->
-
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="partyRelContacts" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="partyRelAccounts" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="3"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="5"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="PartyIdentifications" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="1"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="2"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00002" sequenceNum="3"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="4"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" sequenceNum="6"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="ProductStores" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
-
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml?rev=1828817&r1=1828816&r2=1828817&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml Tue Apr 10 13:36:51 2018
@@ -202,23 +202,6 @@ under the License.
     <ContactMechTypePurpose contactMechPurposeTypeId="ICAL_URL" contactMechTypeId="LDAP_ADDRESS"/>
     <ContactMechTypePurpose contactMechPurposeTypeId="ICAL_URL" contactMechTypeId="WEB_ADDRESS"/>
 
-    <PortletCategory portletCategoryId="EVENTSTASKS" description="Events and Tasks"/>
-    
-    <PortalPortlet portalPortletId="Calendar"
-        portletName="Event Calendar"
-        screenName="Calendar"
-        screenLocation="component://workeffort/widget/CalendarScreens.xml"
-        description="My Calendar"
-        editFormName="EditCalendar"
-        editFormLocation="component://workeffort/widget/CalendarForms.xml"
-        screenshot="/images/portlets/Calendar.png"/>
-    <PortletPortletCategory portalPortletId="Calendar" portletCategoryId="EVENTSTASKS"/>
-    <DataResource dataResourceId="HELP_Calendar" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
-      objectInfo="applications/workeffort/data/helpdata/HELP_PORTLET_CALENDAR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_Calendar" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_Calendar" statusId="CTNT_IN_PROGRESS" 
-        contentName="Help portlet Calendar" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_MYPORTAL" contentIdTo="HELP_Calendar" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
-
     <!-- Work Effort security -->
     <SecurityPermission description="View operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_VIEW"/>
     <SecurityPermission description="Create operations in the Work Effort Manager." permissionId="WORKEFFORTMGR_CREATE"/>

Added: ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml?rev=1828817&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml (added)
+++ ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml Tue Apr 10 13:36:51 2018
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+
+    <!-- party portlet data -->
+    <PortletCategory portletCategoryId="PARTY_PROFILE" description="Profiles"/>
+    <PortalPortlet portalPortletId="party"
+        portletName="Party Info"
+        screenName="Party"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="General information about a person or party group"
+        screenshot="/images/portlets/party.png"/>
+    <PortletPortletCategory portalPortletId="party" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="Attributes" portletName="Attributes"
+        screenName="Attributes"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Attributes of a party"
+        screenshot="/images/portlets/Attributes.png"/>
+    <PortletPortletCategory portalPortletId="Attributes" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="PartyIdentifications" portletName="Party Identification"
+        screenName="PartyIdentifications"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Identification associate to a party"
+        screenshot=""/>
+    <PortletPortletCategory portalPortletId="PartyIdentifications" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings"
+        screenName="AvsSettings"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Avs Settings of a party"
+        screenshot="/images/portlets/AvsSettings.png"/>
+    <PortletPortletCategory portalPortletId="AvsSettings" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="Content" portletName="Content"
+        screenName="Content"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Attached Content of a party"
+        screenshot="/images/portlets/Content.png"/>
+    <PortletPortletCategory portalPortletId="Content" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="LoyaltyPoints" portletName="Loyalty Points"
+        screenName="LoyaltyPoints"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Loyalty Points of a party"
+        screenshot="/images/portlets/LoyaltyPoints.png"/>
+    <PortletPortletCategory portalPortletId="LoyaltyPoints" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="MYTASKSPARTY" portletName="My Tasks From Party"
+        screenName="mytasks"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Assigned Tasks of a party"
+        screenshot="/images/portlets/MYTASKSPARTY.png"/>
+    <PortletPortletCategory portalPortletId="MYTASKSPARTY" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="Notes" portletName="Notes"
+        screenName="Notes"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Notes of a party"
+        screenshot="/images/portlets/Notes.png"/>
+    <PortletPortletCategory portalPortletId="Notes" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="PaymentMethods" portletName="Payment Methods"
+        screenName="PaymentMethods"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="PaymentMethods of a party"
+        screenshot="/images/portlets/PaymentMethods.png"/>
+    <PortletPortletCategory portalPortletId="PaymentMethods" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="ShipperAccount" portletName="Shipper Account"
+        screenName="ShipperAccount"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Shipper Accounts of a party"
+        screenshot="/images/portlets/ShipperAccount.png"/>
+    <PortletPortletCategory portalPortletId="ShipperAccount" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="UserLogin" portletName="User Login"
+        screenName="UserLogin"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="User Logins of a party"
+        screenshot="/images/portlets/UserLogin.png"/>
+    <PortletPortletCategory portalPortletId="UserLogin" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="Visits" portletName="Visits"
+        screenName="Visits"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Visits of a certain party"
+        screenshot="/images/portlets/Visits.png"/>
+    <PortletPortletCategory portalPortletId="Visits" portletCategoryId="PARTY_PROFILE"/>
+    
+    <PortalPortlet portalPortletId="ProductStores" portletName="ProductStores"
+        screenName="ProductStores"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="ProductStores of a certain party"/>
+    <PortletPortletCategory portalPortletId="ProductStores" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="contact" portletName="Contact"
+        screenName="Contact"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="contact methods of a party"
+        screenshot="/images/portlets/contact.png"/>
+    <PortletPortletCategory portalPortletId="contact" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="partyRelContacts" portletName="Account Related Contacts"
+        screenName="partyRelContacts"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Related contacts of an account"/>
+    <PortletPortletCategory portalPortletId="partyRelContacts" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="partyRelAccounts" portletName="Contact Related Accounts"
+        screenName="partyRelAccounts"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Related accounts of an contact"/>
+    <PortletPortletCategory portalPortletId="partyRelAccounts" portletCategoryId="PARTY_PROFILE"/>
+
+    <PortalPortlet portalPortletId="partyLoggedIn" portletName="List all logged in users"
+        screenName="LoggedInUsersScreen"
+        screenLocation="component://party/widget/partymgr/VisitScreens.xml"
+        description="A list of all logged in users"/>
+    <PortletPortletCategory portalPortletId="partyLoggedIn" portletCategoryId="PARTY_PROFILE"/>
+
+    <!-- communications -->
+    <PortletCategory portletCategoryId="COMMUNICATIONS" description="Communication(s)"/>
+    <PortalPortlet portalPortletId="MyCommunications" portletName="My Communications"  description="IN and outgoing Communication list of a party"
+        screenName="MyCommunicationEvents"
+        screenLocation="component://party/widget/partymgr/CommunicationEventScreens.xml"
+        editFormName="EditCommPortletParams" editFormLocation="component://party/widget/partymgr/CommunicationEventForms.xml"
+        screenshot="/images/portlets/MyCommunications.png"/>
+    <PortletPortletCategory portalPortletId="MyCommunications" portletCategoryId="COMMUNICATIONS"/>
+
+    <PortalPage portalPageId="PartyProfile" sequenceNum="0" portalPageName="Parties" description="Party profile page using flexible Portal technology" ownerUserLoginId="_NA_"/>
+    <PortalPageColumn portalPageId="PartyProfile" columnSeqId="00001" columnWidthPercentage="50"/>
+    <PortalPageColumn portalPageId="PartyProfile" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available -->
+
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="partyRelContacts" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="partyRelAccounts" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="3"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="5"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="PartyIdentifications" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="1"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="2"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00002" sequenceNum="3"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="4"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" sequenceNum="6"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="ProductStores" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
+</entity-engine-xml>
\ No newline at end of file

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

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

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

Modified: ofbiz/ofbiz-framework/trunk/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/ofbiz-component.xml?rev=1828817&r1=1828816&r2=1828817&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/ofbiz-component.xml Tue Apr 10 13:36:51 2018
@@ -26,6 +26,7 @@ under the License.
 
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyPortletData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_agreement.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_communication.xml"/>

Added: ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortPortletData.xml?rev=1828817&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortPortletData.xml (added)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortPortletData.xml Tue Apr 10 13:36:51 2018
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<entity-engine-xml>
+    <PortletCategory portletCategoryId="EVENTSTASKS" description="Events and Tasks"/>
+    
+    <PortalPortlet portalPortletId="Calendar"
+        portletName="Event Calendar"
+        screenName="Calendar"
+        screenLocation="component://workeffort/widget/CalendarScreens.xml"
+        description="My Calendar"
+        editFormName="EditCalendar"
+        editFormLocation="component://workeffort/widget/CalendarForms.xml"
+        screenshot="/images/portlets/Calendar.png"/>
+    <PortletPortletCategory portalPortletId="Calendar" portletCategoryId="EVENTSTASKS"/>
+    <DataResource dataResourceId="HELP_Calendar" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+      objectInfo="applications/workeffort/data/helpdata/HELP_PORTLET_CALENDAR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="HELP_Calendar" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_Calendar" statusId="CTNT_IN_PROGRESS" 
+        contentName="Help portlet Calendar" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_MYPORTAL" contentIdTo="HELP_Calendar" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
+    
+    
+
+</entity-engine-xml>

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

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

Propchange: ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortPortletData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/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=1828817&r1=1828816&r2=1828817&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml Tue Apr 10 13:36:51 2018
@@ -28,6 +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="seed" loader="main" location="data/WorkEffortPortletData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/>