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 2017/10/30 05:33:33 UTC

svn commit: r1813724 [1/6] - in /ofbiz/ofbiz-framework/trunk/applications: content/ content/data/ datamodel/ datamodel/data/seed/ party/ party/data/ securityext/ securityext/data/ workeffort/ workeffort/data/

Author: rishi
Date: Mon Oct 30 05:33:32 2017
New Revision: 1813724

URL: http://svn.apache.org/viewvc?rev=1813724&view=rev
Log:
Improvement: Move all data in applications to the datamodel component. Moved seed and seed-initial data from party, content, security ext and work effort component. Left with few data changes which can be moved to some plugins or confusing. Will share the data over community and proceed accordingly once base effort is complete. Thanks Sourabh Jain, Saurabh Dixit and Prakhar Kumar for your contribution.
OFBIZ-9501

Modified:
    ofbiz/ofbiz-framework/trunk/applications/content/data/BlogSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHttpErrorData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentOperationData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentPortletData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/DataCategoryData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/MimeTypeData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/MimeTypeTemplate.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/MiscData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/PartyHelpData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/TemplateData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/WebtoolsHelpData.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/datamodel/ofbiz-component.xml
    ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml
    ofbiz/ofbiz-framework/trunk/applications/party/data/PartySecurityPermissionSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/party/data/PartyTypeData.xml
    ofbiz/ofbiz-framework/trunk/applications/party/data/ScheduledJobs.xml
    ofbiz/ofbiz-framework/trunk/applications/party/ofbiz-component.xml
    ofbiz/ofbiz-framework/trunk/applications/securityext/data/SecurityPermissionSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/securityext/ofbiz-component.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortPortletData.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSystemPropertyData.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/BlogSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/BlogSeedData.xml?rev=1813724&r1=1813723&r2=1813724&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/BlogSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/BlogSeedData.xml Mon Oct 30 05:33:32 2017
@@ -20,23 +20,4 @@ under the License.
 
 <entity-engine-xml>
 
-<Content contentId="BLOGROOT" contentTypeId="WEB_SITE_PUB_PT"
-    ownerContentId=""
-    contentName="Blog Root"
-    description="Blog Root"
-    childBranchCount="1"
-    childLeafCount="1"/>
-
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_ADMIN" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_CREATE" roleTypeId="_NA_" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-
-    <DataResource dataResourceId="BLOG_TPL_TOPLEFT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Float left" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#FloatLeft"/>
-    <DataResource dataResourceId="BLOG_TPL_TOPCENTER" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Top centered" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#TopCenter"/>
-
-    <DataResource dataResourceId="ECOM_BLANK" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Plain Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonEmptyDecorator"/>
-    <DataResource dataResourceId="ECOM_LEFT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftDecorator"/>
-    <DataResource dataResourceId="ECOM_RIGHT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonRightDecorator"/>
-    <DataResource dataResourceId="ECOM_LEFTRIGHT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left/Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftRightDecorator"/>
-
 </entity-engine-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=1813724&r1=1813723&r2=1813724&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml Mon Oct 30 05:33:32 2017
