Author: lektran
Date: Fri Dec 18 10:55:34 2009
New Revision: 892219
URL: http://svn.apache.org/viewvc?rev=892219&view=rev
Log:
Convert all uses of json event types to chained requests with the common json
event at the end.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/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=892219&r1=892218&r2=892219&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Fri Dec 18 10:55:34 2009
@@ -279,9 +279,9 @@
<response name="error" type="view" value="editInvoice"/>
</request-map>
<request-map uri="getInvoiceRunningTotal">
- <event type="jsonservice" invoke="getInvoiceRunningTotal"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="getInvoiceRunningTotal"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<!-- Request EditInvoiceItemType -->
<request-map uri="editInvoiceItemType">
@@ -1954,9 +1954,9 @@
<response name="success" type="view" value="BankReconciliation"/>
</request-map>
<request-map uri="getFinAccountTransRunningTotalAndBalances">
- <event type="jsonservice-multi"
invoke="getFinAccountTransRunningTotalAndBalances"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service-multi"
invoke="getFinAccountTransRunningTotalAndBalances"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="reconcileFinAccountTrans">
<security https="true" auth="false"/>
@@ -2230,9 +2230,9 @@
<response name="error" type="view" value="PaymentsDepositWithdraw"/>
</request-map>
<request-map uri="getPaymentRunningTotal">
- <event type="jsonservice" invoke="getPaymentRunningTotal"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="getPaymentRunningTotal"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="LookupCustomerName">
<security auth="true" https="true"/>
@@ -2465,9 +2465,9 @@
<request-map uri="createUpdateCostCenter">
<security auth="true" https="true"/>
- <event type="jsonservice-multi" invoke="createUpdateCostCenter"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service-multi" invoke="createUpdateCostCenter"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="GlAccountBalanceByCostCenter">
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=892219&r1=892218&r2=892219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Fri
Dec 18 10:55:34 2009
@@ -403,27 +403,27 @@
</request-map>
<request-map uri="createWebSiteMetaInfoJson">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="createTextContent"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="createTextContent"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="updateWebSiteMetaInfoJson">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="updateDataResource"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="updateDataResource"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="createWebSitePathAliasJson">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="createWebSitePathAlias"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="createWebSitePathAlias"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="removeWebSitePathAliasJson">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="removeWebSitePathAlias"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="removeWebSitePathAlias"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<!-- ================ ContentType Requests ================= -->
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=892219&r1=892218&r2=892219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri
Dec 18 10:55:34 2009
@@ -236,9 +236,9 @@
<request-map uri="getConfigDetailsEvent">
<security https="true" auth="false"/>
- <event type="jsonjava"
path="org.ofbiz.order.shoppingcart.ShoppingCartEvents"
invoke="getConfigDetailsEvent"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="java"
path="org.ofbiz.order.shoppingcart.ShoppingCartEvents"
invoke="getConfigDetailsEvent"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="updateTrackingNumber">
<security https="true" auth="true"/>
@@ -1041,9 +1041,9 @@
<request-map uri="getStatusItemsForReturn">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="getStatusItemsForReturn"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="getStatusItemsForReturn"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<!-- Payment Processor Setup Requests -->
@@ -1583,9 +1583,9 @@
<request-map uri="markOrderViewed">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="updateOrderHeader"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="updateOrderHeader"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="addShippingAddress">
@@ -1596,9 +1596,9 @@
</request-map>
<request-map uri="getAssociatedStateList">
<security https="true" auth="false"/>
- <event type="jsonservice" invoke="getAssociatedStateList"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="getAssociatedStateList"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<!-- UPS carrier requests -->
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=892219&r1=892218&r2=892219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri
Dec 18 10:55:34 2009
@@ -1072,9 +1072,9 @@
<request-map uri="getFileUploadProgressStatus">
<security https="true" auth="false"/>
- <event type="jsonservice" invoke="getFileUploadProgressStatus"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="getFileUploadProgressStatus"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="img">
@@ -1164,9 +1164,9 @@
<!-- Ajax Requests -->
<request-map uri="ajaxUpdatePartyGroup">
<security https="true" auth="true"/>
- <event type="jsonservice" path="" invoke="updatePartyGroup"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" path="" invoke="updatePartyGroup"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<!-- Order communication event requests -->
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=892219&r1=892218&r2=892219&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Fri Dec
18 10:55:34 2009
@@ -75,9 +75,9 @@
</request-map>
<request-map uri="createExampleAjax">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="createExample"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="createExample"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="updateExampleAjax">
<security https="true" auth="true"/>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=892219&r1=892218&r2=892219&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
Fri Dec 18 10:55:34 2009
@@ -159,6 +159,14 @@
<response name="error" type="view" value="main"/>
</request-map>
+ <!-- Common json reponse events, chain these after events to send json
reponses -->
+ <!-- Standard json response, uses all compatible request attributes -->
+ <request-map uri="json">
+ <security direct-request="false"/>
+ <event type="java" path="org.ofbiz.common.CommonEvents"
invoke="jsonResponseFromRequestAttributes"/>
+ <response name="success" type="none"/>
+ </request-map>
+
<!-- ShoppingList Requests -->
<request-map uri="editShoppingList">
<security auth="true" https="false"/>
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=892219&r1=892218&r2=892219&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Fri
Dec 18 10:55:34 2009
@@ -96,6 +96,14 @@
</request-map>
<!-- End of Security Mappings -->
+ <!-- Common json reponse events, chain these after events to send json
reponses -->
+ <!-- Standard json response, uses all compatible request attributes -->
+ <request-map uri="json">
+ <security direct-request="false"/>
+ <event type="java" path="org.ofbiz.common.CommonEvents"
invoke="jsonResponseFromRequestAttributes"/>
+ <response name="success" type="none"/>
+ </request-map>
+
<!-- Request Mappings -->
<request-map uri="view">
<security https="true" auth="false"/>
@@ -158,16 +166,16 @@
<request-map uri="FindProducts">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="FindProducts"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="FindProducts"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="FindProductsByIdentification">
<security https="true" auth="true"/>
- <event type="jsonservice" invoke="FindProductsByIdentification"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
+ <event type="service" invoke="FindProductsByIdentification"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
</request-map>
<request-map uri="ShowCart">
