svn commit: r1806084 - in /ofbiz/ofbiz-framework/trunk: applications/order/data/ applications/product/config/ applications/product/data/ applications/product/minilang/product/catalog/ framework/images/ themes/common/ themes/common/webapp/images/

[nmalin]

Author: nmalin
Date: Thu Aug 24 20:38:19 2017
New Revision: 1806084

URL: http://svn.apache.org/viewvc?rev=1806084&view=rev
Log:
Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Second step, move all images and js library on the common-theme component and move the dedicate webapp image (for continuous compatibility)
The components image is removed from framework.

Warning this commit raise the problem that many images has been uploaded on the framework directory (properties image.server.path and image.management.path) and we need to found a solution to set them out static folder to a dynamic folder like runtime.

Added:
    ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/
      - copied from r1806083, ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/
Removed:
    ofbiz/ofbiz-framework/trunk/framework/images/
Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/data/DemoProduct.xml
    ofbiz/ofbiz-framework/trunk/applications/product/config/catalog.properties
    ofbiz/ofbiz-framework/trunk/applications/product/data/CatalogSystemPropertyData.xml
    ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/catalog/CatalogServices.xml
    ofbiz/ofbiz-framework/trunk/themes/common/ofbiz-component.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/order/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/data/DemoProduct.xml?rev=1806084&r1=1806083&r2=1806084&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/data/DemoProduct.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/data/DemoProduct.xml Thu Aug 24 20:38:19 2017
@@ -634,7 +634,7 @@ under the License.
   
     <!-- test Digital Download product -->
     <Product productId="GZ-DIG" productTypeId="DIGITAL_GOOD" primaryProductCategoryId="101" productName="Digital Gizmo" internalName="Digital Gizmo" description="A digital gizmo: can be downloaded immediately after purchase." longDescription="This gizmo is part of an exciting new breed that needs no corporeal form: it is all digital! Buy and download it now!" taxable="Y" chargeShipping="N" autoCreateKeywords="Y" isVirtual="N" isVariant="N" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
-    <DataResource dataResourceId="GZ-DIG" dataResourceTypeId="OFBIZ_FILE_BIN" mimeTypeId="image/gif" dataResourceName="Digital Gizmo Image" objectInfo="framework/images/webapp/images/ofbiz_logo.gif"/>
+    <DataResource dataResourceId="GZ-DIG" dataResourceTypeId="OFBIZ_FILE_BIN" mimeTypeId="image/gif" dataResourceName="Digital Gizmo Image" objectInfo="themes/common/webapp/images/ofbiz_logo.gif"/>
     <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="GZ-DIG-ALT" localeString="en"/>
     <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRGZ-DIG-ALTEN" localeString="en_US"/>
     <ElectronicText dataResourceId="GZ-DIG-ALT" textData="digital-gizmo"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/config/catalog.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/catalog.properties?rev=1806084&r1=1806083&r2=1806084&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/config/catalog.properties (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/config/catalog.properties Thu Aug 24 20:38:19 2017
@@ -21,7 +21,8 @@
 
 
 # -- Image upload path on the server
-image.server.path=${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/${tenantId}
+#FIXME the image server path need to be move on runtime
+image.server.path=${sys:getProperty('ofbiz.home')}/themes/common/images/webapp/images/${tenantId}
 
 # -- The prefix to put on auto-generated image urls (can be relative or absolute, whatever you want)
 image.url.prefix=/images/${tenantId}
@@ -36,7 +37,8 @@ all.product.category=CATALOG1
 reactivate.product.from.receipt=Y
 
 # Image upload path on the image management
-image.management.path=${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/products/management
+#FIXME the image management path need to be move on runtime
+image.management.path=${sys:getProperty('ofbiz.home')}/themes/common/webapp/images/products/management
 image.management.url=/images/products/management
 image.management.nameofthumbnail=-100
 image.management.autoApproveImage=Y

Modified: ofbiz/ofbiz-framework/trunk/applications/product/data/CatalogSystemPropertyData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/data/CatalogSystemPropertyData.xml?rev=1806084&r1=1806083&r2=1806084&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/data/CatalogSystemPropertyData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/data/CatalogSystemPropertyData.xml Thu Aug 24 20:38:19 2017
@@ -22,9 +22,9 @@ under the License.
 # ==== 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}
+catalog.properties setting is: image.server.path=${sys:getProperty('ofbiz.home')}/themes/common/webapp/images/${tenantId}
 -->
-    <SystemProperty systemResourceId="catalog" systemPropertyId="image.server.path" systemPropertyValue="${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/${tenantId}"
+    <SystemProperty systemResourceId="catalog" systemPropertyId="image.server.path" systemPropertyValue="${sys:getProperty('ofbiz.home')}/themes/common/webapp/images/${tenantId}"
     description="Image upload path on the server."
     />
     
@@ -78,9 +78,9 @@ catalog.properties setting is: reactivat
     
 <!--
 # Image upload path on the image management
-catalog.properties setting is: image.management.path=${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/products/management
+catalog.properties setting is: image.management.path=${sys:getProperty('ofbiz.home')}/themes/common/webapp/images/products/management
 -->
-    <SystemProperty systemResourceId="catalog" systemPropertyId="image.management.path" systemPropertyValue="${sys:getProperty('ofbiz.home')}/framework/images/webapp/images/products/management"
+    <SystemProperty systemResourceId="catalog" systemPropertyId="image.management.path" systemPropertyValue="${sys:getProperty('ofbiz.home')}/themes/common/webapp/images/products/management"
     description="Image upload path for image management."
     />
     

Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/catalog/CatalogServices.xml?rev=1806084&r1=1806083&r2=1806084&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/catalog/CatalogServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/catalog/CatalogServices.xml Thu Aug 24 20:38:19 2017
@@ -412,7 +412,7 @@ under the License.
                 </call-class-method>
             </then>
             <else>
-                <set field="imageUrl" value="/framework/images/webapp${parameters.imageUrl}"/>
+                <set field="imageUrl" value="/themes/common/webapp${parameters.imageUrl}"/>
                 <call-class-method method-name="fromOfbizHomePath" class-name="org.apache.ofbiz.base.util.UtilURL" ret-field="url">
                    <string value="${imageUrl}"/>
                 </call-class-method>

Modified: ofbiz/ofbiz-framework/trunk/themes/common/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/ofbiz-component.xml?rev=1806084&r1=1806083&r2=1806084&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/ofbiz-component.xml Thu Aug 24 20:38:19 2017
@@ -36,4 +36,10 @@ under the License.
         location="webapp/common"
         mount-point="/common"
         app-bar-display="false"/>
+    <webapp name="images"
+            title="Images"
+            server="default-server"
+            location="webapp/images"
+            mount-point="/images"
+            app-bar-display="false"/>
 </ofbiz-component>