[Opentaps-crmcommits] [opentaps commits] r3840 - in versions/1.0/trunk/hot-deploy: crmsfa/webapp/crmsfa/WEB-INF financials/webapp/financials/WEB-INF opentaps-common/webapp/common/WEB-INF purchasing/webapp/purchasing/WEB-INF warehouse/webapp/warehouse/WEB-INF

[Chris L. <cli...@ea...>]

Author: cliberty
Date: 2007-07-16 12:41:35 -0700 (Mon, 16 Jul 2007)
New Revision: 3840

Modified:
   versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/WEB-INF/controller.xml
   versions/1.0/trunk/hot-deploy/financials/webapp/financials/WEB-INF/controller.xml
   versions/1.0/trunk/hot-deploy/opentaps-common/webapp/common/WEB-INF/common-controller.xml
   versions/1.0/trunk/hot-deploy/purchasing/webapp/purchasing/WEB-INF/controller.xml
   versions/1.0/trunk/hot-deploy/warehouse/webapp/warehouse/WEB-INF/controller.xml
Log:
Including displayEffects-controller.xml in common-controller.xml, instead of directly in each controller.

Modified: versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/WEB-INF/controller.xml
===================================================================
--- versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/WEB-INF/controller.xml	2007-07-16 19:41:00 UTC (rev 3839)
+++ versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/WEB-INF/controller.xml	2007-07-16 19:41:35 UTC (rev 3840)
@@ -70,7 +70,6 @@
     <!-- Include requests for common opentaps features. -->
     <include location="component://opentaps-common/webapp/common/WEB-INF/common-controller.xml"/>
     <include location="component://opentaps-common/webapp/common/WEB-INF/myprofile-controller.xml"/>
-    <include location="component://opentaps-common/webapp/common/WEB-INF/displayEffects-controller.xml"/>
 
     <!-- event handlers -->
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: versions/1.0/trunk/hot-deploy/financials/webapp/financials/WEB-INF/controller.xml
===================================================================
--- versions/1.0/trunk/hot-deploy/financials/webapp/financials/WEB-INF/controller.xml	2007-07-16 19:41:00 UTC (rev 3839)
+++ versions/1.0/trunk/hot-deploy/financials/webapp/financials/WEB-INF/controller.xml	2007-07-16 19:41:35 UTC (rev 3840)
@@ -23,7 +23,6 @@
     <errorpage>/error/error.jsp</errorpage>
 
     <!-- Include requests for common opentaps features. -->
-    <include location="component://opentaps-common/webapp/common/WEB-INF/displayEffects-controller.xml"/>
     <include location="component://opentaps-common/webapp/common/WEB-INF/common-controller.xml"/>
     <include location="component://opentaps-common/webapp/common/WEB-INF/myprofile-controller.xml"/>
 

Modified: versions/1.0/trunk/hot-deploy/opentaps-common/webapp/common/WEB-INF/common-controller.xml
===================================================================
--- versions/1.0/trunk/hot-deploy/opentaps-common/webapp/common/WEB-INF/common-controller.xml	2007-07-16 19:41:00 UTC (rev 3839)
+++ versions/1.0/trunk/hot-deploy/opentaps-common/webapp/common/WEB-INF/common-controller.xml	2007-07-16 19:41:35 UTC (rev 3840)
@@ -24,6 +24,8 @@
     <description>Opentaps Common JSON Controller</description>
     <owner>Open Source Strategies, Inc. (c) 2006-2007 </owner>
 
+    <include location="component://opentaps-common/webapp/common/WEB-INF/displayEffects-controller.xml"/>
+
     <request-map uri="getStateDataJSON">
         <event type="java" path="org.opentaps.common.event.AjaxEvents" invoke="getStateDataJSON"/>
         <response name="success" type="none"/>

Modified: versions/1.0/trunk/hot-deploy/purchasing/webapp/purchasing/WEB-INF/controller.xml
===================================================================
--- versions/1.0/trunk/hot-deploy/purchasing/webapp/purchasing/WEB-INF/controller.xml	2007-07-16 19:41:00 UTC (rev 3839)
+++ versions/1.0/trunk/hot-deploy/purchasing/webapp/purchasing/WEB-INF/controller.xml	2007-07-16 19:41:35 UTC (rev 3840)
@@ -21,7 +21,6 @@
     <errorpage>/error/error.jsp</errorpage>
 
     <!-- Include requests for common opentaps features. -->
-    <include location="component://opentaps-common/webapp/common/WEB-INF/displayEffects-controller.xml"/>
     <include location="component://opentaps-common/webapp/common/WEB-INF/common-controller.xml"/>
     <include location="component://opentaps-common/webapp/common/WEB-INF/myprofile-controller.xml"/>
 

Modified: versions/1.0/trunk/hot-deploy/warehouse/webapp/warehouse/WEB-INF/controller.xml
===================================================================
--- versions/1.0/trunk/hot-deploy/warehouse/webapp/warehouse/WEB-INF/controller.xml	2007-07-16 19:41:00 UTC (rev 3839)
+++ versions/1.0/trunk/hot-deploy/warehouse/webapp/warehouse/WEB-INF/controller.xml	2007-07-16 19:41:35 UTC (rev 3840)
@@ -41,7 +41,6 @@
     <errorpage>/error/error.jsp</errorpage>
 
     <!-- Include requests for common opentaps features. -->
-    <include location="component://opentaps-common/webapp/common/WEB-INF/displayEffects-controller.xml"/>
     <include location="component://opentaps-common/webapp/common/WEB-INF/common-controller.xml"/>
     <include location="component://opentaps-common/webapp/common/WEB-INF/myprofile-controller.xml"/>