You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2012/03/09 17:17:13 UTC
svn commit: r1298904 - in /ofbiz/trunk:
applications/accounting/webapp/accounting/WEB-INF/
applications/manufacturing/webapp/manufacturing/WEB-INF/
applications/order/webapp/ordermgr/WEB-INF/
applications/product/webapp/catalog/WEB-INF/ applications/pr...
Author: jacopoc
Date: Fri Mar 9 16:17:12 2012
New Revision: 1298904
URL: http://svn.apache.org/viewvc?rev=1298904&view=rev
Log:
Updated all the controller entries for Groovy event to consistently use the same way to define the location for the script file. Now the path and filename are always in the "path" attribute and the "invoke" attribute is reserved for the execution of a method in the file (I am going to add support for this feature in my next commit); if the invoke element is not specified then the whole script is executed.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1298904&r1=1298903&r2=1298904&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Mar 9 16:17:12 2012
@@ -2574,12 +2574,12 @@ under the License.
</request-map>
<request-map uri="paymentReportHtml">
<security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/" invoke="PaymentReport.groovy"/>
+ <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/>
<response name="success" type="view" value="ViewPaymentReportHtml"/>
</request-map>
<request-map uri="paymentReportPdf">
<security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/" invoke="PaymentReport.groovy"/>
+ <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/>
<response name="success" type="view" value="ViewPaymentReportPdf"/>
</request-map>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1298904&r1=1298903&r2=1298904&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Fri Mar 9 16:17:12 2012
@@ -466,7 +466,7 @@ under the License.
</request-map>
<request-map uri="ShowProductionRun">
<security https="true" auth="true"/>
- <event type="groovy" path="component://manufacturing/webapp/manufacturing/jobshopmgt/" invoke="ShowProductionRun.groovy"/>
+ <event type="groovy" path="component://manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy"/>
<response name="docs_not_printed" type="view" value="EditProductionRun"/>
<response name="docs_printed" type="view" value="ProductionRunDeclaration"/>
<response name="error" type="view" value="FindProductionRun"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1298904&r1=1298903&r2=1298904&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri Mar 9 16:17:12 2012
@@ -1158,7 +1158,7 @@ under the License.
<request-map uri="checkReportBy">
<security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="CheckReportBy.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy"/>
<response name="dayPDF" type="request" value="SalesReport.pdf"/>
<response name="weekPDF" type="request" value="SalesReportWeek.pdf"/>
<response name="monthPDF" type="request" value="SalesReportMonth.pdf"/>
@@ -1174,51 +1174,51 @@ under the License.
</response>
</request-map>
<request-map uri="SalesReport.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportPDF"/>
</request-map>
<request-map uri="SalesReportWeek.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportWeekPDF"/>
</request-map>
<request-map uri="SalesReportMonth.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportMonthPDF"/>
</request-map>
<request-map uri="SalesReport.excel"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportExcel"/>
</request-map>
<request-map uri="SalesReportWeek.excel"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportWeekExcel"/>
</request-map>
<request-map uri="SalesReportMonth.excel"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportMonthExcel"/>
</request-map>
<request-map uri="SalesReport.html"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportHTML"/>
</request-map>
<request-map uri="SalesReportWeek.html"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportWeekHTML"/>
</request-map>
<request-map uri="SalesReportMonth.html"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="SalesReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
<response name="success" type="view" value="SalesOrderReportMonthHTML"/>
</request-map>
<request-map uri="NetBeforeOverheadReport.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="NetBeforeOverheadReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy"/>
<response name="success" type="view" value="NetBeforeOverheadOrderReport"/>
</request-map>
<request-map uri="ProductDemandReport.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="ProductDemandReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy"/>
<response name="success" type="view" value="ProductDemandOrderReport"/>
</request-map>
<request-map uri="ProductContributionReport.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="ProductContributionReport.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductContributionReport.groovy"/>
<response name="success" type="view" value="ProductDemandOrderReport"/>
</request-map>
@@ -1226,7 +1226,7 @@ under the License.
<response name="success" type="view" value="OrderByReferrerReport"/>
</request-map>
<request-map uri="OrdersByChannel.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="OrderByChannel.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy"/>
<response name="success" type="view" value="OrdersByChannelReport"/>
</request-map>
<request-map uri="OrderDiscountCode.pdf">
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=1298904&r1=1298903&r2=1298904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Fri Mar 9 16:17:12 2012
@@ -2062,7 +2062,7 @@ under the License.
</request-map>
<request-map uri="prepareCreateShipMeth">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/catalog/store/" invoke="prepareCreateShipMeth.groovy"/>
+ <event type="groovy" path="component://product/webapp/catalog/store/prepareCreateShipMeth.groovy"/>
<response name="success" type="view" value="EditProductStoreShipSetup"/>
<response name="error" type="view" value="EditProductStoreShipSetup"/>
</request-map>
@@ -2824,7 +2824,7 @@ under the License.
</request-map>
<request-map uri="checkAction">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/" invoke="checkAction.groovy"/>
+ <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/checkAction.groovy"/>
<response name="frame" type="request" value="ImageFrames"/>
<response name="watermark" type="request" value="ImageWatermarking"/>
<response name="crop" type="request" value="ImageCropping"/>
@@ -2833,7 +2833,7 @@ under the License.
</request-map>
<request-map uri="checkRejected">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/" invoke="checkRejected.groovy"/>
+ <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/checkRejected.groovy"/>
<response name="approved" type="view" value="ImageApprove"/>
<response name="rejected" type="view" value="ListPeopleRejected"/>
</request-map>
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1298904&r1=1298903&r2=1298904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Fri Mar 9 16:17:12 2012
@@ -155,27 +155,27 @@ under the License.
</request-map>
<request-map uri="RenderInventoryReportHtml">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportHtml"/>
</request-map>
<request-map uri="RenderInventoryReportPDF">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportPDF"/>
</request-map>
<request-map uri="RenderInventoryReportExcel">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportExcel"/>
</request-map>
<request-map uri="RenderInventoryReportMSWord">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportMSWord"/>
</request-map>
<request-map uri="RenderInventoryReportPPT">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportPPT"/>
</request-map>
Modified: ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml?rev=1298904&r1=1298903&r2=1298904&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Fri Mar 9 16:17:12 2012
@@ -185,7 +185,7 @@ under the License.
</request-map>
<request-map uri="findExampleFeatures">
<security https="true" auth="true"/>
- <event type="groovy" path="component://example/webapp/example/WEB-INF/actions/includes/" invoke="FindExampleFeatures.groovy"/>
+ <event type="groovy" path="component://example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy"/>
<response name="success" type="view" value="ajaxAutocompleteOptions"/>
<response name="error" type="view" value="ajaxAutocompleteOptions"/>
</request-map>
Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml?rev=1298904&r1=1298903&r2=1298904&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml Fri Mar 9 16:17:12 2012
@@ -142,7 +142,7 @@ under the License.
<request-map uri="updatedEbayOrders">
<security https="true" auth="true"/>
- <event type="groovy" path="component://ebay/webapp/ebay/WEB-INF/actions/find/" invoke="updatedEbayOrders.groovy"/>
+ <event type="groovy" path="component://ebay/webapp/ebay/WEB-INF/actions/find/updatedEbayOrders.groovy"/>
<response name="success" type="view" value="FindEbayOrders"/>
<response name="failure" type="view" value="FindEbayOrders"/>
<response name="error" type="view" value="FindEbayOrders"/>
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml?rev=1298904&r1=1298903&r2=1298904&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Fri Mar 9 16:17:12 2012
@@ -457,7 +457,7 @@
<request-map uri="EditAddress">
<security https="false" auth="true"/>
- <event type="groovy" path="component://webpos/webapp/webpos/WEB-INF/actions/customer/" invoke="EditAddress.groovy"/>
+ <event type="groovy" path="component://webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy"/>
<response name="success" type="request" value="json"/>
<response name="error" type="request" value="json"/>
</request-map>