svn commit: r1743949 - in /ofbiz/trunk: applications/humanres/widget/ applications/order/template/reports/ applications/order/webapp/ordermgr/WEB-INF/actions/ applications/product/template/store/ applications/product/webapp/catalog/WEB-INF/ application...

Author: jleroux
Date: Sun May 15 18:44:19 2016
New Revision: 1743949

URL: http://svn.apache.org/viewvc?rev=1743949&view=rev
Log:
Closes "Move all Groovy scripts in components WEB-INF/actions sub-folders" - https://issues.apache.org/jira/browse/OFBIZ-6981

Currently there are few Groovy scripts not in components WEB-INF/actions sub-folders.
Before moving Groovy scripts as we decided in OFBIZ-6810 we should move the few Groovy scripts not in components WEB-INF/actions sub-folders to these WEB-INF/actions sub-folders. So we will not miss one and it will be a "straightforward" task to move then as we decided in OFBIZ-6810.
Note: most of the Groovy scripts not in components WEB-INF/actions sub-folders are related with events. But not all events related Groovy scripts are not placed components WEB-INF/actions sub-folders, just a very few. There are other cases were Groovy scripts are not in components WEB-INF/actions sub-folders, like ShowProductionRun.groovy and OrderReportPrepare.groovy...




Added:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/OrderReportPrepare.groovy
      - copied unchanged from r1743661, ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/prepareCreateShipMeth.groovy
      - copied unchanged from r1743661, ofbiz/trunk/applications/product/template/store/prepareCreateShipMeth.groovy
    ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/actions/
    ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/actions/isCalOwner.groovy
      - copied unchanged from r1743661, ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/EcommerceSetup.groovy
      - copied unchanged from r1743661, ofbiz/trunk/specialpurpose/ecommerce/widget/EcommerceSetup.groovy
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/ProcessPaymentSettings.groovy
      - copied unchanged from r1743661, ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy
Removed:
    ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
    ofbiz/trunk/applications/product/template/store/prepareCreateShipMeth.groovy
    ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy
    ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy
    ofbiz/trunk/specialpurpose/ecommerce/widget/EcommerceSetup.groovy
Modified:
    ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=1743949&r1=1743948&r2=1743949&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Sun May 15 18:44:19 2016
@@ -120,7 +120,7 @@
         <section>
             <actions>
                 <entity-one entity-name="WorkEffort" value-field="workEffort"/>
-                <script location="component://workeffort/script/isCalOwner.groovy"/>
+                <script location="component:///workeffort/webapp/ical/WEB-INF/actions/isCalOwner.groovy"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <set field="trainingClassTypeId" from-field="workEffort.workEffortName"/>
                 <set field="workEffortTypeId" from-field="workEffort.workEffortTypeId"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1743949&r1=1743948&r2=1743949&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sun May 15 18:44:19 2016
@@ -2103,7 +2103,7 @@ under the License.
     </request-map>
     <request-map uri="prepareCreateShipMeth">
         <security https="true" auth="true"/>
-        <event type="groovy" path="component://product/webapp/catalog/store/prepareCreateShipMeth.groovy"/>
+        <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/prepareCreateShipMeth.groovy"/>
         <response name="success" type="view" value="EditProductStoreShipSetup"/>
         <response name="error" type="view" value="EditProductStoreShipSetup"/>
     </request-map>

Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=1743949&r1=1743948&r2=1743949&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Sun May 15 18:44:19 2016
@@ -154,7 +154,7 @@ under the License.
                         <not><if-empty field="workEffort" /></not>
                     </condition>
                     <actions>
-                        <script location="component://workeffort/script/isCalOwner.groovy" />
+                        <script location="component:///workeffort/webapp/ical/WEB-INF/actions/isCalOwner.groovy" />
                     </actions>
                     <widgets />
                 </section>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1743949&r1=1743948&r2=1743949&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Sun May 15 18:44:19 2016
@@ -52,7 +52,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.js" global="true"/>
                 <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" global="true" />
 
-                <script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/EcommerceSetup.groovy"/>
 
                 <!-- Get the store VisualTheme -->
                 <set field="visualThemeId" from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/>
@@ -269,7 +269,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true" />
                 
 
-                <script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/EcommerceSetup.groovy"/>
 
                 <!-- Get the store VisualTheme -->
                 <set field="visualThemeId" from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/>