You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/04/19 19:38:37 UTC
svn commit: r1739967 - in /ofbiz/trunk/applications/product:
data/CatalogSystemPropertyData.xml ofbiz-component.xml
Author: jleroux
Date: Tue Apr 19 17:38:36 2016
New Revision: 1739967
URL: http://svn.apache.org/viewvc?rev=1739967&view=rev
Log:
Modified patches from Pierre Smits for "Have configuration options for catalog webapp" https://issues.apache.org/jira/browse/OFBIZ-6192
This patch addresses the integration of CatalogSystemPropertyData.xml in the ofbiz-component.xml of the Product component, this is for the catalog webapp (based on catalog.properties)
Added:
ofbiz/trunk/applications/product/data/CatalogSystemPropertyData.xml (with props)
Modified:
ofbiz/trunk/applications/product/ofbiz-component.xml
Added: ofbiz/trunk/applications/product/data/CatalogSystemPropertyData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/CatalogSystemPropertyData.xml?rev=1739967&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/data/CatalogSystemPropertyData.xml (added)
+++ ofbiz/trunk/applications/product/data/CatalogSystemPropertyData.xml Tue Apr 19 17:38:36 2016
@@ -0,0 +1,127 @@
+<?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>
+
+# ==== Catalog Application Properties ====
+<!--
+# Image upload path on the server
+catalog.properties setting is: image.server.path=${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/${tenantId}
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.server.path" systemPropertyValue="${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/${tenantId}"
+ description="Image upload path on the server."
+ />
+
+<!--
+# The prefix to put on auto-generated image urls (can be relative or absolute, whatever you want)
+catalog.properties setting is: image.url.prefix=/images/${tenantId}
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.url.prefix" systemPropertyValue="/images/${tenantId}"
+ description="The prefix to put on auto-generated image urls. This can be relative or absolute."
+ />
+
+<!--
+# The format of the image filename
+catalog.properties setting is: image.filename.format=${location}/${id}/${type}
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.filename.format" systemPropertyValue="${location}/${id}/${type}"
+ description="The format of the image filename."
+ />
+
+<!--
+#Format of the Additional View Size
+catalog.properties setting is: image.filename.additionalviewsize.format=${location}/${id}/${viewtype}/${sizetype}
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.filename.additionalviewsize.format" systemPropertyValue="${location}/${id}/${viewtype}/${sizetype}"
+ description="Format of the Additional View Size."
+ />
+
+<!--
+# The default top category to display
+catalog.properties setting is: top.category.default=CATALOG1
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="top.category.default" systemPropertyValue="CATALOG1"
+ description="The default top category to display."
+ />
+
+<!--
+# The category that has all products
+catalog.properties setting is: all.product.category=CATALOG1
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="all.product.category" systemPropertyValue="CATALOG1"
+ description="The category that has all products."
+ />
+
+<!--
+# Flag to re-active products when they are received
+catalog.properties setting is: reactivate.product.from.receipt=Y
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="reactivate.product.from.receipt" systemPropertyValue="Y"
+ description="Flag to re-active products when they are received. Choices are Y or N."
+ />
+
+<!--
+# Image upload path on the image management
+catalog.properties setting is: image.management.path=${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/products/management
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.management.path" systemPropertyValue="${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/products/management"
+ description="Image upload path for image management."
+ />
+
+<!--
+# Image management url path
+catalog.properties setting is: image.management.url=/images/products/management
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.management.url" systemPropertyValue="/images/products/management"
+ description="Image management url path."
+ />
+
+<!--
+# Image management Thumbnail Name
+catalog.properties setting is: image.management.nameofthumbnail=-100
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.management.nameofthumbnail" systemPropertyValue="-100"
+ description="Image management Thumbnail Name."
+ />
+
+<!--
+# Auto approve image
+catalog.properties setting is: image.management.autoApproveImage=Y
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.management.autoApproveImage" systemPropertyValue="Y"
+ description="Auto approve image. Choices are Y or N."
+ />
+
+<!--
+# Auto approve multiple images
+catalog.properties setting is: image.management.multipleApproval=N
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="image.management.multipleApproval" systemPropertyValue="N"
+ description="Auto approve multiple images. Choices are Y or N."
+ />
+
+<!--
+# Automatic product price currency conversion
+catalog.properties setting is: convertProductPriceCurrency=false
+-->
+ <SystemProperty systemResourceId="catalog" systemPropertyId="convertProductPriceCurrency" systemPropertyValue="false"
+ description="Automatic product price currency conversion. Choices are boolean."
+ />
+
+</entity-engine-xml>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/product/data/CatalogSystemPropertyData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/data/CatalogSystemPropertyData.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/product/data/CatalogSystemPropertyData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=1739967&r1=1739966&r2=1739967&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Tue Apr 19 17:38:36 2016
@@ -29,17 +29,21 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
- <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ProductScheduledServices.xml"/>
+
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ShipmentTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/FacilitySecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/FacilitySecurityGroupDemoData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductPortletData.xml"/>
+
+ <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ProductScheduledServices.xml"/>
+ <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/CatalogSystemPropertyData.xml"/>
+
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/FacilitySecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_facility.xml"/>