@@ -18,48 +18,4 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-
-    <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 -->
-
-    <Content contentId="DOCUMENTS" contentTypeId="DOCUMENT" contentName="Documents"/>
-
-    <!-- system document root used in content -> navigate -->
-    <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT" dataResourceId=""/>
-    <ContentAssoc contentId="TREE_ROOT" contentIdTo="DOCUMENTS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
-
-    <!-- show help on the system document root -->
-    <ContentAssoc contentId="TREE_ROOT" contentIdTo="HELP_ROOT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
-    <DataResource dataResourceId="HELP_ROOT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_ROOT" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Help system root" mimeTypeId="text/html"/>
-    <DataResource dataResourceId="HELP_ROOT_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
-
-    <!-- how to create alternative locales -->
-    <DataResource dataResourceId="HELP_ROOT_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_ROOT_NL" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_NL" localeString="nl" statusId="CTNT_IN_PROGRESS" contentName="Help system root in dutch" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/>
-
-    <DataResource dataResourceId="HELP_ROOT_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_ROOT_FR" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_FR" localeString="fr" statusId="CTNT_IN_PROGRESS" contentName="Help system root in french" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/>
-
-    <DataResource dataResourceId="HELP_ROOT_IT" localeString="it" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_IT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Radice Guida on-line" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_ROOT_IT" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_IT" localeString="it" statusId="CTNT_IN_PROGRESS" contentName="Help system root in Italian" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_IT" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/>
-
-    <!-- Content specific -->
-    <DataResource dataResourceId="HELP_CONTENT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Content Manager" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_CONTENT" contentTypeId="DOCUMENT" contentName="Content Manager" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_CONTENT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_CONTENT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="050"/>
-
-    <DataResource dataResourceId="HELP_CONTENT_IT" localeString="it" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT_IT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Guida sul gestore di contentui (CMS)" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_CONTENT_IT" contentTypeId="DOCUMENT" contentName="Guida gestore contenuti" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_CONTENT_IT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_CONTENT" contentIdTo="HELP_CONTENT_IT" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/>
-    
-    <DataResource dataResourceId="CONTENT_SITE_FindWeb" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="CONTENT_SITE_FindWeb" contentTypeId="DOCUMENT" contentName="Content Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="CONTENT_SITE_FindWeb" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_CONTENT" contentIdTo="CONTENT_SITE_FindWeb" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="CONTENT_FindWebSite"/>
-
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHttpErrorData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHttpErrorData.xml?rev=1813724&r1=1813723&r2=1813724&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHttpErrorData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHttpErrorData.xml Mon Oct 30 05:33:32 2017
@@ -18,31 +18,4 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <Content contentId="CONTENT_ERROR" contentTypeId="DOCUMENT" contentName="Generic CMS Error Pages"/>
-    <ContentAssoc contentId="TREE_ROOT" contentIdTo="CONTENT_ERROR" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
-    <DataResource dataResourceId="CONTENT_ERROR_403" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL"/>
-    <ElectronicText dataResourceId="CONTENT_ERROR_403">
-        <textData><![CDATA[<html><head><title>Access Forbidden</title></head><body>${statusCode?if_exists} Forbidden</body></html>]]></textData>
-    </ElectronicText>
-    <Content contentId="CONTENT_ERROR_403" contentTypeId="DOCUMENT" contentName="Generic CMS 403 Access Forbidden" dataResourceId="CONTENT_ERROR_403"/>
-    <DataResource dataResourceId="CONTENT_ERROR_404" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL"/>
-    <ElectronicText dataResourceId="CONTENT_ERROR_404">
-        <textData><![CDATA[<html><head><title>Page not found</title></head><body>${statusCode?if_exists} Not Found</body></html>]]></textData>
-    </ElectronicText>
-    <ContentAssoc contentId="CONTENT_ERROR" contentIdTo="CONTENT_ERROR_403" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>
-    <Content contentId="CONTENT_ERROR_404" contentTypeId="DOCUMENT" contentName="Generic CMS 404 Page Not Found" dataResourceId="CONTENT_ERROR_404"/>
-    <ContentAssoc contentId="CONTENT_ERROR" contentIdTo="CONTENT_ERROR_404" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>
-    <DataResource dataResourceId="CONTENT_ERROR_404_FR" dataResourceTypeId="ELECTRONIC_TEXT" localeString="fr_FR" dataTemplateTypeId="FTL"/>
-    <ElectronicText dataResourceId="CONTENT_ERROR_404_FR">
-        <textData><![CDATA[<html><head><title>Page inconnue</title></head><body>${statusCode?if_exists} Page Inconnue</body></html>]]></textData>
-    </ElectronicText>
-    <Content contentId="CONTENT_ERROR_404_FR" contentTypeId="DOCUMENT" contentName="Page 404 inconnue générique" dataResourceId="CONTENT_ERROR_404_FR" localeString="fr_FR"/>
-    <ContentAssoc contentId="CONTENT_ERROR" contentIdTo="CONTENT_ERROR_404_FR" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>
-    <ContentAssoc contentId="CONTENT_ERROR_404" contentIdTo="CONTENT_ERROR_404_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2001-01-01 00:00:00"/>
-    <DataResource dataResourceId="CONTENT_ERROR_410" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL"/>
-    <ElectronicText dataResourceId="CONTENT_ERROR_410">
-        <textData><![CDATA[<html><head><title>Page is gone</title></head><body>${statusCode?if_exists} Page is gone</body></html>]]></textData>
-    </ElectronicText>
-    <Content contentId="CONTENT_ERROR_410" contentTypeId="DOCUMENT" contentName="Generic CMS 410 Page Is Gone" dataResourceId="CONTENT_ERROR_410"/>
-    <ContentAssoc contentId="CONTENT_ERROR" contentIdTo="CONTENT_ERROR_410" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/ContentOperationData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/ContentOperationData.xml?rev=1813724&r1=1813723&r2=1813724&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentOperationData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentOperationData.xml Mon Oct 30 05:33:32 2017
@@ -18,110 +18,4 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <ContentOperation contentOperationId="CONTENT_ADMIN" description="Content Admin"/>
-    <ContentOperation contentOperationId="CONTENT_CREATE" description="Content Create"/>
-    <ContentOperation contentOperationId="CONTENT_UPDATE" description="Content Update"/>
-    <ContentOperation contentOperationId="CONTENT_DELETE" description="Content Delete"/>
-    <ContentOperation contentOperationId="CONTENT_VIEW" description="Content View"/>
-    <ContentOperation contentOperationId="CONTENT_PUBLISH" description="Content Publish"/>
-    <ContentOperation contentOperationId="CONTENT_RESPOND" description="Content Respond"/>
-    <ContentOperation contentOperationId="CONTENT_PUBLISH_SELF" description="Content Publish"/>
-    <ContentOperation contentOperationId="_NA_" description="Not Applicable"/>
-    <ContentOperation contentOperationId="HAS_OWNER_ROLE" description="Has User Role"/>
-    <ContentOperation contentOperationId="HAS_USER_ROLE" description="Has User Role"/>
-    <ContentOperation contentOperationId="HAS_AUTHOR_ROLE" description="Has Author Role"/>
-    <ContentOperation contentOperationId="HAS_EDITOR_ROLE" description="Has Editor Role"/>
-    <ContentOperation contentOperationId="HAS_ADMIN_ROLE" description="Has Admin Role"/>
-    <ContentOperation contentOperationId="HAS_PUBLISHER_ROLE" description="Has Publisher Role"/>
-    <ContentOperation contentOperationId="CONTENT_CREATE_SUB" description="Create SubContent"/>
-    <ContentOperation contentOperationId="CONTENT_VIEW_SHORT" description="View Short Desc"/>
-    <ContentOperation contentOperationId="CHILD_CREATE" description="Child Create"/>
-    <ContentOperation contentOperationId="CHILD_UPDATE" description="Child Update"/>
-    <ContentOperation contentOperationId="CHILD_DELETE" description="Child Delete"/>
-    <ContentOperation contentOperationId="CHILD_VIEW" description="Child View"/>
-    <ContentOperation contentOperationId="CONTENT_LINK" description="Content Link"/>
-    <ContentOperation contentOperationId="CONTENT_LINK_TO" description="Content Link To"/>
-    <ContentOperation contentOperationId="CONTENT_LINK_FROM" description="Content Link From"/>
-
-    <!-- These ContentTypes are primarily for structuring documents or content -->
-    <ContentPurposeType contentPurposeTypeId="ARTICLE" description="Article"/>
-    <ContentPurposeType contentPurposeTypeId="MESSAGE" description="Message"/>
-    <ContentPurposeType contentPurposeTypeId="FEEDBACK" description="Feedback"/>
-    <ContentPurposeType contentPurposeTypeId="COMMENT" description="Comment"/>
-    <ContentPurposeType contentPurposeTypeId="PRODUCT_INFO" description="Product Info"/>
-    <ContentPurposeType contentPurposeTypeId="PROJECT_INFO" description="Project Info"/>
-    <ContentPurposeType contentPurposeTypeId="COMPANY_INFO" description="Company Info"/>
-    <ContentPurposeType contentPurposeTypeId="ADVERTISEMENT" description="Advertisement"/>
-    <ContentPurposeType contentPurposeTypeId="GENERAL_INFO" description="General Info"/>
-    <ContentPurposeType contentPurposeTypeId="LEGAL_INFO" description="Legal Info"/>
-
-    <ContentPurposeType contentPurposeTypeId="DESCRIPTION" description="Description"/>
-    <ContentPurposeType contentPurposeTypeId="OWNER" description="Owner"/>
-    <ContentPurposeType contentPurposeTypeId="ARTICLE" description="Article"/>
-    <ContentPurposeType contentPurposeTypeId="RESPONSE" description="Response"/>
-    <ContentPurposeType contentPurposeTypeId="_NA_" description="Not Applicable"/>
-    <ContentPurposeType contentPurposeTypeId="SECTION" description="Section"/>
-    <ContentPurposeType contentPurposeTypeId="TOPIC" description="Topic"/>
-    <ContentPurposeType contentPurposeTypeId="SUMMARY" description="Summary"/>
-    <ContentPurposeType contentPurposeTypeId="MAIN_ARTICLE" description="Main Content"/>
-    <ContentPurposeType contentPurposeTypeId="SUB_ARTICLE" description="Sub Content"/>
-    <ContentPurposeType contentPurposeTypeId="USER" description="User"/>
-    <ContentPurposeType contentPurposeTypeId="FAQ" description="FAQ"/>
-    <ContentPurposeType contentPurposeTypeId="SOURCE" description="General Source"/>
-    <ContentPurposeType contentPurposeTypeId="LANDING_PAGE_IMAGE" description="Landing Page Image"/>
-
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_CREATE" roleTypeId="CONTENT_AUTHOR" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_CREATE" roleTypeId="CONTENT_AUTHOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_CREATE" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_CREATE_SUB" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_AUTHOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_UPDATE" roleTypeId="OWNER" statusId="CTNT_INITIAL_DRAFT" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_PUBLISH" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_PUBLISH" roleTypeId="CONTENT_PUBLISHER" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_PUBLISH" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_PUBLISH_SELF" roleTypeId="CONTENT_AUTHOR" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_RESPOND" roleTypeId="CONTENT_USER" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_VIEW" roleTypeId="CONTENT_AUTHOR" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_VIEW" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_VIEW" roleTypeId="OWNER" statusId="CTNT_INITIAL_DRAFT" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_LINK_FROM" roleTypeId="_NA_" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="ARTICLE" contentOperationId="CONTENT_LINK_TO" roleTypeId="_NA_" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_CREATE" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_UPDATE" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_PUBLISH" roleTypeId="CONTENT_PUBLISHER" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_PUBLISH" roleTypeId="CONTENT_USER" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_RESPOND" roleTypeId="CONTENT_USER" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_LINK_FROM" roleTypeId="_NA_" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_LINK_TO" roleTypeId="_NA_" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_AUTHOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_UPDATE" roleTypeId="OWNER" statusId="CTNT_INITIAL_DRAFT" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_PUBLISH" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_PUBLISH" roleTypeId="CONTENT_PUBLISHER" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_PUBLISH" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_VIEW" roleTypeId="CONTENT_AUTHOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_VIEW" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_VIEW" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="SECTION" contentOperationId="CONTENT_VIEW" roleTypeId="_NA_" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-
-    <ContentPurposeOperation contentPurposeTypeId="USER" contentOperationId="CONTENT_UPDATE" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="HAS_OWNER_ROLE" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="HAS_USER_ROLE" roleTypeId="CONTENT_USER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="HAS_AUTHOR_ROLE" roleTypeId="CONTENT_AUTHOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="HAS_EDITOR_ROLE" roleTypeId="CONTENT_EDITOR" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="HAS_ADMIN_ROLE" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="HAS_PUBLISHER_ROLE" roleTypeId="CONTENT_PUBLISHER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_PUBLISH" roleTypeId="CONTENT_PUBLISHER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_VIEW" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_VIEW" roleTypeId="CONTENT_USER" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_LINK_TO" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_LINK_FROM" roleTypeId="OWNER" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_LINK_TO" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_LINK_FROM" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
-    <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="_NA_" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/>
 </entity-engine-xml>

