From bdeaa73916a7c7bdacce55902c0d29e775a446e6 Mon Sep 17 00:00:00 2001
From: Jacques Le Roux <jleroux@apache.org>
Date: Mon, 21 Jul 2014 07:32:10 +0000
Subject: [PATCH] Since we removed the specialpurpose components (but
 ecommerce), there was an issue with ordermgr js scripts.

The problem was double. It'd have been easy to add the missing "/js:" patch in allowedPaths in the web.xml of birt component from where the js scripts are now expected to be loaded in trunk.
But then you would need to also copy the js scripst there (in birt component). You could not simply move them because for upcoming branches we also need them in ordermgr component (they were there in images/js) else they would miss again.

This commit rather adds them under a simple ordermgr-js new webapp (simple, ie like framework/images, only to load resources) under commonext: applications/commonext/webapp/ordermgr-js to prevent the duplication maintenance hazards.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1612202 13f79535-47bb-0310-9956-ffa450edef68
---
 applications/commonext/ofbiz-component.xml                | 8 ++++++++
 .../js => commonext/webapp/ordermgr-js}/ConvertUom.js     | 0
 .../webapp/ordermgr-js}/OrderShippingInfo.js              | 0
 .../webapp/ordermgr-js}/geoAutoCompleter.js               | 0
 .../images/js => commonext/webapp/ordermgr-js}/order.js   | 0
 .../images/js => commonext/webapp/ordermgr-js}/return.js  | 0
 applications/order/widget/ordermgr/OrderReturnScreens.xml | 2 +-
 applications/order/widget/ordermgr/OrderViewScreens.xml   | 6 +++---
 applications/product/widget/facility/FacilityScreens.xml  | 2 +-
 specialpurpose/ecommerce/widget/CustomerScreens.xml       | 4 ++--
 specialpurpose/ecommerce/widget/OrderScreens.xml          | 2 +-
 11 files changed, 16 insertions(+), 8 deletions(-)
 rename applications/{order/webapp/ordermgr/images/js => commonext/webapp/ordermgr-js}/ConvertUom.js (100%)
 rename applications/{order/webapp/ordermgr/images/js => commonext/webapp/ordermgr-js}/OrderShippingInfo.js (100%)
 rename applications/{order/webapp/ordermgr/images/js => commonext/webapp/ordermgr-js}/geoAutoCompleter.js (100%)
 rename applications/{order/webapp/ordermgr/images/js => commonext/webapp/ordermgr-js}/order.js (100%)
 rename applications/{order/webapp/ordermgr/images/js => commonext/webapp/ordermgr-js}/return.js (100%)

diff --git a/applications/commonext/ofbiz-component.xml b/applications/commonext/ofbiz-component.xml
index 2d6b82a263e..6e3a82ef6bd 100644
--- a/applications/commonext/ofbiz-component.xml
+++ b/applications/commonext/ofbiz-component.xml
@@ -44,4 +44,12 @@ under the License.
         location="webapp/ofbizsetup"
         base-permission="OFBTOOLS,SETUP"
         mount-point="/ofbizsetup"/>
+    
+    <webapp name="ordermgr-js"
+        title="ordermgr-js"
+        server="default-server"
+        location="webapp/ordermgr-js"
+        mount-point="/ordermgr-js"
+        app-bar-display="false"/>
+    
 </ofbiz-component>
