[ofbiz-framework] branch trunk updated: Documented: migration to help system using asciidoc files (OFBIZ-11587)

[holivier]

This is an automated email from the ASF dual-hosted git repository.

holivier 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 4a41f0f  Documented: migration to help system using asciidoc files (OFBIZ-11587)
4a41f0f is described below

commit 4a41f0fde5a2a2a988caef4cd5a899bcdc84c799
Author: holivier <[hidden email]>
AuthorDate: Tue Oct 27 11:20:09 2020 +0100

    Documented: migration to help system using asciidoc files (OFBIZ-11587)
   
    commit correction for <Remove all related help docbook files>
    * reAdd a contentDocData for main contentId and portletCategory
    * remove from ofbiz-component of each application line about helpData which are removed
---
 applications/accounting/ofbiz-component.xml        |  1 -
 applications/commonext/ofbiz-component.xml         |  1 -
 applications/content/data/ContentDocData.xml       | 27 ++++++++++++++++++++++
 applications/content/ofbiz-component.xml           |  4 +---
 applications/humanres/ofbiz-component.xml          |  1 -
 applications/manufacturing/ofbiz-component.xml     |  2 --
 applications/marketing/ofbiz-component.xml         |  3 +--
 applications/order/ofbiz-component.xml             |  5 ++--
 applications/product/ofbiz-component.xml           |  3 +--
 .../workeffort/data/WorkEffortPortletData.xml      |  9 +-------
 10 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/applications/accounting/ofbiz-component.xml b/applications/accounting/ofbiz-component.xml
index 31692c8..ced2e50 100644
--- a/applications/accounting/ofbiz-component.xml
+++ b/applications/accounting/ofbiz-component.xml
@@ -26,7 +26,6 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_reports.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/AccountingScheduledServiceData.xml"/>
diff --git a/applications/commonext/ofbiz-component.xml b/applications/commonext/ofbiz-component.xml
index 60c7bbc..4593c9a 100644
--- a/applications/commonext/ofbiz-component.xml
+++ b/applications/commonext/ofbiz-component.xml
@@ -25,7 +25,6 @@ under the License.
     <classpath type="dir" location="config"/>
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityPermissionSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityPermissionSeedData.xml"/>
diff --git a/applications/content/data/ContentDocData.xml b/applications/content/data/ContentDocData.xml
new file mode 100644
index 0000000..bb9f5af
--- /dev/null
+++ b/applications/content/data/ContentDocData.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<entity-engine-xml>
+    <Content contentId="DOCUMENTS" contentTypeId="DOCUMENT" contentName="Documents"/>
+    <PortletCategory portletCategoryId="REPORT" description="Reports"/>
+
+    <!-- system document root used in content -> navigate -->
+    <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT"/>
+    <ContentAssoc contentId="TREE_ROOT" contentIdTo="DOCUMENTS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
+</entity-engine-xml>
\ No newline at end of file
diff --git a/applications/content/ofbiz-component.xml b/applications/content/ofbiz-component.xml
index 03d7cf8..1a19a78 100644
--- a/applications/content/ofbiz-component.xml
+++ b/applications/content/ofbiz-component.xml
@@ -26,11 +26,9 @@ 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/ContentHelpData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentDocData.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"/>
     <service-resource type="model" loader="main" location="servicedef/services_content.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_contenttypes.xml"/>
diff --git a/applications/humanres/ofbiz-component.xml b/applications/humanres/ofbiz-component.xml
index 9526ef5..1c291c5 100644
--- a/applications/humanres/ofbiz-component.xml
+++ b/applications/humanres/ofbiz-component.xml
@@ -24,7 +24,6 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResPortletData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
diff --git a/applications/manufacturing/ofbiz-component.xml b/applications/manufacturing/ofbiz-component.xml
index 737d5b3..5568447 100644
--- a/applications/manufacturing/ofbiz-component.xml
+++ b/applications/manufacturing/ofbiz-component.xml
@@ -29,8 +29,6 @@ under the License.
 
     <!-- entity resources: model(s), eca(s) and group definitions -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityPermissionSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/>
     <!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>-->
 
     <!-- service resources: model(s) [definitions], eca(s) and group definitions -->
diff --git a/applications/marketing/ofbiz-component.xml b/applications/marketing/ofbiz-component.xml
index b5cdcea..9151748 100644
--- a/applications/marketing/ofbiz-component.xml
+++ b/applications/marketing/ofbiz-component.xml
@@ -23,9 +23,8 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
-    
+
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityPermissionSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
diff --git a/applications/order/ofbiz-component.xml b/applications/order/ofbiz-component.xml
index 7222034..1cad626 100644
--- a/applications/order/ofbiz-component.xml
+++ b/applications/order/ofbiz-component.xml
@@ -26,12 +26,11 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
-    
+
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityPermissionSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderHelpData.xml"/>
-    
+
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderSystemPropertyData.xml"/>
 
diff --git a/applications/product/ofbiz-component.xml b/applications/product/ofbiz-component.xml
index bd9870c..0ed83be 100644
--- a/applications/product/ofbiz-component.xml
+++ b/applications/product/ofbiz-component.xml
@@ -26,8 +26,7 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
-    
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/>
+
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/FacilitySecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/>
diff --git a/applications/workeffort/data/WorkEffortPortletData.xml b/applications/workeffort/data/WorkEffortPortletData.xml
index ab41475..2cc2ea8 100644
--- a/applications/workeffort/data/WorkEffortPortletData.xml
+++ b/applications/workeffort/data/WorkEffortPortletData.xml
@@ -19,7 +19,7 @@
 -->
 <entity-engine-xml>
     <PortletCategory portletCategoryId="EVENTSTASKS" description="Events and Tasks"/>
-    
+
     <PortalPortlet portalPortletId="Calendar"
         portletName="Event Calendar"
         screenName="Calendar"
@@ -29,12 +29,5 @@
         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>