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/08/26 05:54:15 UTC
svn commit: r1806258 - in /ofbiz/ofbiz-framework/trunk: ./
applications/content/data/ applications/datamodel/
applications/datamodel/data/seed/ framework/common/config/
framework/entity/config/ framework/webtools/template/
Author: rishi
Date: Sat Aug 26 05:54:15 2017
New Revision: 1806258
URL: http://svn.apache.org/viewvc?rev=1806258&view=rev
Log:
Improvement: Move all data in applications to the datamodel component. (OFBIZ-9501)
Moved the data which belongs to content with seed reader.
Thanks Saurabh Dixit for your contribution.
Added:
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml (with props)
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml
ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-component.xml
ofbiz/ofbiz-framework/trunk/build.gradle
ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties
ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
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=1806258&r1=1806257&r2=1806258&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml Sat Aug 26 05:54:15 2017
@@ -27,77 +27,6 @@ under the License.
<RoleType roleTypeId="CONTENT_USER" parentTypeId="CONTENT" hasTable="N" description="Content User"/>
<RoleType roleTypeId="CONTENT_GUEST" parentTypeId="CONTENT" hasTable="N" description="Content Guest"/>
- <ContentAssocType contentAssocTypeId="TEMPLATE_MEMBER" description="Template Member"/>
- <ContentAssocType contentAssocTypeId="STRUCTURE_DEF" description="Document Structure Definition"/>
- <ContentAssocType contentAssocTypeId="TXFORM_DEF" description="Transformation Definition"/>
- <ContentAssocType contentAssocTypeId="LIST_ENTRY" description="List Entry"/>
- <ContentAssocType contentAssocTypeId="TREE_CHILD" description="Tree Child"/>
- <ContentAssocType contentAssocTypeId="GRAPH_LINK" description="Graph Link"/>
- <ContentAssocType contentAssocTypeId="ALTERNATE_LOCALE" description="Alternate Locale"/>
- <ContentAssocType contentAssocTypeId="ALTERNATE_ROLE" description="Alternate Role"/>
- <ContentAssocType contentAssocTypeId="RESPONSE" description="Response"/>
- <ContentAssocType contentAssocTypeId="SUB_CONTENT" description="Sub-Content"/>
- <ContentAssocType contentAssocTypeId="TOPIC" description="Topic"/>
- <ContentAssocType contentAssocTypeId="DESCRIPTION" description="Description"/>
-
- <ContentAssocType contentAssocTypeId="SUBSITE" description="SubSite"/>
- <ContentAssocType contentAssocTypeId="DEPARTMENT" description="Department"/>
- <ContentAssocType contentAssocTypeId="RELATED_CONTENT" description="Related content"/>
- <ContentAssocType contentAssocTypeId="PUBLISH_LINK" description="Publish link"/>
- <ContentAssocType contentAssocTypeId="ATTRIBUTE" description="Attribute"/>
- <ContentAssocType contentAssocTypeId="AUTHOR" description="Author"/>
- <ContentAssocType contentAssocTypeId="SUMMARY" description="Summary"/>
-
- <ContentAssocType contentAssocTypeId="COMPDOC_PART" description="Composite Document Part"/>
- <ContentAssocType contentAssocTypeId="INSTANCE" description="Instance Of"/>
- <ContentAssocType contentAssocTypeId="ALTERNATIVE_URL" description="Alternative URL"/>
-
- <ContentAssocPredicate contentAssocPredicateId="member-of" description="The object is a member of the subject."/>
- <ContentAssocPredicate contentAssocPredicateId="defines" description="The object defines the subject."/>
- <ContentAssocPredicate contentAssocPredicateId="extends" description="The object extends the subject."/>
- <ContentAssocPredicate contentAssocPredicateId="related-to" description="The object is related to the subject."/>
- <ContentAssocPredicate contentAssocPredicateId="references" description="The object references the subject."/>
-
- <ContentAssocPredicate contentAssocPredicateId="topifies" description="Topifies"/>
- <ContentAssocPredicate contentAssocPredicateId="categorizes" description="Categorizes"/>
-
- <MetaDataPredicate metaDataPredicateId="author-name" description="Name of the author or creator of the subject."/>
- <MetaDataPredicate metaDataPredicateId="author-email" description="eMail address of the author or creator of the subject."/>
- <MetaDataPredicate metaDataPredicateId="event-date" description="The date and time of the event in format [yyyy-MM-dd hh:mm:ss]."/>
- <MetaDataPredicate metaDataPredicateId="event-location" description="The location where subject event took place."/>
- <MetaDataPredicate metaDataPredicateId="event-person-name" description="The name of a person involved in the subject event."/>
-
- <ContentType contentTypeId="DOCUMENT" description="Document" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="TEMPLATE" description="Template or Form" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="DECORATOR" description="Decorator" hasTable="N" parentTypeId="TEMPLATE"/>
- <ContentType contentTypeId="ANNOTATION" description="Annotation" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="MENU_CONTAINER" description="Menu Container" hasTable="N" parentTypeId=""/>
- <!-- NOTE DEJ20080809 The following 3 ContentTypes may not be needed, and the current practice is to just use DOCUMENT instead -->
- <ContentType contentTypeId="OUTLINE_NODE" description="Outline Node" hasTable="N" parentTypeId="DOCUMENT"/>
- <ContentType contentTypeId="PAGE_NODE" description="Page Node" hasTable="N" parentTypeId="DOCUMENT"/>
- <ContentType contentTypeId="SUBPAGE_NODE" description="Sub Page Node" hasTable="N" parentTypeId="DOCUMENT"/>
- <!-- These ContentTypes are primarily for structuring knowledge -->
- <ContentType contentTypeId="CONTENT_LIST" description="Content List" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="TREE_ROOT" description="Tree Root" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="GRAPH_ROOT" description="Graph Root" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="STRUCTURE_NODE" description="Structure Node" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="STRUCTURE_LEAF" description="Structure Leaf" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="STRUCTURE_DEF" description="Structure Definition (like DTD)" hasTable="N" parentTypeId=""/>
- <ContentType contentTypeId="TXFORM_DEF" description="Transformation Definition (like XSLT)" hasTable="N" parentTypeId=""/>
-
- <ContentType contentTypeId="PLACEHOLDER" description="Place Holder"/>
- <ContentType contentTypeId="WEB_SITE_PUB_PT" parentTypeId="PLACEHOLDER" hasTable="Y" description="Web Site Publish Point"/>
- <ContentType contentTypeId="FORUM_ROOT" parentTypeId="PLACEHOLDER" hasTable="N" description="Forum Root"/>
- <ContentType contentTypeId="BLOG_ROOT" parentTypeId="PLACEHOLDER" hasTable="N" description="Blog Root"/>
- <ContentType contentTypeId="FAQ_ROOT" parentTypeId="PLACEHOLDER" hasTable="N" description="FAQ Root"/>
- <ContentType contentTypeId="DEPARTMENT" description="Department" parentTypeId="PLACEHOLDER"/>
- <ContentType contentTypeId="PEOPLE" description="People" parentTypeId="PLACEHOLDER"/>
- <ContentType contentTypeId="PERSON" description="Person" parentTypeId="PLACEHOLDER"/>
- <ContentType contentTypeId="TOPIC" description="Topic" parentTypeId="PLACEHOLDER"/>
-
- <ContentType contentTypeId="COMPDOC_TEMPLATE" description="Composite Document Template"/>
- <ContentType contentTypeId="COMPDOC_INSTANCE" description="Composite Document Instance"/>
-
<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"/>
@@ -119,39 +48,6 @@ under the License.
<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"/>
- <DataResourceType dataResourceTypeId="LOCAL_FILE" description="Local File" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="OFBIZ_FILE" description="File (rel to OFBIZ_HOME)" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="CONTEXT_FILE" description="File (rel to webapp root)" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="LOCAL_FILE_BIN" description="Local Binary File" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="OFBIZ_FILE_BIN" description="Binary File (rel to OFBIZ_HOME)" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="CONTEXT_FILE_BIN" description="Binary File (rel to webapp root)" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="LINK" description="HyperLink" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="URL_RESOURCE" description="URL Resource" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="SHORT_TEXT" description="Short Text" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="ELECTRONIC_TEXT" description="Long Text" hasTable="Y" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="AUDIO_OBJECT" description="Audio" hasTable="Y" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="IMAGE_OBJECT" description="Image" hasTable="Y" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="OTHER_OBJECT" description="Other" hasTable="Y" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="VIDEO_OBJECT" description="Video" hasTable="Y" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="SURVEY" description="Survey" hasTable="N" parentTypeId=""/>
- <DataResourceType dataResourceTypeId="SURVEY_RESPONSE" description="Survey Response" hasTable="N" parentTypeId=""/>
-
- <DataTemplateType dataTemplateTypeId="NONE" description="No Template" extension=""/>
- <DataTemplateType dataTemplateTypeId="FTL" description="FreeMarker" extension="ftl"/>
- <DataTemplateType dataTemplateTypeId="WM" description="WebMacro" extension="wm"/>
- <DataTemplateType dataTemplateTypeId="XSLT" description="XSLT" extension="xsl"/>
- <DataTemplateType dataTemplateTypeId="SCREEN_COMBINED" description="Screen widget" extension="xml"/>
-
- <DocumentType description="Shipping" documentTypeId="SHIPPING_DOCUMENT" hasTable="Y" parentTypeId=""/>
- <DocumentType description="Bill Of Lading" documentTypeId="BILL_OF_LADING" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
- <DocumentType description="Export" documentTypeId="EXPORT_DOCUMENTATION" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
- <DocumentType description="Haz Mat" documentTypeId="HAZ_MAT_DOCUMENT" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
- <DocumentType description="Manifest" documentTypeId="MANIFEST" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
- <DocumentType description="Other Shipping" documentTypeId="OTHER_SHIP_DOCUMENT" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
- <DocumentType description="Packing Slip" documentTypeId="PACKAGING_SLIP" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
- <DocumentType description="Port Charge" documentTypeId="PORT_CHARGE_DOCUMENT" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
- <DocumentType description="Tax Tariff" documentTypeId="TAX_TARIFF_DOCUMENT" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
-
<StatusType description="Server Hit" hasTable="N" parentTypeId="" statusTypeId="SERVER_HIT_STATUS"/>
<StatusType description="Web Content" hasTable="N" parentTypeId="" statusTypeId="WEB_CONTENT_STATUS"/>
@@ -179,16 +75,6 @@ under the License.
<SubscriptionType description="Other" hasTable="N" parentTypeId="" subscriptionTypeId="OTHER_SUBSCR"/>
<SubscriptionType description="Product Info" hasTable="N" parentTypeId="" subscriptionTypeId="PRODUCT_INFO_SUBSCR"/>
- <!-- website data -->
- <WebSiteContentType webSiteContentTypeId="BLOG_ROOT" description="Blog Root" hasTable="N" parentTypeId=""/>
- <WebSiteContentType webSiteContentTypeId="DEFAULT_PAGE" description="Default Page" hasTable="N" parentTypeId=""/>
- <WebSiteContentType webSiteContentTypeId="FORUM_ROOT" description="Forum Root" hasTable="N" parentTypeId=""/>
- <WebSiteContentType webSiteContentTypeId="MENU_ROOT" description="Menu Containers" hasTable="N" parentTypeId=""/>
- <WebSiteContentType webSiteContentTypeId="ERROR_ROOT" description="Error Page Containers" hasTable="N" parentTypeId=""/>
- <WebSiteContentType webSiteContentTypeId="PUBLISH_POINT" description="Publish Point" hasTable="N" parentTypeId=""/>
- <WebSiteContentType webSiteContentTypeId="WEB_PAGE" description="Web Page" hasTable="N" parentTypeId="" />
- <WebSiteContentType webSiteContentTypeId="MAINTENANCE_PAGE" description="Maintenance Page" hasTable="N" parentTypeId=""/>
-
<!-- survey data -->
<SurveyApplType surveyApplTypeId="CART_ADD" description="Add-To Cart"/>
<SurveyApplType surveyApplTypeId="CHECK_OUT" description="Check-Out"/>
Added: 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=1806258&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml (added)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml Sat Aug 26 05:54:15 2017
@@ -0,0 +1,134 @@
+<?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>
+ <ContentAssocType contentAssocTypeId="TEMPLATE_MEMBER" description="Template Member"/>
+ <ContentAssocType contentAssocTypeId="STRUCTURE_DEF" description="Document Structure Definition"/>
+ <ContentAssocType contentAssocTypeId="TXFORM_DEF" description="Transformation Definition"/>
+ <ContentAssocType contentAssocTypeId="LIST_ENTRY" description="List Entry"/>
+ <ContentAssocType contentAssocTypeId="TREE_CHILD" description="Tree Child"/>
+ <ContentAssocType contentAssocTypeId="GRAPH_LINK" description="Graph Link"/>
+ <ContentAssocType contentAssocTypeId="ALTERNATE_LOCALE" description="Alternate Locale"/>
+ <ContentAssocType contentAssocTypeId="ALTERNATE_ROLE" description="Alternate Role"/>
+ <ContentAssocType contentAssocTypeId="RESPONSE" description="Response"/>
+ <ContentAssocType contentAssocTypeId="SUB_CONTENT" description="Sub-Content"/>
+ <ContentAssocType contentAssocTypeId="TOPIC" description="Topic"/>
+ <ContentAssocType contentAssocTypeId="DESCRIPTION" description="Description"/>
+
+ <ContentAssocType contentAssocTypeId="SUBSITE" description="SubSite"/>
+ <ContentAssocType contentAssocTypeId="DEPARTMENT" description="Department"/>
+ <ContentAssocType contentAssocTypeId="RELATED_CONTENT" description="Related content"/>
+ <ContentAssocType contentAssocTypeId="PUBLISH_LINK" description="Publish link"/>
+ <ContentAssocType contentAssocTypeId="ATTRIBUTE" description="Attribute"/>
+ <ContentAssocType contentAssocTypeId="AUTHOR" description="Author"/>
+ <ContentAssocType contentAssocTypeId="SUMMARY" description="Summary"/>
+
+ <ContentAssocType contentAssocTypeId="COMPDOC_PART" description="Composite Document Part"/>
+ <ContentAssocType contentAssocTypeId="INSTANCE" description="Instance Of"/>
+ <ContentAssocType contentAssocTypeId="ALTERNATIVE_URL" description="Alternative URL"/>
+
+ <ContentAssocPredicate contentAssocPredicateId="member-of" description="The object is a member of the subject."/>
+ <ContentAssocPredicate contentAssocPredicateId="defines" description="The object defines the subject."/>
+ <ContentAssocPredicate contentAssocPredicateId="extends" description="The object extends the subject."/>
+ <ContentAssocPredicate contentAssocPredicateId="related-to" description="The object is related to the subject."/>
+ <ContentAssocPredicate contentAssocPredicateId="references" description="The object references the subject."/>
+
+ <ContentAssocPredicate contentAssocPredicateId="topifies" description="Topifies"/>
+ <ContentAssocPredicate contentAssocPredicateId="categorizes" description="Categorizes"/>
+
+ <MetaDataPredicate metaDataPredicateId="author-name" description="Name of the author or creator of the subject."/>
+ <MetaDataPredicate metaDataPredicateId="author-email" description="eMail address of the author or creator of the subject."/>
+ <MetaDataPredicate metaDataPredicateId="event-date" description="The date and time of the event in format [yyyy-MM-dd hh:mm:ss]."/>
+ <MetaDataPredicate metaDataPredicateId="event-location" description="The location where subject event took place."/>
+ <MetaDataPredicate metaDataPredicateId="event-person-name" description="The name of a person involved in the subject event."/>
+
+ <ContentType contentTypeId="DOCUMENT" description="Document" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="TEMPLATE" description="Template or Form" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="DECORATOR" description="Decorator" hasTable="N" parentTypeId="TEMPLATE"/>
+ <ContentType contentTypeId="ANNOTATION" description="Annotation" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="MENU_CONTAINER" description="Menu Container" hasTable="N" parentTypeId=""/>
+ <!-- NOTE DEJ20080809 The following 3 ContentTypes may not be needed, and the current practice is to just use DOCUMENT instead -->
+ <ContentType contentTypeId="OUTLINE_NODE" description="Outline Node" hasTable="N" parentTypeId="DOCUMENT"/>
+ <ContentType contentTypeId="PAGE_NODE" description="Page Node" hasTable="N" parentTypeId="DOCUMENT"/>
+ <ContentType contentTypeId="SUBPAGE_NODE" description="Sub Page Node" hasTable="N" parentTypeId="DOCUMENT"/>
+ <!-- These ContentTypes are primarily for structuring knowledge -->
+ <ContentType contentTypeId="CONTENT_LIST" description="Content List" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="TREE_ROOT" description="Tree Root" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="GRAPH_ROOT" description="Graph Root" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="STRUCTURE_NODE" description="Structure Node" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="STRUCTURE_LEAF" description="Structure Leaf" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="STRUCTURE_DEF" description="Structure Definition (like DTD)" hasTable="N" parentTypeId=""/>
+ <ContentType contentTypeId="TXFORM_DEF" description="Transformation Definition (like XSLT)" hasTable="N" parentTypeId=""/>
+
+ <ContentType contentTypeId="PLACEHOLDER" description="Place Holder"/>
+ <ContentType contentTypeId="WEB_SITE_PUB_PT" parentTypeId="PLACEHOLDER" hasTable="Y" description="Web Site Publish Point"/>
+ <ContentType contentTypeId="FORUM_ROOT" parentTypeId="PLACEHOLDER" hasTable="N" description="Forum Root"/>
+ <ContentType contentTypeId="BLOG_ROOT" parentTypeId="PLACEHOLDER" hasTable="N" description="Blog Root"/>
+ <ContentType contentTypeId="FAQ_ROOT" parentTypeId="PLACEHOLDER" hasTable="N" description="FAQ Root"/>
+ <ContentType contentTypeId="DEPARTMENT" description="Department" parentTypeId="PLACEHOLDER"/>
+ <ContentType contentTypeId="PEOPLE" description="People" parentTypeId="PLACEHOLDER"/>
+ <ContentType contentTypeId="PERSON" description="Person" parentTypeId="PLACEHOLDER"/>
+ <ContentType contentTypeId="TOPIC" description="Topic" parentTypeId="PLACEHOLDER"/>
+
+ <ContentType contentTypeId="COMPDOC_TEMPLATE" description="Composite Document Template"/>
+ <ContentType contentTypeId="COMPDOC_INSTANCE" description="Composite Document Instance"/>
+
+ <DataResourceType dataResourceTypeId="LOCAL_FILE" description="Local File" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="OFBIZ_FILE" description="File (rel to OFBIZ_HOME)" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="CONTEXT_FILE" description="File (rel to webapp root)" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="LOCAL_FILE_BIN" description="Local Binary File" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="OFBIZ_FILE_BIN" description="Binary File (rel to OFBIZ_HOME)" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="CONTEXT_FILE_BIN" description="Binary File (rel to webapp root)" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="LINK" description="HyperLink" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="URL_RESOURCE" description="URL Resource" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="SHORT_TEXT" description="Short Text" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="ELECTRONIC_TEXT" description="Long Text" hasTable="Y" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="AUDIO_OBJECT" description="Audio" hasTable="Y" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="IMAGE_OBJECT" description="Image" hasTable="Y" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="OTHER_OBJECT" description="Other" hasTable="Y" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="VIDEO_OBJECT" description="Video" hasTable="Y" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="SURVEY" description="Survey" hasTable="N" parentTypeId=""/>
+ <DataResourceType dataResourceTypeId="SURVEY_RESPONSE" description="Survey Response" hasTable="N" parentTypeId=""/>
+
+ <DataTemplateType dataTemplateTypeId="NONE" description="No Template" extension=""/>
+ <DataTemplateType dataTemplateTypeId="FTL" description="FreeMarker" extension="ftl"/>
+ <DataTemplateType dataTemplateTypeId="WM" description="WebMacro" extension="wm"/>
+ <DataTemplateType dataTemplateTypeId="XSLT" description="XSLT" extension="xsl"/>
+ <DataTemplateType dataTemplateTypeId="SCREEN_COMBINED" description="Screen widget" extension="xml"/>
+
+ <DocumentType description="Shipping" documentTypeId="SHIPPING_DOCUMENT" hasTable="Y" parentTypeId=""/>
+ <DocumentType description="Bill Of Lading" documentTypeId="BILL_OF_LADING" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
+ <DocumentType description="Export" documentTypeId="EXPORT_DOCUMENTATION" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
+ <DocumentType description="Haz Mat" documentTypeId="HAZ_MAT_DOCUMENT" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
+ <DocumentType description="Manifest" documentTypeId="MANIFEST" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
+ <DocumentType description="Other Shipping" documentTypeId="OTHER_SHIP_DOCUMENT" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
+ <DocumentType description="Packing Slip" documentTypeId="PACKAGING_SLIP" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
+ <DocumentType description="Port Charge" documentTypeId="PORT_CHARGE_DOCUMENT" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
+ <DocumentType description="Tax Tariff" documentTypeId="TAX_TARIFF_DOCUMENT" hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
+
+ <!-- website data -->
+ <WebSiteContentType webSiteContentTypeId="BLOG_ROOT" description="Blog Root" hasTable="N" parentTypeId=""/>
+ <WebSiteContentType webSiteContentTypeId="DEFAULT_PAGE" description="Default Page" hasTable="N" parentTypeId=""/>
+ <WebSiteContentType webSiteContentTypeId="FORUM_ROOT" description="Forum Root" hasTable="N" parentTypeId=""/>
+ <WebSiteContentType webSiteContentTypeId="MENU_ROOT" description="Menu Containers" hasTable="N" parentTypeId=""/>
+ <WebSiteContentType webSiteContentTypeId="ERROR_ROOT" description="Error Page Containers" hasTable="N" parentTypeId=""/>
+ <WebSiteContentType webSiteContentTypeId="PUBLISH_POINT" description="Publish Point" hasTable="N" parentTypeId=""/>
+ <WebSiteContentType webSiteContentTypeId="WEB_PAGE" description="Web Page" hasTable="N" parentTypeId="" />
+ <WebSiteContentType webSiteContentTypeId="MAINTENANCE_PAGE" description="Maintenance Page" hasTable="N" parentTypeId=""/>
+</entity-engine-xml>
\ No newline at end of file
Propchange: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-component.xml?rev=1806258&r1=1806257&r2=1806258&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-component.xml Sat Aug 26 05:54:15 2017
@@ -35,4 +35,5 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/workeffort-entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/seed/PartySeedData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/seed/ContentSeedData.xml"/>
</ofbiz-component>
Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1806258&r1=1806257&r2=1806258&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Sat Aug 26 05:54:15 2017
@@ -149,6 +149,7 @@ dependencies {
runtime 'de.odysseus.juel:juel-spi:2.2.7'
runtime 'net.sf.barcode4j:barcode4j-fop-ext:2.1'
runtime 'net.sf.barcode4j:barcode4j:2.1'
+ runtime 'org.postgresql:postgresql:9.3-1104-jdbc41'
runtime 'org.apache.axis2:axis2-transport-http:1.7.1'
runtime 'org.apache.axis2:axis2-transport-local:1.7.1'
runtime 'org.apache.derby:derby:10.11.1.1'
Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties?rev=1806258&r1=1806257&r2=1806258&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties Sat Aug 26 05:54:15 2017
@@ -80,10 +80,10 @@ defaultFromEmailAddress=ofbiztest@exampl
# as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
# -- mail notifications enabled (Y|N)
-mail.notifications.enabled=N
+mail.notifications.enabled=Y
# -- redirect all mail notifications to this address for testing
-#mail.notifications.redirectTo=
+mail.notifications.redirectTo=rishisolankii@gmail.com
# -- the default mail server to use
mail.smtp.relay.host=localhost
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml?rev=1806258&r1=1806257&r2=1806258&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml Sat Aug 26 05:54:15 2017
@@ -52,19 +52,19 @@ access. For a detailed description see t
<debug-xa-resources value="false" /> <!-- see https://issues.apache.org/jira/browse/OFBIZ-4282 for more -->
<delegator name="default" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main" distributed-cache-clear-enabled="false">
- <group-map group-name="org.apache.ofbiz" datasource-name="localderby"/>
+ <group-map group-name="org.apache.ofbiz" datasource-name="localpostgres"/>
<group-map group-name="org.apache.ofbiz.olap" datasource-name="localderbyolap"/>
<group-map group-name="org.apache.ofbiz.tenant" datasource-name="localderbytenant"/>
</delegator>
<delegator name="default-no-eca" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main" entity-eca-enabled="false" distributed-cache-clear-enabled="false">
- <group-map group-name="org.apache.ofbiz" datasource-name="localderby"/>
+ <group-map group-name="org.apache.ofbiz" datasource-name="localpostgres"/>
<group-map group-name="org.apache.ofbiz.olap" datasource-name="localderbyolap"/>
<group-map group-name="org.apache.ofbiz.tenant" datasource-name="localderbytenant"/>
</delegator>
<!-- be sure that your default delegator (or the one you use) uses the same datasource for test. You must run "gradlew loadAll" before running "gradlew testIntegration" -->
<delegator name="test" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main">
- <group-map group-name="org.apache.ofbiz" datasource-name="localderby"/>
+ <group-map group-name="org.apache.ofbiz" datasource-name="localpostgres"/>
<group-map group-name="org.apache.ofbiz.olap" datasource-name="localderbyolap"/>
<group-map group-name="org.apache.ofbiz.tenant" datasource-name="localderbytenant"/>
</delegator>
@@ -483,9 +483,9 @@ access. For a detailed description see t
<read-data reader-name="ext-demo"/>
<inline-jdbc
jdbc-driver="org.postgresql.Driver"
- jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz"
- jdbc-username="ofbiz"
- jdbc-password="ofbiz"
+ jdbc-uri="jdbc:postgresql://127.0.0.1/plain_ofbiz_test"
+ jdbc-username="rishi"
+ jdbc-password="123456"
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl?rev=1806258&r1=1806257&r2=1806258&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl Sat Aug 26 05:54:15 2017
@@ -17,6 +17,10 @@ specific language governing permissions
under the License.
-->
<div class="screenlet">
+<#assign test=Static["java.lang.String"].format("http://example.com/page?a=1&b=2") >
+<p>result1=${test}</p>
+<p>result2=${test?url('utf-8')}</p>
+
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.WebtoolsMainPage}</li>
Re: svn commit: r1806258 - in /ofbiz/ofbiz-framework/trunk: ./
applications/content/data/ applications/datamodel/ applications/datamodel/data/seed/
framework/common/config/ framework/entity/config/ framework/webtools/template/
Posted by Rishi Solanki <ri...@gmail.com>.
Team,
Commit contains local changes. I'm reverting shortly.
Thanks!
Rishi Solanki
Sr Manager, Enterprise Software Development
HotWax Systems Pvt. Ltd.
Direct: +91-9893287847
http://www.hotwaxsystems.com
www.hotwax.co
On Sat, Aug 26, 2017 at 11:24 AM, <ri...@apache.org> wrote:
> Author: rishi
> Date: Sat Aug 26 05:54:15 2017
> New Revision: 1806258
>
> URL: http://svn.apache.org/viewvc?rev=1806258&view=rev
> Log:
> Improvement: Move all data in applications to the datamodel component.
> (OFBIZ-9501)
> Moved the data which belongs to content with seed reader.
> Thanks Saurabh Dixit for your contribution.
>
> Added:
> ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
> (with props)
> Modified:
> ofbiz/ofbiz-framework/trunk/applications/content/data/
> ContentTypeData.xml
> ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-component.xml
> ofbiz/ofbiz-framework/trunk/build.gradle
> ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties
> ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
> ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
>
> 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=
> 1806258&r1=1806257&r2=1806258&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml
> (original)
> +++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentTypeData.xml
> Sat Aug 26 05:54:15 2017
> @@ -27,77 +27,6 @@ under the License.
> <RoleType roleTypeId="CONTENT_USER" parentTypeId="CONTENT"
> hasTable="N" description="Content User"/>
> <RoleType roleTypeId="CONTENT_GUEST" parentTypeId="CONTENT"
> hasTable="N" description="Content Guest"/>
>
> - <ContentAssocType contentAssocTypeId="TEMPLATE_MEMBER"
> description="Template Member"/>
> - <ContentAssocType contentAssocTypeId="STRUCTURE_DEF"
> description="Document Structure Definition"/>
> - <ContentAssocType contentAssocTypeId="TXFORM_DEF"
> description="Transformation Definition"/>
> - <ContentAssocType contentAssocTypeId="LIST_ENTRY" description="List
> Entry"/>
> - <ContentAssocType contentAssocTypeId="TREE_CHILD" description="Tree
> Child"/>
> - <ContentAssocType contentAssocTypeId="GRAPH_LINK" description="Graph
> Link"/>
> - <ContentAssocType contentAssocTypeId="ALTERNATE_LOCALE"
> description="Alternate Locale"/>
> - <ContentAssocType contentAssocTypeId="ALTERNATE_ROLE"
> description="Alternate Role"/>
> - <ContentAssocType contentAssocTypeId="RESPONSE"
> description="Response"/>
> - <ContentAssocType contentAssocTypeId="SUB_CONTENT"
> description="Sub-Content"/>
> - <ContentAssocType contentAssocTypeId="TOPIC" description="Topic"/>
> - <ContentAssocType contentAssocTypeId="DESCRIPTION"
> description="Description"/>
> -
> - <ContentAssocType contentAssocTypeId="SUBSITE" description="SubSite"/>
> - <ContentAssocType contentAssocTypeId="DEPARTMENT"
> description="Department"/>
> - <ContentAssocType contentAssocTypeId="RELATED_CONTENT"
> description="Related content"/>
> - <ContentAssocType contentAssocTypeId="PUBLISH_LINK"
> description="Publish link"/>
> - <ContentAssocType contentAssocTypeId="ATTRIBUTE"
> description="Attribute"/>
> - <ContentAssocType contentAssocTypeId="AUTHOR" description="Author"/>
> - <ContentAssocType contentAssocTypeId="SUMMARY" description="Summary"/>
> -
> - <ContentAssocType contentAssocTypeId="COMPDOC_PART"
> description="Composite Document Part"/>
> - <ContentAssocType contentAssocTypeId="INSTANCE" description="Instance
> Of"/>
> - <ContentAssocType contentAssocTypeId="ALTERNATIVE_URL"
> description="Alternative URL"/>
> -
> - <ContentAssocPredicate contentAssocPredicateId="member-of"
> description="The object is a member of the subject."/>
> - <ContentAssocPredicate contentAssocPredicateId="defines"
> description="The object defines the subject."/>
> - <ContentAssocPredicate contentAssocPredicateId="extends"
> description="The object extends the subject."/>
> - <ContentAssocPredicate contentAssocPredicateId="related-to"
> description="The object is related to the subject."/>
> - <ContentAssocPredicate contentAssocPredicateId="references"
> description="The object references the subject."/>
> -
> - <ContentAssocPredicate contentAssocPredicateId="topifies"
> description="Topifies"/>
> - <ContentAssocPredicate contentAssocPredicateId="categorizes"
> description="Categorizes"/>
> -
> - <MetaDataPredicate metaDataPredicateId="author-name"
> description="Name of the author or creator of the subject."/>
> - <MetaDataPredicate metaDataPredicateId="author-email"
> description="eMail address of the author or creator of the subject."/>
> - <MetaDataPredicate metaDataPredicateId="event-date" description="The
> date and time of the event in format [yyyy-MM-dd hh:mm:ss]."/>
> - <MetaDataPredicate metaDataPredicateId="event-location"
> description="The location where subject event took place."/>
> - <MetaDataPredicate metaDataPredicateId="event-person-name"
> description="The name of a person involved in the subject event."/>
> -
> - <ContentType contentTypeId="DOCUMENT" description="Document"
> hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="TEMPLATE" description="Template or Form"
> hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="DECORATOR" description="Decorator"
> hasTable="N" parentTypeId="TEMPLATE"/>
> - <ContentType contentTypeId="ANNOTATION" description="Annotation"
> hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="MENU_CONTAINER" description="Menu
> Container" hasTable="N" parentTypeId=""/>
> - <!-- NOTE DEJ20080809 The following 3 ContentTypes may not be needed,
> and the current practice is to just use DOCUMENT instead -->
> - <ContentType contentTypeId="OUTLINE_NODE" description="Outline Node"
> hasTable="N" parentTypeId="DOCUMENT"/>
> - <ContentType contentTypeId="PAGE_NODE" description="Page Node"
> hasTable="N" parentTypeId="DOCUMENT"/>
> - <ContentType contentTypeId="SUBPAGE_NODE" description="Sub Page Node"
> hasTable="N" parentTypeId="DOCUMENT"/>
> - <!-- These ContentTypes are primarily for structuring knowledge -->
> - <ContentType contentTypeId="CONTENT_LIST" description="Content List"
> hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="TREE_ROOT" description="Tree Root"
> hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="GRAPH_ROOT" description="Graph Root"
> hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="STRUCTURE_NODE" description="Structure
> Node" hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="STRUCTURE_LEAF" description="Structure
> Leaf" hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="STRUCTURE_DEF" description="Structure
> Definition (like DTD)" hasTable="N" parentTypeId=""/>
> - <ContentType contentTypeId="TXFORM_DEF" description="Transformation
> Definition (like XSLT)" hasTable="N" parentTypeId=""/>
> -
> - <ContentType contentTypeId="PLACEHOLDER" description="Place Holder"/>
> - <ContentType contentTypeId="WEB_SITE_PUB_PT"
> parentTypeId="PLACEHOLDER" hasTable="Y" description="Web Site Publish
> Point"/>
> - <ContentType contentTypeId="FORUM_ROOT" parentTypeId="PLACEHOLDER"
> hasTable="N" description="Forum Root"/>
> - <ContentType contentTypeId="BLOG_ROOT" parentTypeId="PLACEHOLDER"
> hasTable="N" description="Blog Root"/>
> - <ContentType contentTypeId="FAQ_ROOT" parentTypeId="PLACEHOLDER"
> hasTable="N" description="FAQ Root"/>
> - <ContentType contentTypeId="DEPARTMENT" description="Department"
> parentTypeId="PLACEHOLDER"/>
> - <ContentType contentTypeId="PEOPLE" description="People"
> parentTypeId="PLACEHOLDER"/>
> - <ContentType contentTypeId="PERSON" description="Person"
> parentTypeId="PLACEHOLDER"/>
> - <ContentType contentTypeId="TOPIC" description="Topic"
> parentTypeId="PLACEHOLDER"/>
> -
> - <ContentType contentTypeId="COMPDOC_TEMPLATE" description="Composite
> Document Template"/>
> - <ContentType contentTypeId="COMPDOC_INSTANCE" description="Composite
> Document Instance"/>
> -
> <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"/>
> @@ -119,39 +48,6 @@ under the License.
> <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"/>
>
> - <DataResourceType dataResourceTypeId="LOCAL_FILE" description="Local
> File" hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="OFBIZ_FILE" description="File
> (rel to OFBIZ_HOME)" hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="CONTEXT_FILE"
> description="File (rel to webapp root)" hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="LOCAL_FILE_BIN"
> description="Local Binary File" hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="OFBIZ_FILE_BIN"
> description="Binary File (rel to OFBIZ_HOME)" hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="CONTEXT_FILE_BIN"
> description="Binary File (rel to webapp root)" hasTable="N"
> parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="LINK" description="HyperLink"
> hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="URL_RESOURCE" description="URL
> Resource" hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="SHORT_TEXT" description="Short
> Text" hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="ELECTRONIC_TEXT"
> description="Long Text" hasTable="Y" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="AUDIO_OBJECT"
> description="Audio" hasTable="Y" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="IMAGE_OBJECT"
> description="Image" hasTable="Y" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="OTHER_OBJECT"
> description="Other" hasTable="Y" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="VIDEO_OBJECT"
> description="Video" hasTable="Y" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="SURVEY" description="Survey"
> hasTable="N" parentTypeId=""/>
> - <DataResourceType dataResourceTypeId="SURVEY_RESPONSE"
> description="Survey Response" hasTable="N" parentTypeId=""/>
> -
> - <DataTemplateType dataTemplateTypeId="NONE" description="No Template"
> extension=""/>
> - <DataTemplateType dataTemplateTypeId="FTL" description="FreeMarker"
> extension="ftl"/>
> - <DataTemplateType dataTemplateTypeId="WM" description="WebMacro"
> extension="wm"/>
> - <DataTemplateType dataTemplateTypeId="XSLT" description="XSLT"
> extension="xsl"/>
> - <DataTemplateType dataTemplateTypeId="SCREEN_COMBINED"
> description="Screen widget" extension="xml"/>
> -
> - <DocumentType description="Shipping" documentTypeId="SHIPPING_DOCUMENT"
> hasTable="Y" parentTypeId=""/>
> - <DocumentType description="Bill Of Lading" documentTypeId="BILL_OF_LADING"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> - <DocumentType description="Export" documentTypeId="EXPORT_DOCUMENTATION"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> - <DocumentType description="Haz Mat" documentTypeId="HAZ_MAT_DOCUMENT"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> - <DocumentType description="Manifest" documentTypeId="MANIFEST"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> - <DocumentType description="Other Shipping" documentTypeId="OTHER_SHIP_DOCUMENT"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> - <DocumentType description="Packing Slip" documentTypeId="PACKAGING_SLIP"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> - <DocumentType description="Port Charge" documentTypeId="PORT_CHARGE_DOCUMENT"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> - <DocumentType description="Tax Tariff" documentTypeId="TAX_TARIFF_DOCUMENT"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> -
> <StatusType description="Server Hit" hasTable="N" parentTypeId=""
> statusTypeId="SERVER_HIT_STATUS"/>
> <StatusType description="Web Content" hasTable="N" parentTypeId=""
> statusTypeId="WEB_CONTENT_STATUS"/>
>
> @@ -179,16 +75,6 @@ under the License.
> <SubscriptionType description="Other" hasTable="N" parentTypeId=""
> subscriptionTypeId="OTHER_SUBSCR"/>
> <SubscriptionType description="Product Info" hasTable="N"
> parentTypeId="" subscriptionTypeId="PRODUCT_INFO_SUBSCR"/>
>
> - <!-- website data -->
> - <WebSiteContentType webSiteContentTypeId="BLOG_ROOT"
> description="Blog Root" hasTable="N" parentTypeId=""/>
> - <WebSiteContentType webSiteContentTypeId="DEFAULT_PAGE"
> description="Default Page" hasTable="N" parentTypeId=""/>
> - <WebSiteContentType webSiteContentTypeId="FORUM_ROOT"
> description="Forum Root" hasTable="N" parentTypeId=""/>
> - <WebSiteContentType webSiteContentTypeId="MENU_ROOT"
> description="Menu Containers" hasTable="N" parentTypeId=""/>
> - <WebSiteContentType webSiteContentTypeId="ERROR_ROOT"
> description="Error Page Containers" hasTable="N" parentTypeId=""/>
> - <WebSiteContentType webSiteContentTypeId="PUBLISH_POINT"
> description="Publish Point" hasTable="N" parentTypeId=""/>
> - <WebSiteContentType webSiteContentTypeId="WEB_PAGE" description="Web
> Page" hasTable="N" parentTypeId="" />
> - <WebSiteContentType webSiteContentTypeId="MAINTENANCE_PAGE"
> description="Maintenance Page" hasTable="N" parentTypeId=""/>
> -
> <!-- survey data -->
> <SurveyApplType surveyApplTypeId="CART_ADD" description="Add-To
> Cart"/>
> <SurveyApplType surveyApplTypeId="CHECK_OUT" description="Check-Out"/>
>
> Added: 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=1806258&view=auto
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
> (added)
> +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
> Sat Aug 26 05:54:15 2017
> @@ -0,0 +1,134 @@
> +<?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>
> + <ContentAssocType contentAssocTypeId="TEMPLATE_MEMBER"
> description="Template Member"/>
> + <ContentAssocType contentAssocTypeId="STRUCTURE_DEF"
> description="Document Structure Definition"/>
> + <ContentAssocType contentAssocTypeId="TXFORM_DEF"
> description="Transformation Definition"/>
> + <ContentAssocType contentAssocTypeId="LIST_ENTRY" description="List
> Entry"/>
> + <ContentAssocType contentAssocTypeId="TREE_CHILD" description="Tree
> Child"/>
> + <ContentAssocType contentAssocTypeId="GRAPH_LINK" description="Graph
> Link"/>
> + <ContentAssocType contentAssocTypeId="ALTERNATE_LOCALE"
> description="Alternate Locale"/>
> + <ContentAssocType contentAssocTypeId="ALTERNATE_ROLE"
> description="Alternate Role"/>
> + <ContentAssocType contentAssocTypeId="RESPONSE"
> description="Response"/>
> + <ContentAssocType contentAssocTypeId="SUB_CONTENT"
> description="Sub-Content"/>
> + <ContentAssocType contentAssocTypeId="TOPIC" description="Topic"/>
> + <ContentAssocType contentAssocTypeId="DESCRIPTION"
> description="Description"/>
> +
> + <ContentAssocType contentAssocTypeId="SUBSITE" description="SubSite"/>
> + <ContentAssocType contentAssocTypeId="DEPARTMENT"
> description="Department"/>
> + <ContentAssocType contentAssocTypeId="RELATED_CONTENT"
> description="Related content"/>
> + <ContentAssocType contentAssocTypeId="PUBLISH_LINK"
> description="Publish link"/>
> + <ContentAssocType contentAssocTypeId="ATTRIBUTE"
> description="Attribute"/>
> + <ContentAssocType contentAssocTypeId="AUTHOR" description="Author"/>
> + <ContentAssocType contentAssocTypeId="SUMMARY" description="Summary"/>
> +
> + <ContentAssocType contentAssocTypeId="COMPDOC_PART"
> description="Composite Document Part"/>
> + <ContentAssocType contentAssocTypeId="INSTANCE" description="Instance
> Of"/>
> + <ContentAssocType contentAssocTypeId="ALTERNATIVE_URL"
> description="Alternative URL"/>
> +
> + <ContentAssocPredicate contentAssocPredicateId="member-of"
> description="The object is a member of the subject."/>
> + <ContentAssocPredicate contentAssocPredicateId="defines"
> description="The object defines the subject."/>
> + <ContentAssocPredicate contentAssocPredicateId="extends"
> description="The object extends the subject."/>
> + <ContentAssocPredicate contentAssocPredicateId="related-to"
> description="The object is related to the subject."/>
> + <ContentAssocPredicate contentAssocPredicateId="references"
> description="The object references the subject."/>
> +
> + <ContentAssocPredicate contentAssocPredicateId="topifies"
> description="Topifies"/>
> + <ContentAssocPredicate contentAssocPredicateId="categorizes"
> description="Categorizes"/>
> +
> + <MetaDataPredicate metaDataPredicateId="author-name"
> description="Name of the author or creator of the subject."/>
> + <MetaDataPredicate metaDataPredicateId="author-email"
> description="eMail address of the author or creator of the subject."/>
> + <MetaDataPredicate metaDataPredicateId="event-date" description="The
> date and time of the event in format [yyyy-MM-dd hh:mm:ss]."/>
> + <MetaDataPredicate metaDataPredicateId="event-location"
> description="The location where subject event took place."/>
> + <MetaDataPredicate metaDataPredicateId="event-person-name"
> description="The name of a person involved in the subject event."/>
> +
> + <ContentType contentTypeId="DOCUMENT" description="Document"
> hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="TEMPLATE" description="Template or Form"
> hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="DECORATOR" description="Decorator"
> hasTable="N" parentTypeId="TEMPLATE"/>
> + <ContentType contentTypeId="ANNOTATION" description="Annotation"
> hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="MENU_CONTAINER" description="Menu
> Container" hasTable="N" parentTypeId=""/>
> + <!-- NOTE DEJ20080809 The following 3 ContentTypes may not be needed,
> and the current practice is to just use DOCUMENT instead -->
> + <ContentType contentTypeId="OUTLINE_NODE" description="Outline Node"
> hasTable="N" parentTypeId="DOCUMENT"/>
> + <ContentType contentTypeId="PAGE_NODE" description="Page Node"
> hasTable="N" parentTypeId="DOCUMENT"/>
> + <ContentType contentTypeId="SUBPAGE_NODE" description="Sub Page Node"
> hasTable="N" parentTypeId="DOCUMENT"/>
> + <!-- These ContentTypes are primarily for structuring knowledge -->
> + <ContentType contentTypeId="CONTENT_LIST" description="Content List"
> hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="TREE_ROOT" description="Tree Root"
> hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="GRAPH_ROOT" description="Graph Root"
> hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="STRUCTURE_NODE" description="Structure
> Node" hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="STRUCTURE_LEAF" description="Structure
> Leaf" hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="STRUCTURE_DEF" description="Structure
> Definition (like DTD)" hasTable="N" parentTypeId=""/>
> + <ContentType contentTypeId="TXFORM_DEF" description="Transformation
> Definition (like XSLT)" hasTable="N" parentTypeId=""/>
> +
> + <ContentType contentTypeId="PLACEHOLDER" description="Place Holder"/>
> + <ContentType contentTypeId="WEB_SITE_PUB_PT"
> parentTypeId="PLACEHOLDER" hasTable="Y" description="Web Site Publish
> Point"/>
> + <ContentType contentTypeId="FORUM_ROOT" parentTypeId="PLACEHOLDER"
> hasTable="N" description="Forum Root"/>
> + <ContentType contentTypeId="BLOG_ROOT" parentTypeId="PLACEHOLDER"
> hasTable="N" description="Blog Root"/>
> + <ContentType contentTypeId="FAQ_ROOT" parentTypeId="PLACEHOLDER"
> hasTable="N" description="FAQ Root"/>
> + <ContentType contentTypeId="DEPARTMENT" description="Department"
> parentTypeId="PLACEHOLDER"/>
> + <ContentType contentTypeId="PEOPLE" description="People"
> parentTypeId="PLACEHOLDER"/>
> + <ContentType contentTypeId="PERSON" description="Person"
> parentTypeId="PLACEHOLDER"/>
> + <ContentType contentTypeId="TOPIC" description="Topic"
> parentTypeId="PLACEHOLDER"/>
> +
> + <ContentType contentTypeId="COMPDOC_TEMPLATE" description="Composite
> Document Template"/>
> + <ContentType contentTypeId="COMPDOC_INSTANCE" description="Composite
> Document Instance"/>
> +
> + <DataResourceType dataResourceTypeId="LOCAL_FILE" description="Local
> File" hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="OFBIZ_FILE" description="File
> (rel to OFBIZ_HOME)" hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="CONTEXT_FILE"
> description="File (rel to webapp root)" hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="LOCAL_FILE_BIN"
> description="Local Binary File" hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="OFBIZ_FILE_BIN"
> description="Binary File (rel to OFBIZ_HOME)" hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="CONTEXT_FILE_BIN"
> description="Binary File (rel to webapp root)" hasTable="N"
> parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="LINK" description="HyperLink"
> hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="URL_RESOURCE" description="URL
> Resource" hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="SHORT_TEXT" description="Short
> Text" hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="ELECTRONIC_TEXT"
> description="Long Text" hasTable="Y" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="AUDIO_OBJECT"
> description="Audio" hasTable="Y" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="IMAGE_OBJECT"
> description="Image" hasTable="Y" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="OTHER_OBJECT"
> description="Other" hasTable="Y" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="VIDEO_OBJECT"
> description="Video" hasTable="Y" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="SURVEY" description="Survey"
> hasTable="N" parentTypeId=""/>
> + <DataResourceType dataResourceTypeId="SURVEY_RESPONSE"
> description="Survey Response" hasTable="N" parentTypeId=""/>
> +
> + <DataTemplateType dataTemplateTypeId="NONE" description="No Template"
> extension=""/>
> + <DataTemplateType dataTemplateTypeId="FTL" description="FreeMarker"
> extension="ftl"/>
> + <DataTemplateType dataTemplateTypeId="WM" description="WebMacro"
> extension="wm"/>
> + <DataTemplateType dataTemplateTypeId="XSLT" description="XSLT"
> extension="xsl"/>
> + <DataTemplateType dataTemplateTypeId="SCREEN_COMBINED"
> description="Screen widget" extension="xml"/>
> +
> + <DocumentType description="Shipping" documentTypeId="SHIPPING_DOCUMENT"
> hasTable="Y" parentTypeId=""/>
> + <DocumentType description="Bill Of Lading" documentTypeId="BILL_OF_LADING"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> + <DocumentType description="Export" documentTypeId="EXPORT_DOCUMENTATION"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> + <DocumentType description="Haz Mat" documentTypeId="HAZ_MAT_DOCUMENT"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> + <DocumentType description="Manifest" documentTypeId="MANIFEST"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> + <DocumentType description="Other Shipping" documentTypeId="OTHER_SHIP_DOCUMENT"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> + <DocumentType description="Packing Slip" documentTypeId="PACKAGING_SLIP"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> + <DocumentType description="Port Charge" documentTypeId="PORT_CHARGE_DOCUMENT"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> + <DocumentType description="Tax Tariff" documentTypeId="TAX_TARIFF_DOCUMENT"
> hasTable="N" parentTypeId="SHIPPING_DOCUMENT"/>
> +
> + <!-- website data -->
> + <WebSiteContentType webSiteContentTypeId="BLOG_ROOT"
> description="Blog Root" hasTable="N" parentTypeId=""/>
> + <WebSiteContentType webSiteContentTypeId="DEFAULT_PAGE"
> description="Default Page" hasTable="N" parentTypeId=""/>
> + <WebSiteContentType webSiteContentTypeId="FORUM_ROOT"
> description="Forum Root" hasTable="N" parentTypeId=""/>
> + <WebSiteContentType webSiteContentTypeId="MENU_ROOT"
> description="Menu Containers" hasTable="N" parentTypeId=""/>
> + <WebSiteContentType webSiteContentTypeId="ERROR_ROOT"
> description="Error Page Containers" hasTable="N" parentTypeId=""/>
> + <WebSiteContentType webSiteContentTypeId="PUBLISH_POINT"
> description="Publish Point" hasTable="N" parentTypeId=""/>
> + <WebSiteContentType webSiteContentTypeId="WEB_PAGE" description="Web
> Page" hasTable="N" parentTypeId="" />
> + <WebSiteContentType webSiteContentTypeId="MAINTENANCE_PAGE"
> description="Maintenance Page" hasTable="N" parentTypeId=""/>
> +</entity-engine-xml>
> \ No newline at end of file
>
> Propchange: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/
> seed/ContentSeedData.xml
> ------------------------------------------------------------
> ------------------
> svn:eol-style = native
>
> Propchange: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/
> seed/ContentSeedData.xml
> ------------------------------------------------------------
> ------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/
> seed/ContentSeedData.xml
> ------------------------------------------------------------
> ------------------
> svn:mime-type = text/xml
>
> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-
> component.xml
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> applications/datamodel/ofbiz-component.xml?rev=1806258&r1=
> 1806257&r2=1806258&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-component.xml
> (original)
> +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/ofbiz-component.xml
> Sat Aug 26 05:54:15 2017
> @@ -35,4 +35,5 @@ under the License.
> <entity-resource type="model" reader-name="main" loader="main"
> location="entitydef/workeffort-entitymodel.xml"/>
>
> <entity-resource type="data" reader-name="seed" loader="main"
> location="data/seed/PartySeedData.xml"/>
> + <entity-resource type="data" reader-name="seed" loader="main"
> location="data/seed/ContentSeedData.xml"/>
> </ofbiz-component>
>
> Modified: ofbiz/ofbiz-framework/trunk/build.gradle
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> build.gradle?rev=1806258&r1=1806257&r2=1806258&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/build.gradle (original)
> +++ ofbiz/ofbiz-framework/trunk/build.gradle Sat Aug 26 05:54:15 2017
> @@ -149,6 +149,7 @@ dependencies {
> runtime 'de.odysseus.juel:juel-spi:2.2.7'
> runtime 'net.sf.barcode4j:barcode4j-fop-ext:2.1'
> runtime 'net.sf.barcode4j:barcode4j:2.1'
> + runtime 'org.postgresql:postgresql:9.3-1104-jdbc41'
> runtime 'org.apache.axis2:axis2-transport-http:1.7.1'
> runtime 'org.apache.axis2:axis2-transport-local:1.7.1'
> runtime 'org.apache.derby:derby:10.11.1.1'
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/
> general.properties
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/common/config/general.properties?rev=
> 1806258&r1=1806257&r2=1806258&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties
> Sat Aug 26 05:54:15 2017
> @@ -80,10 +80,10 @@ defaultFromEmailAddress=ofbiztest@exampl
> # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>
> # -- mail notifications enabled (Y|N)
> -mail.notifications.enabled=N
> +mail.notifications.enabled=Y
>
> # -- redirect all mail notifications to this address for testing
> -#mail.notifications.redirectTo=
> +mail.notifications.redirectTo=rishisolankii@gmail.com
>
> # -- the default mail server to use
> mail.smtp.relay.host=localhost
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/entity/config/
> entityengine.xml
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/entity/config/entityengine.xml?rev=1806258&
> r1=1806257&r2=1806258&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
> Sat Aug 26 05:54:15 2017
> @@ -52,19 +52,19 @@ access. For a detailed description see t
> <debug-xa-resources value="false" /> <!-- see
> https://issues.apache.org/jira/browse/OFBIZ-4282 for more -->
>
> <delegator name="default" entity-model-reader="main"
> entity-group-reader="main" entity-eca-reader="main" distributed-cache-clear-
> enabled="false">
> - <group-map group-name="org.apache.ofbiz"
> datasource-name="localderby"/>
> + <group-map group-name="org.apache.ofbiz" datasource-name="
> localpostgres"/>
> <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> localderbyolap"/>
> <group-map group-name="org.apache.ofbiz.tenant" datasource-name="
> localderbytenant"/>
> </delegator>
> <delegator name="default-no-eca" entity-model-reader="main"
> entity-group-reader="main" entity-eca-reader="main"
> entity-eca-enabled="false" distributed-cache-clear-enabled="false">
> - <group-map group-name="org.apache.ofbiz"
> datasource-name="localderby"/>
> + <group-map group-name="org.apache.ofbiz" datasource-name="
> localpostgres"/>
> <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> localderbyolap"/>
> <group-map group-name="org.apache.ofbiz.tenant" datasource-name="
> localderbytenant"/>
> </delegator>
>
> <!-- be sure that your default delegator (or the one you use) uses
> the same datasource for test. You must run "gradlew loadAll" before running
> "gradlew testIntegration" -->
> <delegator name="test" entity-model-reader="main"
> entity-group-reader="main" entity-eca-reader="main">
> - <group-map group-name="org.apache.ofbiz"
> datasource-name="localderby"/>
> + <group-map group-name="org.apache.ofbiz" datasource-name="
> localpostgres"/>
> <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> localderbyolap"/>
> <group-map group-name="org.apache.ofbiz.tenant" datasource-name="
> localderbytenant"/>
> </delegator>
> @@ -483,9 +483,9 @@ access. For a detailed description see t
> <read-data reader-name="ext-demo"/>
> <inline-jdbc
> jdbc-driver="org.postgresql.Driver"
> - jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz"
> - jdbc-username="ofbiz"
> - jdbc-password="ofbiz"
> + jdbc-uri="jdbc:postgresql://127.0.0.1/plain_ofbiz_test"
> + jdbc-username="rishi"
> + jdbc-password="123456"
> isolation-level="ReadCommitted"
> pool-minsize="2"
> pool-maxsize="250"
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/webtools/template/Main.ftl?rev=1806258&r1=
> 1806257&r2=1806258&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl Sat
> Aug 26 05:54:15 2017
> @@ -17,6 +17,10 @@ specific language governing permissions
> under the License.
> -->
> <div class="screenlet">
> +<#assign test=Static["java.lang.String"].format("http://example.com/
> page?a=1&b=2") >
> +<p>result1=${test}</p>
> +<p>result2=${test?url('utf-8')}</p>
> +
> <div class="screenlet-title-bar">
> <ul>
> <li class="h3">${uiLabelMap.WebtoolsMainPage}</li>
>
>
>