diff --git a/applications/order/webapp/ordermgr/images/js/ConvertUom.js b/applications/commonext/webapp/ordermgr-js/ConvertUom.js
similarity index 100%
rename from applications/order/webapp/ordermgr/images/js/ConvertUom.js
rename to applications/commonext/webapp/ordermgr-js/ConvertUom.js
diff --git a/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js b/applications/commonext/webapp/ordermgr-js/OrderShippingInfo.js
similarity index 100%
rename from applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js
rename to applications/commonext/webapp/ordermgr-js/OrderShippingInfo.js
diff --git a/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
similarity index 100%
rename from applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js
rename to applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
diff --git a/applications/order/webapp/ordermgr/images/js/order.js b/applications/commonext/webapp/ordermgr-js/order.js
similarity index 100%
rename from applications/order/webapp/ordermgr/images/js/order.js
rename to applications/commonext/webapp/ordermgr-js/order.js
diff --git a/applications/order/webapp/ordermgr/images/js/return.js b/applications/commonext/webapp/ordermgr-js/return.js
similarity index 100%
rename from applications/order/webapp/ordermgr/images/js/return.js
rename to applications/commonext/webapp/ordermgr-js/return.js
diff --git a/applications/order/widget/ordermgr/OrderReturnScreens.xml b/applications/order/widget/ordermgr/OrderReturnScreens.xml
index 91d14320124..db7726725f3 100644
--- a/applications/order/widget/ordermgr/OrderReturnScreens.xml
+++ b/applications/order/widget/ordermgr/OrderReturnScreens.xml
@@ -88,7 +88,7 @@ under the License.
                 <set field="titleProperty" value="PageTitleReturnHeader"/>
                 <set field="headerItem" value="return"/>
                 <set field="tabButtonItem" value="OrderReturnHeader"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/ordermgr/images/js/return.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/ordermgr-js/return.js" global="true"/>
                 <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy"/>
             </actions>
diff --git a/applications/order/widget/ordermgr/OrderViewScreens.xml b/applications/order/widget/ordermgr/OrderViewScreens.xml
index 7ed56ee197e..7c0fa48343b 100644
--- a/applications/order/widget/ordermgr/OrderViewScreens.xml
+++ b/applications/order/widget/ordermgr/OrderViewScreens.xml
@@ -52,9 +52,9 @@ under the License.
             <actions>
                 <set field="titleProperty" value="OrderViewOrder"/>
                 <set field="headerItem" value="findorders"/>
-                <set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/order.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/OrderShippingInfo.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/order.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/OrderShippingInfo.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy"/>
             </actions>
diff --git a/applications/product/widget/facility/FacilityScreens.xml b/applications/product/widget/facility/FacilityScreens.xml
index aec8d2d7da1..c9a00864655 100644
--- a/applications/product/widget/facility/FacilityScreens.xml
+++ b/applications/product/widget/facility/FacilityScreens.xml
@@ -1093,7 +1093,7 @@ under the License.
                 <entity-one entity-name="Facility" value-field="facility"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap"/>
                 <set field="title" value="${uiLabelMap.ProductReceiveInventory}"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/ordermgr/images/js/ConvertUom.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/ordermgr-js/ConvertUom.js" global="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
diff --git a/specialpurpose/ecommerce/widget/CustomerScreens.xml b/specialpurpose/ecommerce/widget/CustomerScreens.xml
index 4a2fd111d95..61d0ea4fb8b 100644
--- a/specialpurpose/ecommerce/widget/CustomerScreens.xml
+++ b/specialpurpose/ecommerce/widget/CustomerScreens.xml
@@ -553,7 +553,7 @@ under the License.
                 <property-map resource="SecurityextUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitleNewCustomer"/>
                 <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/profile.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -616,7 +616,7 @@ under the License.
                 <set field="partyId" from-field="userLogin.partyId"/>
 
                 <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/profile.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy"/>
diff --git a/specialpurpose/ecommerce/widget/OrderScreens.xml b/specialpurpose/ecommerce/widget/OrderScreens.xml
index 72997858916..4f0d3cfb938 100644
--- a/specialpurpose/ecommerce/widget/OrderScreens.xml
+++ b/specialpurpose/ecommerce/widget/OrderScreens.xml
@@ -612,7 +612,7 @@ under the License.
             <actions>
                 <set field="titleProperty" value="EcommerceOnePageCheckout"/>
                 <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/checkoutProcess.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy"/>