Modified: 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=1813724&r1=1813723&r2=1813724&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentPortletData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentPortletData.xml Mon Oct 30 05:33:32 2017
@@ -18,11 +18,4 @@
     under the License.
 -->
 <entity-engine-xml>
-    <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>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml?rev=1813724&r1=1813723&r2=1813724&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml Mon Oct 30 05:33:32 2017
@@ -18,23 +18,4 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <!-- Content Manager security -->
-    <SecurityPermission description="View operations in the Content Manager." permissionId="CONTENTMGR_VIEW"/>
-    <SecurityPermission description="Create operations in the Content Manager." permissionId="CONTENTMGR_CREATE"/>
-    <SecurityPermission description="Update operations in the Content Manager." permissionId="CONTENTMGR_UPDATE"/>
-    <SecurityPermission description="Delete operations in the Content Manager." permissionId="CONTENTMGR_DELETE"/>
-    <SecurityPermission description="ALL operations in the Content Manager." permissionId="CONTENTMGR_ADMIN"/>
-
-    <!-- Content ROLE security -->
-    <SecurityPermission description="Limited View operations in the Content Manager." permissionId="CONTENTMGR_ROLE_VIEW"/>
-    <SecurityPermission description="Limited Create operations in the Content Manager." permissionId="CONTENTMGR_ROLE_CREATE"/>
-    <SecurityPermission description="Limited Update operations in the Content Manager." permissionId="CONTENTMGR_ROLE_UPDATE"/>
-    <SecurityPermission description="Limited Delete operations in the Content Manager." permissionId="CONTENTMGR_ROLE_DELETE"/>
-
-    <!-- Control Applet security -->
-    <SecurityPermission description="Send to the Control Applet." permissionId="SEND_CONTROL_APPLET"/>
-    
-    <!-- add admin to SUPER permission group -->
-    <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="CONTENTMGR_ADMIN"/>
-    <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="SEND_CONTROL_APPLET"/>
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml?rev=1813724&r1=1813723&r2=1813724&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml Mon Oct 30 05:33:32 2017
@@ -18,133 +18,5 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <RoleType description="Logged In" hasTable="N"  parentTypeId="" roleTypeId="LOGGEDIN"/>
-    <RoleType roleTypeId="CONTENT" hasTable="N" description="Content Member"/>
-    <RoleType roleTypeId="CONTENT_ADMIN" parentTypeId="CONTENT" hasTable="N" description="Content Administrator"/>
-    <RoleType roleTypeId="CONTENT_PUBLISHER" parentTypeId="CONTENT" hasTable="N" description="Content Publisher"/>
-    <RoleType roleTypeId="CONTENT_EDITOR" parentTypeId="CONTENT" hasTable="N" description="Content Editor"/>
-    <RoleType roleTypeId="CONTENT_AUTHOR" parentTypeId="CONTENT" hasTable="N" description="Content Author"/>
-    <RoleType roleTypeId="CONTENT_USER" parentTypeId="CONTENT" hasTable="N" description="Content User"/>
-    <RoleType roleTypeId="CONTENT_GUEST" parentTypeId="CONTENT" hasTable="N" description="Content Guest"/>
-
-    <StatusType description="Content Approval Status" hasTable="N" parentTypeId="" statusTypeId="CNTNTAPPR_STATUS"/>
-    <StatusItem description="Not Ready for Approval" sequenceId="01" statusCode="NOT_READY" statusId="CNTAP_NOT_READY" statusTypeId="CNTNTAPPR_STATUS"/>
-    <StatusItem description="Ready for Approval" sequenceId="02" statusCode="READY" statusId="CNTAP_READY" statusTypeId="CNTNTAPPR_STATUS"/>
-    <StatusItem description="Approval In Process" sequenceId="03" statusCode="IN_PROCESS" statusId="CNTAP_IN_PROCESS" statusTypeId="CNTNTAPPR_STATUS"/>
-    <StatusItem description="Soft Rejected" sequenceId="11" statusCode="SOFT_REJ" statusId="CNTAP_SOFT_REJ" statusTypeId="CNTNTAPPR_STATUS"/>
-    <StatusItem description="Rejected" sequenceId="12" statusCode="REJECTED" statusId="CNTAP_REJECTED" statusTypeId="CNTNTAPPR_STATUS"/>
-    <StatusItem description="Approved" sequenceId="21" statusCode="APPROVED" statusId="CNTAP_APPROVED" statusTypeId="CNTNTAPPR_STATUS"/>
-
-    <Content contentId="TEMPLATE_MASTER" contentTypeId="TREE_ROOT" description="Template Master"/>
-
-    <EnumerationType enumTypeId="CONTENT_PRIVILEGE" description="Content Privilege"/>
-    <Enumeration enumId="CNT_PRV_NA_" enumTypeId="CONTENT_PRIVILEGE" enumCode="_NA_" sequenceId="00" description="Not Applicable"/>
-    <Enumeration enumId="CNT_PRV_BRONZE" enumTypeId="CONTENT_PRIVILEGE" enumCode="BRONZE" sequenceId="10" description="Bronze Level"/>
-    <Enumeration enumId="CNT_PRV_SILVER" enumTypeId="CONTENT_PRIVILEGE" enumCode="SILVER" sequenceId="20" description="Silver Level"/>
-    <Enumeration enumId="CNT_PRV_GOLD" enumTypeId="CONTENT_PRIVILEGE" enumCode="GOLD" sequenceId="30" description="Gold Level"/>
-
-    <EnumerationType enumTypeId="SUBSCRIPTION_TYPE" description="Subscription Level"/>
-    <Enumeration enumId="SUBSCRIBE_BRONZE" enumTypeId="SUBSCRIPTION_TYPE" enumCode="BRONZE" sequenceId="10" description="Bronze Level"/>
-    <Enumeration enumId="SUBSCRIBE_GOLD" enumTypeId="SUBSCRIPTION_TYPE" enumCode="GOLD" sequenceId="30" description="Gold Level"/>
-    <Enumeration enumId="SUBSCRIBE_SILVER" enumTypeId="SUBSCRIPTION_TYPE" enumCode="SILVER" sequenceId="20" description="Silver Level"/>
-
-    <StatusType description="Server Hit" hasTable="N" parentTypeId="" statusTypeId="SERVER_HIT_STATUS"/>
-    <StatusType description="Web Content" hasTable="N" parentTypeId="" statusTypeId="WEB_CONTENT_STATUS"/>
-
-    <StatusType description="Content" hasTable="N" parentTypeId="" statusTypeId="CONTENT_STATUS"/>
-    <StatusItem description="In Progress" sequenceId="01" statusCode="IN_PROGRESS" statusId="CTNT_IN_PROGRESS" statusTypeId="CONTENT_STATUS"/>
-    <StatusItem description="Initial Draft" sequenceId="02" statusCode="INITIAL_DRAFT" statusId="CTNT_INITIAL_DRAFT" statusTypeId="CONTENT_STATUS"/>
-    <StatusItem description="Revised Draft" sequenceId="03" statusCode="REVISED_DRAFT" statusId="CTNT_REVISED_DRAFT" statusTypeId="CONTENT_STATUS"/>
-    <StatusItem description="Final Draft" sequenceId="04" statusCode="FINAL_DRAFT" statusId="CTNT_FINAL_DRAFT" statusTypeId="CONTENT_STATUS"/>
-    <StatusItem description="Published" sequenceId="05" statusCode="PUBLISHED" statusId="CTNT_PUBLISHED" statusTypeId="CONTENT_STATUS"/>
-    <StatusItem description="Deactivated" sequenceId="99" statusCode="DEACTIVATED" statusId="CTNT_DEACTIVATED" statusTypeId="CONTENT_STATUS"/>
-    <StatusItem description="Available" sequenceId="10" statusCode="AVAILABLE" statusId="CTNT_AVAILABLE" statusTypeId="CONTENT_STATUS"/>
-
-    <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_INITIAL_DRAFT" transitionName="First draft"/>
-    <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_PUBLISHED" transitionName="Publised, not revised"/>
-    <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_AVAILABLE" transitionName="Available"/>
-    <StatusValidChange statusId="CTNT_INITIAL_DRAFT" statusIdTo="CTNT_REVISED_DRAFT" transitionName="Draft revised"/>
-    <StatusValidChange statusId="CTNT_INITIAL_DRAFT" statusIdTo="CTNT_PUBLISHED" transitionName="Initial draft Publised"/>
-    <StatusValidChange statusId="CTNT_REVISED_DRAFT" statusIdTo="CTNT_FINAL_DRAFT" transitionName="Final draft"/>
-    <StatusValidChange statusId="CTNT_REVISED_DRAFT" statusIdTo="CTNT_PUBLISHED" transitionName="Revised draft Publised"/>
-    <StatusValidChange statusId="CTNT_FINAL_DRAFT" statusIdTo="CTNT_PUBLISHED" transitionName="Final draft Published"/>
-    <StatusValidChange statusId="CTNT_PUBLISHED" statusIdTo="CTNT_DEACTIVATED" transitionName="Deactivated"/>
-    <StatusValidChange statusId="CTNT_AVAILABLE" statusIdTo="CTNT_DEACTIVATED" transitionName="Available to Deactivated"/>
-
-    <SubscriptionType description="Newsgroup" hasTable="N" parentTypeId="" subscriptionTypeId="NEWSGROUP_SUBSCR"/>
-    <SubscriptionType description="Other" hasTable="N" parentTypeId="" subscriptionTypeId="OTHER_SUBSCR"/>
-    <SubscriptionType description="Product Info" hasTable="N" parentTypeId="" subscriptionTypeId="PRODUCT_INFO_SUBSCR"/>
-
-    <!-- survey data -->
-    <SurveyApplType surveyApplTypeId="CART_ADD" description="Add-To Cart"/>
-    <SurveyApplType surveyApplTypeId="CHECK_OUT" description="Check-Out"/>
-    <SurveyApplType surveyApplTypeId="GENERAL_POLL" description="General Poll"/>
-    <SurveyApplType surveyApplTypeId="RANDOM_POLL" description="Random Poll"/>
-    <SurveyApplType surveyApplTypeId="CUSTOMER_PROFILE" description="Customer Profile"/>
-    <SurveyApplType surveyApplTypeId="SORDER_PLACE" description="Sales Order Placement"/>
-    <SurveyApplType surveyApplTypeId="PORDER_PLACE" description="Purchase Order Placement"/>
-    <SurveyApplType surveyApplTypeId="PORDITM_PLACE" description="Purchase Order Item Placement"/>
-
-    <SurveyQuestionType surveyQuestionTypeId="BOOLEAN" description="Boolean (Yes/No)"/>
-    <SurveyQuestionType surveyQuestionTypeId="CONTENT" description="Content Record"/>
-    <SurveyQuestionType surveyQuestionTypeId="COUNTRY" description="Country"/>
-    <SurveyQuestionType surveyQuestionTypeId="CREDIT_CARD" description="Credit Card Number"/>
-    <SurveyQuestionType surveyQuestionTypeId="GEO" description="Geo List"/>
-    <SurveyQuestionType surveyQuestionTypeId="GIFT_CARD" description="Gift Card Number"/>
-    <SurveyQuestionType surveyQuestionTypeId="DATE" description="Date String (mm/dd/yyyy)"/>
-    <SurveyQuestionType surveyQuestionTypeId="EMAIL" description="Email Address"/>
-    <SurveyQuestionType surveyQuestionTypeId="ENUMERATION" description="Enumeration"/>
-    <SurveyQuestionType surveyQuestionTypeId="NUMBER_CURRENCY" description="Numeric (Currency)"/>
-    <SurveyQuestionType surveyQuestionTypeId="NUMBER_FLOAT" description="Numeric (Float)"/>
-    <SurveyQuestionType surveyQuestionTypeId="NUMBER_LONG" description="Numeric (Long)"/>
-    <SurveyQuestionType surveyQuestionTypeId="OPTION" description="Selected Option"/>
-    <SurveyQuestionType surveyQuestionTypeId="PASSWORD" description="Password"/>
-    <SurveyQuestionType surveyQuestionTypeId="SEPERATOR_LINE" description="Seperator Line"/>
-    <SurveyQuestionType surveyQuestionTypeId="SEPERATOR_TEXT" description="Seperator Text"/>
-    <SurveyQuestionType surveyQuestionTypeId="STATE_PROVINCE" description="State/Province"/>
-    <SurveyQuestionType surveyQuestionTypeId="TEXT_SHORT" description="Short Text (single-line)"/>
-    <SurveyQuestionType surveyQuestionTypeId="TEXT_LONG" description="Long Text (single-line)"/>
-    <SurveyQuestionType surveyQuestionTypeId="TEXTAREA" description="Text (multi-line)"/>
-    <SurveyQuestionType surveyQuestionTypeId="URL" description="URL"/>
-
-    <DataResource dataResourceId="STDWRAP001" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" dataResourceName="Standard SubContent Wrapper" mimeTypeId="text/html"/>
-    <ElectronicText dataResourceId="STDWRAP001">
-        <textData><![CDATA[<#assign mapKey=wrapMapKey?if_exists/>
-<#assign subDataResourceId=wrapDataResourceId?if_exists/>
-<#assign subDataResourceTypeId=wrapDataResourceTypeId?if_exists/>
-<#assign contentIdTo=wrapContentIdTo?if_exists/>
-<#assign mimeTypeId=wrapMimeTypeId?if_exists/>
-<#assign subContentId=wrapSubContentId?if_exists/>
-<div id="divTwo" class="wrapOuter">
-    <div>
-    ${mapKey?if_exists}
-    <a class="buttontext" href="javascript:lookupSubContent('<@o...@ofbizUrl>', '${contentIdTo?if_exists}','${mapKey?if_exists}',  '${subDataResourceTypeId?if_exists}', '${mimeTypeId?if_exists}')">[Find]</a>
-    <#assign ofbizRequest=""/>
-    <#assign httpParams="contentIdTo=" + contentIdTo?if_exists + "&mapKey=" + mapKey?if_exists />
-    <#if subDataResourceTypeId == "IMAGE_OBJECT">
-        <#assign ofbizRequest="EditLayoutImage"/>
-    <#else>
-        <#if subDataResourceTypeId == "URL_RESOURCE">
-            <#assign ofbizRequest="EditLayoutUrl"/>
-        <#else>
-            <#assign ofbizRequest="EditLayoutSubContent"/>
-        </#if>
-    </#if>
-    <a class="buttontext" href="<@o...@ofbizUrl>">[New]</a>
-    <#if subContentId?exists && (0 < subContentId?length)>
-        <a class="buttontext" href="<@o...@ofbizUrl>">[Edit]</a>
-    </#if>
-    </div>
-<div id="divOne" class="wrapInner">
-<@renderWrappedText/>
-</div>
-</div>]]></textData>
-    </ElectronicText>
-    <Content contentId="STDWRAP001" contentTypeId="DOCUMENT" dataResourceId="STDWRAP001" contentName="Standard SubContent Wrapper" description="Standard SubContent Wrapper" mimeTypeId="text/html"/>
-
-    <WebAnalyticsType description="Web Analytics" hasTable="N" parentTypeId="" webAnalyticsTypeId="WEB_ANALYTICS"/>
-    <WebAnalyticsType webAnalyticsTypeId="GOOGLE_ANALYTICS" parentTypeId="WEB_ANALYTICS" hasTable="N" description="Google Analytics"/>
-    <WebAnalyticsType webAnalyticsTypeId="BING_ANALYTICS" parentTypeId="WEB_ANALYTICS" hasTable="N" description="Bing Analytics"/>
-    <WebAnalyticsType webAnalyticsTypeId="BACKEND_ANALYTICS" parentTypeId="WEB_ANALYTICS" hasTable="N" description="Backend Analytics"/>
 
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/DataCategoryData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/DataCategoryData.xml?rev=1813724&r1=1813723&r2=1813724&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/DataCategoryData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/DataCategoryData.xml Mon Oct 30 05:33:32 2017
@@ -18,21 +18,4 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <DataCategory dataCategoryId="ROOT" parentCategoryId="" categoryName=""/>
-    <DataCategory dataCategoryId="BUSINESS" parentCategoryId="ROOT" categoryName="Business"/>
-    <DataCategory dataCategoryId="TECHNOLOGY" parentCategoryId="ROOT" categoryName="Technology"/>
-    <DataCategory dataCategoryId="PERSONAL" parentCategoryId="ROOT" categoryName="Personal"/>
-    <DataCategory dataCategoryId="LEGAL" parentCategoryId="ROOT" categoryName="Legal"/>
-    <DataCategory dataCategoryId="POLITICAL" parentCategoryId="ROOT" categoryName="Political"/>
-    <DataCategory dataCategoryId="FINANCIAL" parentCategoryId="ROOT" categoryName="Financial"/>
-    <DataCategory dataCategoryId="BUS_RETAIL" parentCategoryId="BUSINESS" categoryName="Retail"/>
-    <DataCategory dataCategoryId="BUS_SERVICE" parentCategoryId="BUSINESS" categoryName="Service"/>
-    <DataCategory dataCategoryId="BUS_MANU" parentCategoryId="BUSINESS" categoryName="Manufacturing"/>
-    <DataCategory dataCategoryId="TECH_SOFT" parentCategoryId="TECHNOLOGY" categoryName="Software"/>
-    <DataCategory dataCategoryId="TECH_SOFT_OFBIZ" parentCategoryId="TECH_SOFT" categoryName="Apache OFBiz"/>
-    <DataCategory dataCategoryId="TECH_SOFT_LINUX" parentCategoryId="TECH_SOFT" categoryName="Linux"/>
-    <DataCategory dataCategoryId="TECH_SOFT_JAVA" parentCategoryId="TECH_SOFT" categoryName="Java"/>
-    <DataCategory dataCategoryId="TECH_HARD" parentCategoryId="TECHNOLOGY" categoryName="Hardware"/>
-    <DataCategory dataCategoryId="TECH_SERV" parentCategoryId="TECHNOLOGY" categoryName="Service"/>
-    <DataCategory dataCategoryId="TEMPLATE" parentCategoryId="ROOT" categoryName="Template"/>
 </entity-engine-xml>