svn commit: r1167341 - /ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml

Author: jleroux
Date: Fri Sep  9 19:50:30 2011
New Revision: 1167341

URL: http://svn.apache.org/viewvc?rev=1167341&view=rev
Log:
"Applied fix from trunk for revision: 1167314"  (conflicts handled by hand)
------------------------------------------------------------------------
r1167314 | jleroux | 2011-09-09 19:55:43 +0200 (ven., 09 sept. 2011) | 4 lines

A patch from Atul Vani "Removed redundant controller entries from product>catalog" https://issues.apache.org/jira/browse/OFBIZ-4401

Removes redundant controller entries from product component's catalog webapp.
Moves one of the entries, so that related entries be all together. Those entries were exactly same, except for '<request-map uri="updateCategoryContent">' for which the removed entry had '<event type="service" path="" invoke="updateCategory"/>', but there exists no service with name 'updateCategory', the other entry has 'updateProductCategory' service called in it's event.
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml

Modified: ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1167341&r1=1167340&r2=1167341&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml Fri Sep  9 19:50:30 2011
@@ -336,52 +336,6 @@ under the License.
         <response name="error" type="view" value="EditCategoryParties"/>
     </request-map>
 
- <!-- ================ Category Content Requests ================= -->
-    <request-map uri="EditCategoryContent">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditCategoryContent"/>
-    </request-map>
-    <request-map uri="updateCategoryContent">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updateCategory"/>
-        <response name="success" type="view" value="EditCategoryContent"/>
-        <response name="error" type="view" value="EditCategoryContent"/>
-    </request-map>
-
- <!-- ================ Category Content Assoc Requests ================= -->
-    <request-map uri="EditCategoryContentContent">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditCategoryContentContent"/>
-    </request-map>
-    <request-map uri="prepareAddContentToCategory">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditCategoryContentContent"/>
-    </request-map>
-    <request-map uri="addContentToCategory">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="createCategoryContent"/>
-        <response name="success" type="view" value="EditCategoryContent"/>
-        <response name="error" type="view" value="EditCategoryContent"/>
-    </request-map>
-    <request-map uri="updateContentToCategory">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updateCategoryContent"/>
-        <response name="success" type="view" value="EditCategoryContent"/>
-        <response name="error" type="view" value="EditCategoryContent"/>
-    </request-map>
-    <request-map uri="removeContentFromCategory">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removeCategoryContent"/>
-        <response name="success" type="view" value="EditCategoryContent"/>
-        <response name="error" type="view" value="EditCategoryContent"/>
-    </request-map>
-    <request-map uri="createSimpleTextContentForAlternateLocaleInCategory">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="createSimpleTextContentForAlternateLocale"/>
-        <response name="success" type="view" value="EditCategoryContent"/>
-        <response name="error" type="view" value="EditCategoryContentContent"/>
-    </request-map>
-
     <!-- ================ Product Category Attribute Requests ================= -->
     <request-map uri="EditCategoryAttributes">
         <security https="true" auth="true"/>
@@ -619,6 +573,12 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditProductContent"/>
     </request-map>
+    <request-map uri="createSimpleTextContentForAlternateLocaleInCategory">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createSimpleTextContentForAlternateLocale"/>
+        <response name="success" type="view" value="EditCategoryContent"/>
+        <response name="error" type="view" value="EditCategoryContentContent"/>
+    </request-map>
 
     <!-- ================ Product Content Assoc Requests ================= -->
     <request-map uri="EditProductContentContent">