svn commit: r761220 - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r761220 - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: bibryam
Date: Thu Apr 2 09:47:48 2009 New Revision: 761220 URL: http://svn.apache.org/viewvc?rev=761220&view=rev Log: Added an optional "name" attribute to event element in controller.xml This attribute is used only (also required) in events inside firstvisit, after-login, before-logout, preprocessor and postprocessor elements. Events with same name will be overridden and only the last one will be executed. Overriding works also in cases when a controller.xml includes other controller files. Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/trunk/applications/marketing/webapp/marketing/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/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml ofbiz/trunk/framework/resources/templates/controller.xml ofbiz/trunk/framework/webapp/dtd/site-conf.xsd ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/workflow/webapp/workflow/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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -23,10 +23,7 @@ <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> <description>Accounting Manager Module Site Configuration File</description> <owner>Copyright 2001-2008 The Apache Software Foundation</owner> - - <!-- view handlers --> - <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/> - + <!-- Events to run on every request before security (chains exempt) --> <!-- <preprocessor> @@ -35,7 +32,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -35,7 +35,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -38,7 +38,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -36,7 +36,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -32,7 +32,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -36,7 +36,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -36,7 +36,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -36,7 +36,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -36,7 +36,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -32,7 +32,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Thu Apr 2 09:47:48 2009 @@ -46,14 +46,14 @@ <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/> <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> - + <preprocessor> <!-- Events to run on every request before security (chains exempt) --> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkRequestHeaderLogin"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkServletRequestRemoteUserLogin"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> - <event type="java" path="org.ofbiz.webapp.control.ProtectViewWorker" invoke="checkProtectedView"/> + <event name="check509CertLogin" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/> + <event name="checkRequestHeaderLogin" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkRequestHeaderLogin"/> + <event name="checkServletRequestRemoteUserLogin" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkServletRequestRemoteUserLogin"/> + <event name="checkExternalLoginKey" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> + <event name="checkProtectedView" type="java" path="org.ofbiz.webapp.control.ProtectViewWorker" invoke="checkProtectedView"/> </preprocessor> <postprocessor> <!-- Events to run on every request after all other processing (chains exempt) --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -44,7 +44,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/framework/resources/templates/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/templates/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/framework/resources/templates/controller.xml (original) +++ ofbiz/trunk/framework/resources/templates/controller.xml Thu Apr 2 09:47:48 2009 @@ -18,7 +18,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/framework/webapp/dtd/site-conf.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/dtd/site-conf.xsd?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/dtd/site-conf.xsd (original) +++ ofbiz/trunk/framework/webapp/dtd/site-conf.xsd Thu Apr 2 09:47:48 2009 @@ -218,6 +218,7 @@ </xs:element> <xs:attributeGroup name="attlist.event"> <xs:attribute name="type" type="xs:string" use="required"/> + <xs:attribute name="name" type="xs:string"/> <xs:attribute name="path" type="xs:string"/> <xs:attribute name="invoke" type="xs:string"/> <xs:attribute name="global-transaction" default="true"> Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Thu Apr 2 09:47:48 2009 @@ -87,11 +87,11 @@ public String securityClass; public String defaultRequest; - public List<Event> firstVisitEventList = FastList.newInstance(); - public List<Event> preprocessorEventList = FastList.newInstance(); - public List<Event> postprocessorEventList = FastList.newInstance(); - public List<Event> afterLoginEventList = FastList.newInstance(); - public List<Event> beforeLogoutEventList = FastList.newInstance(); + public Map<String, Event> firstVisitEventList = FastMap.newInstance(); + public Map<String, Event> preprocessorEventList = FastMap.newInstance(); + public Map<String, Event> postprocessorEventList = FastMap.newInstance(); + public Map<String, Event> afterLoginEventList = FastMap.newInstance(); + public Map<String, Event> beforeLogoutEventList = FastMap.newInstance(); public Map<String, String> eventHandlerMap = FastMap.newInstance(); public Map<String, String> viewHandlerMap = FastMap.newInstance(); @@ -129,11 +129,11 @@ this.securityClass = controllerConfig.securityClass; this.defaultRequest = controllerConfig.defaultRequest; - this.firstVisitEventList.addAll(controllerConfig.firstVisitEventList); - this.preprocessorEventList.addAll(controllerConfig.preprocessorEventList); - this.postprocessorEventList.addAll(controllerConfig.postprocessorEventList); - this.afterLoginEventList.addAll(controllerConfig.afterLoginEventList); - this.beforeLogoutEventList.addAll(controllerConfig.beforeLogoutEventList); + this.firstVisitEventList.putAll(controllerConfig.firstVisitEventList); + this.preprocessorEventList.putAll(controllerConfig.preprocessorEventList); + this.postprocessorEventList.putAll(controllerConfig.postprocessorEventList); + this.afterLoginEventList.putAll(controllerConfig.afterLoginEventList); + this.beforeLogoutEventList.putAll(controllerConfig.beforeLogoutEventList); this.eventHandlerMap.putAll(controllerConfig.eventHandlerMap); this.viewHandlerMap.putAll(controllerConfig.viewHandlerMap); @@ -177,7 +177,7 @@ Element firstvisitElement = UtilXml.firstChildElement(rootElement, "firstvisit"); if (firstvisitElement != null) { for (Element eventElement: UtilXml.childElementList(firstvisitElement, "event")) { - this.firstVisitEventList.add(new Event(eventElement)); + this.firstVisitEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); } } @@ -185,7 +185,7 @@ Element preprocessorElement = UtilXml.firstChildElement(rootElement, "preprocessor"); if (preprocessorElement != null) { for (Element eventElement: UtilXml.childElementList(preprocessorElement, "event")) { - this.preprocessorEventList.add(new Event(eventElement)); + this.preprocessorEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); } } @@ -193,7 +193,7 @@ Element postprocessorElement = UtilXml.firstChildElement(rootElement, "postprocessor"); if (postprocessorElement != null) { for (Element eventElement: UtilXml.childElementList(postprocessorElement, "event")) { - this.postprocessorEventList.add(new Event(eventElement)); + this.postprocessorEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); } } @@ -201,7 +201,7 @@ Element afterLoginElement = UtilXml.firstChildElement(rootElement, "after-login"); if (afterLoginElement != null) { for (Element eventElement: UtilXml.childElementList(afterLoginElement, "event")) { - this.afterLoginEventList.add(new Event(eventElement)); + this.afterLoginEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); } } @@ -209,7 +209,7 @@ Element beforeLogoutElement = UtilXml.firstChildElement(rootElement, "before-logout"); if (beforeLogoutElement != null) { for (Element eventElement: UtilXml.childElementList(beforeLogoutElement, "event")) { - this.beforeLogoutEventList.add(new Event(eventElement)); + this.beforeLogoutEventList.put(eventElement.getAttribute("name"), new Event(eventElement)); } } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Thu Apr 2 09:47:48 2009 @@ -239,7 +239,7 @@ // This isn't an event because it is required to run. We do not want to make it optional. GenericValue visit = VisitHandler.getVisit(session); if (visit != null) { - for (ConfigXMLReader.Event event: controllerConfig.firstVisitEventList) { + for (ConfigXMLReader.Event event: controllerConfig.firstVisitEventList.values()) { try { String returnString = this.runEvent(request, response, event, null, "firstvisit"); if (returnString != null && !returnString.equalsIgnoreCase("success")) { @@ -255,7 +255,7 @@ } // Invoke the pre-processor (but NOT in a chain) - for (ConfigXMLReader.Event event: controllerConfig.preprocessorEventList) { + for (ConfigXMLReader.Event event: controllerConfig.preprocessorEventList.values()) { try { String returnString = this.runEvent(request, response, event, null, "preprocessor"); if (returnString != null && !returnString.equalsIgnoreCase("success")) { @@ -480,7 +480,7 @@ // ======== handle views ======== // first invoke the post-processor events. - for (ConfigXMLReader.Event event: controllerConfig.postprocessorEventList) { + for (ConfigXMLReader.Event event: controllerConfig.postprocessorEventList.values()) { try { String returnString = this.runEvent(request, response, event, requestMap, "postprocessor"); if (returnString != null && !returnString.equalsIgnoreCase("success")) { @@ -1020,7 +1020,7 @@ } public void runAfterLoginEvents(HttpServletRequest request, HttpServletResponse response) { - for (ConfigXMLReader.Event event: getControllerConfig().afterLoginEventList) { + for (ConfigXMLReader.Event event: getControllerConfig().afterLoginEventList.values()) { try { String returnString = this.runEvent(request, response, event, null, "after-login"); if (returnString != null && !returnString.equalsIgnoreCase("success")) { @@ -1033,7 +1033,7 @@ } public void runBeforeLogoutEvents(HttpServletRequest request, HttpServletResponse response) { - for (ConfigXMLReader.Event event: getControllerConfig().beforeLogoutEventList) { + for (ConfigXMLReader.Event event: getControllerConfig().beforeLogoutEventList.values()) { try { String returnString = this.runEvent(request, response, event, null, "before-logout"); if (returnString != null && !returnString.equalsIgnoreCase("success")) { Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -35,7 +35,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -26,15 +26,15 @@ <!-- Events run from here for the first hit in a visit --> <firstvisit> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> + <event name="autoLoginCheck" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> + <event name="checkTrackingCodeCookies" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> </firstvisit> <!-- Events to run on every request before security (chains exempt) --> <preprocessor> <!-- This event allows affilate/distributor entry on any page --> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/> + <event name="checkTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/> + <event name="checkPartnerTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/> </preprocessor> <!-- default request; call into CMS --> Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -26,15 +26,15 @@ <!-- Events run from here for the first hit in a visit --> <firstvisit> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> + <event name="autoLoginCheck" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> + <event name="checkTrackingCodeCookies" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> </firstvisit> <!-- Events to run on every request before security (chains exempt) --> <preprocessor> <!-- This event allows affilate/distributor entry on any page --> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/> + <event name="checkTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/> + <event name="checkPartnerTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/> </preprocessor> <!-- default request; call into CMS --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -43,36 +43,36 @@ <!-- Events run from here for the first hit in a visit --> <firstvisit> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> - <event type="java" path="org.ofbiz.product.product.ProductEvents" invoke="setDefaultStoreSettings"/> + <event name="autoLoginCheck" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> + <event name="checkTrackingCodeCookies" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> + <event name="setDefaultStoreSettings" type="java" path="org.ofbiz.product.product.ProductEvents" invoke="setDefaultStoreSettings"/> </firstvisit> <!-- Events to run on every request before security (chains exempt) --> <preprocessor> <!-- This event allows affilate/distributor entry on any page --> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> - <event type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="setAssociationId"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/> - <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/> - <event type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> + <event name="checkExternalLoginKey" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> + <event name="setAssociationId" type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="setAssociationId"/> + <event name="checkTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/> + <event name="checkPartnerTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/> + <event name="keepCartUpdated" type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/> + <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> </preprocessor> <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> <after-login> - <event type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="updateAssociatedDistributor"/> - <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/> + <event name="updateAssociatedDistributor" type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="updateAssociatedDistributor"/> + <event name="keepCartUpdated" type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/> <!-- after login, get everything from the auto-save list --> - <event type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> + <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> <!-- after login and restoring from the auto-save list, save everything to the auto-save list to handle anything that may have already been in the cart before login --> - <event type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="saveCartToAutoSaveList"/> + <event name="saveCartToAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="saveCartToAutoSaveList"/> </after-login> <!-- default request; call into CMS --> Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -37,7 +37,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -37,7 +37,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -38,12 +38,12 @@ <preprocessor> <!-- Events to run on every request before security (chains exempt) --> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> + <event name="check509CertLogin" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/> + <event name="checkExternalLoginKey" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> </preprocessor> <postprocessor> <!-- Events to run on every request after all other processing (chains exempt) --> - <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> --> + <!-- <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> --> </postprocessor> <!-- Security Mappings --> 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=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -40,28 +40,28 @@ <!-- Events run from here for the first hit in a visit --> <firstvisit> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> - <event type="java" path="org.ofbiz.product.product.ProductEvents" invoke="setDefaultStoreSettings"/> + <event name="autoLoginCheck" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> + <event name="checkTrackingCodeCookies" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> + <event name="setDefaultStoreSettings" type="java" path="org.ofbiz.product.product.ProductEvents" invoke="setDefaultStoreSettings"/> </firstvisit> <!-- Events to run on every request before security (chains exempt) --> <preprocessor> <!-- This event allows affilate/distributor entry on any page --> - <event type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="setAssociationId"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/> - <event type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/> - <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/> - <event type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> + <event name="setAssociationId" type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="setAssociationId"/> + <event name="checkTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/> + <event name="checkPartnerTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/> + <event name="keepCartUpdated" type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/> + <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> </preprocessor> <after-login> - <event type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="updateAssociatedDistributor"/> - <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/> + <event name="updateAssociatedDistributor" type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="updateAssociatedDistributor"/> + <event name="keepCartUpdated" type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/> <!-- after login, get everything from the auto-save list --> - <event type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> + <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> <!-- after login and restoring from the auto-save list, save everything to the auto-save list to handle anything that may have already been in the cart before login --> - <event type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="saveCartToAutoSaveList"/> + <event name="saveCartToAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="saveCartToAutoSaveList"/> </after-login> <!-- Security Mappings --> Modified: ofbiz/trunk/specialpurpose/workflow/webapp/workflow/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/webapp/workflow/WEB-INF/controller.xml?rev=761220&r1=761219&r2=761220&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/workflow/webapp/workflow/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/workflow/webapp/workflow/WEB-INF/controller.xml Thu Apr 2 09:47:48 2009 @@ -34,7 +34,7 @@ <!-- Events to run on every request after all other processing (chains exempt) --> <!-- <postprocessor> - <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> --> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |