svn commit: r1747789 - in /ofbiz/trunk/specialpurpose/googlebase: groovyScripts/ minilang/GooglebaseServices.xml webapp/googlebase/WEB-INF/actions/ widget/GoogleBaseForms.xml widget/GoogleBaseScreens.xml

[Deepak Dixit-5]

Author: deepak
Date: Fri Jun 10 19:45:28 2016
New Revision: 1747789

URL: http://svn.apache.org/viewvc?rev=1747789&view=rev
Log:
(OFBIZ-7239) Relocate .groovy files in the specialpurpose/googlebase component

Added:
    ofbiz/trunk/specialpurpose/googlebase/groovyScripts/
      - copied from r1747740, ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/
Removed:
    ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/
Modified:
    ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml
    ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml
    ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml

Modified: ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml?rev=1747789&r1=1747788&r2=1747789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml Fri Jun 10 19:45:28 2016
@@ -93,7 +93,7 @@
             <log level="info" message="=== trackingCodeIds: ${trackingCodeIds[indexOfSetting]}"/>
             <log level="info" message="=== allowRecommendeds: ${allowRecommendeds[indexOfSetting]}"/>
             <set field="parameters.productStoreId" from-field="productStoreId"/>
-            <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy"/>
+            <script location="component://googlebase/groovyScripts/productsToGooglebase.groovy"/>
             <!-- iterate each CatalogList in each ProductStore -->
             <iterate entry="catalogCategoryIds" list="categoryIds">
                 <if-not-empty field="catalogCategoryIds">
@@ -126,7 +126,7 @@
                 </then>
             </if>
             <if-not-empty field="productList">
-                <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy"/>
+                <script location="component://googlebase/groovyScripts/googlebaseDivideList.groovy"/>
                 <set field="i" value="0" type="Integer"/>
                 <iterate entry="productExportList" list="productExportLists">
                     <iterate entry="checkProductId" list="productExportList">

Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml?rev=1747789&r1=1747788&r2=1747789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml Fri Jun 10 19:45:28 2016
@@ -111,7 +111,7 @@ under the License.
     <form name="GooglebaseAutoUpdateConfig" type="list" list-name="configList" header-row-style="header-row-2"
         default-table-style="basic-table hover-bar" odd-row-style="alternate-row">
         <actions>
-            <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy"/>
+            <script location="component://googlebase/groovyScripts/autoUpdateConfig.groovy"/>
         </actions>
         <field name="productStoreId"><display/></field>
         <field name="outOfStock" title="Update if product is out of stock"><display/></field>

Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=1747789&r1=1747788&r2=1747789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Fri Jun 10 19:45:28 2016
@@ -30,7 +30,7 @@ under the License.
                     <order-by field-name="description"/>
                 </entity-condition>
                 <script location="component://product/groovyScripts/catalog/find/advancedsearchoptions.groovy"/>
-                <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy"/>
+                <script location="component://googlebase/groovyScripts/GoogleBaseAdvancedSearch.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFindDecorator" location="${parameters.mainDecoratorLocation}">
@@ -50,7 +50,7 @@ under the License.
                 <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitleSearchResults"/>
                 <script location="component://product/groovyScripts/catalog/find/keywordsearch.groovy"/>
-                <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy"/>
+                <script location="component://googlebase/groovyScripts/FilterProducts.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFindDecorator" location="${parameters.mainDecoratorLocation}">
@@ -72,7 +72,7 @@ under the License.
             <actions>
                 <set field="headerItem" value="googlebase"/>
                 <set field="titleProperty" value="PageTitleGoogleBaseProductsExportToGoogle"/>
-                <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/productsExportToGoogle.groovy"/>
+                <script location="component://googlebase/groovyScripts/productsExportToGoogle.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">