svn commit: r582517 - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r582517 - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: adrianc
Date: Sat Oct 6 10:25:42 2007 New Revision: 582517 URL: http://svn.apache.org/viewvc?rev=582517&view=rev Log: Step two of OFBIZ-1230. Reduced redundant code by including common-requests.xml in each component's controller.xml file. 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/example/webapp/example/WEB-INF/controller.xml ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/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/projectmgr/webapp/projectmgr/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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,42 +20,26 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Accounting Manager Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> - <!-- event handlers --> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> - <!-- view handlers --> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="login"/> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -63,37 +47,8 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezones --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -1445,12 +1400,9 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://accounting/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://accounting/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://accounting/widget/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <!-- BillingAccount --> <view-map name="FindBillingAccount" type="screen" page="component://accounting/widget/BillingAccountScreens.xml#FindBillingAccount"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,41 +20,28 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Content Manager Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> <handler name="json" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/> - - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> <handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -62,38 +49,9 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezones --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - - <!-- Request Mappings --> + <!-- Request Mappings --> <request-map uri="view"><security https="false" auth="false"/><response name="success" type="view" value="main"/></request-map> <request-map uri="views"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map> @@ -1694,12 +1652,9 @@ <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map> <request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://content/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://content/widget/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="fonts.fo" type="screenfop" page="component://content/widget/CommonScreens.xml#fonts.fo" content-type="application/pdf" encoding="none"/> <view-map name="FindForumGroups" page="component://content/widget/forum/ForumScreens.xml#FindForumGroups" type="screen"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -21,42 +21,26 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd"> - <description>Humanres Manager Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> + <description>Human Resources Manager Module Site Configuration File</description> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> - <!-- event handlers --> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> - <!-- view handlers --> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="login"/> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -64,37 +48,8 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezones --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -573,8 +528,6 @@ <view-map name="main" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#ListEmplPositions"/> <view-map name="login" type="screen" page="component://humanres/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://humanres/widget/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="ListPerfReviews" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#ListPerfReviews"/> <view-map name="EditPerfReviews" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPerfReviews"/> <view-map name="EditPerfReviewItems" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPerfReviewItems"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,43 +20,27 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Manufacturing Component Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> <!-- event handlers --> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/> <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/> - <!-- view handlers --> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> - + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -64,37 +48,8 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezones --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - <!-- Request Mappings --> <request-map uri="view"> <security https="false" auth="false"/> @@ -773,12 +728,9 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#FindProductionRun" type="screen"/> <view-map name="login" type="screen" page="component://manufacturing/widget/manufacturing/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://manufacturing/widget/manufacturing/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <!-- Routing view mappings --> <view-map name="FindCalendar" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#FindCalendar" type="screen"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,44 +20,23 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Marketing Manager Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> - - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> - - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - - <request-map uri="MarketingReport"> - <security https="true" auth="true"/> - <response name="success" type="view" value="MarketingReport"/> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -65,38 +44,14 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezone --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> + <!-- Request Mappings --> + <request-map uri="MarketingReport"> + <security https="true" auth="true"/> + <response name="success" type="view" value="MarketingReport"/> </request-map> - <!-- Request Mappings --> <request-map uri="view"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map> <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="FindMarketingCampaign"/></request-map> @@ -421,12 +376,9 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://marketing/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://marketing/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://marketing/widget/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="MarketingReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#MarketingReportList"/> <view-map name="FindDataSource" type="screen" page="component://marketing/widget/DataSourceScreens.xml#ListDataSource"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,43 +20,27 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Order Manager Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> <!-- event handlers --> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/> - <!-- view handlers --> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> - + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -64,37 +48,8 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezones --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - <!-- Request Mappings --> <request-map uri="view"> <security https="false" auth="false"/> @@ -1588,12 +1543,9 @@ <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderHeaderListView"/> <view-map name="login" type="screen" page="component://order/widget/ordermgr/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://order/widget/ordermgr/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="orderstats" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderStats"/> <view-map name="findorders" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderFindOrder"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,40 +20,25 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Party Manager Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> - - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> <handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -61,37 +46,8 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezone --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - <!-- Request Mappings --> <request-map uri="view"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map> <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> @@ -945,12 +901,9 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#findparty"/> <view-map name="login" type="screen" page="component://party/widget/partymgr/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://party/widget/partymgr/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="findparty" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#findparty"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,42 +20,27 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Catalog Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> - <firstvisit></firstvisit> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -63,37 +48,8 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezone --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -2496,12 +2452,9 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://product/widget/catalog/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://product/widget/catalog/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://product/widget/catalog/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="ChooseTopCategory" type="screen" page="component://product/widget/catalog/CommonScreens.xml#ChooseTopCategory"/> <view-map name="FastLoadCache" type="screen" page="component://product/widget/catalog/CommonScreens.xml#FastLoadCache"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,42 +20,28 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Facility Manager Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -63,37 +49,8 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezone --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -1149,12 +1106,9 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacility"/> <view-map name="login" type="screen" page="component://product/widget/facility/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://product/widget/facility/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="FindFacility" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacility"/> <view-map name="EditFacility" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacility"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,38 +20,23 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Work Manager Module Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> - - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> - - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -59,45 +44,16 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> + <!-- End of Security Mappings --> - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> - + <!-- Request Mappings --> + <request-map uri="changeDelegator"> <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="changeDelegator"/> <response name="success" type="view" value="main"/> <response name="error" type="view" value="error"/> </request-map> - <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezone --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - - <!-- Request Mappings --> - <request-map uri="view"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> @@ -652,12 +608,9 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://workeffort/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://workeffort/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://workeffort/widget/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="RequestList" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestList"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -35,14 +35,17 @@ <handler name="jasperreportsxml" type="view" class="org.ofbiz.webapp.view.JasperReportsXmlViewHandler"/> --> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <preprocessor> - <!-- Events to run on every request before security (chains exempt) --> - <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> --> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Request Mappings --> <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,44 +20,30 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>WebTools Site Configuration File</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> <handler name="xmlrpc" type="request" class="org.ofbiz.webapp.event.XmlRpcEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/> <handler name="service-stream" type="request" class="org.ofbiz.webapp.event.ServiceStreamHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> <handler name="datavision" type="view" class="org.ofbiz.webapp.view.DataVisionViewHandler"/> <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <preprocessor> - <!-- Events to run on every request before security (chains exempt) --> - <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> --> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="check509CertLogin"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -65,37 +51,8 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Common Mappings used for locales and timezones --> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="setSessionTimeZone"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="LookupLocales"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupLocales" /> - </request-map> - <request-map uri="LookupTimezones"> - <security https="true" auth="false" /> - <response name="success" type="view" value="LookupTimezones" /> - </request-map> - <!-- Request Mappings --> <!-- Begin Utility Requests --> @@ -569,12 +526,9 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://webtools/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://webtools/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://webtools/widget/CommonScreens.xml#requirePasswordChange"/> - <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> - <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="ping" type="ftl" page="/ping.ftl"/> <view-map name="showDateTime" type="ftl" page="/showDateTime.ftl"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?rev=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -25,16 +25,12 @@ <include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/> <description>Asset Maintenance Component Site Configuration File</description> - <errorpage>/error/error.jsp</errorpage> - - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> <request-map uri="main"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> </request-map> - <request-map uri="findFixedAssets"> <security https="true" auth="true" /> <response name="success" type="view" value="FindFixedAssets" /> @@ -176,8 +172,6 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> - <view-map name="main" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#FindFixedAssets"/> <view-map name="login" type="screen" page="component://assetmaint/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://assetmaint/widget/CommonScreens.xml#requirePasswordChange"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,44 +20,29 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Facility Handheld Demo</description> - <owner>Copyright 2001-2006 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> + <owner>Copyright 2001-2007 The Apache Software Foundation</owner> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> <!-- view handlers --> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> <!-- Events to run on every request before security (chains exempt) --> + <!-- <preprocessor> - <!-- Events to run on every request before security (chains exempt) --> - <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> --> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main" /> - <response name="error" type="view" value="login" /> - </request-map> - <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -65,15 +50,7 @@ <response name="requirePasswordChange" type="view" value="login"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="main"> @@ -173,7 +150,6 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" type="jsp" page="/error/error.jsp"/> <view-map name="main" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#facilities"/> <view-map name="login" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#login"/> 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=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,33 +20,26 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> - + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <description>Oagis Component Site Configuration File</description> - <errorpage>/error/error.jsp</errorpage> <!-- event handlers --> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> - <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/> - <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/> - <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> <handler name="stream" type="request" class="org.ofbiz.webapp.event.ServiceStreamHandler"/> <!-- view handlers --> - <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/> - <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> + <!-- Events to run on every request before security (chains exempt) --> + <!-- <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"/> </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- <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 type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> </postprocessor> + --> <request-map uri="main"> @@ -55,13 +48,6 @@ </request-map> <!-- Security Mappings --> - <request-map uri="checkLogin" edit="false"> - <description>Verify a user is logged in.</description> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" /> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="login"/> - </request-map> <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -69,13 +55,6 @@ <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> <response name="error" type="view" value="login"/> </request-map> - - <request-map uri="logout"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/> - <response name="success" type="request" value="checkLogin"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- End of Security Mappings --> <request-map uri="FindMessageInfo"> @@ -228,8 +207,6 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> - <view-map name="main" type="screen" page="component://oagis/widget/MessageInfoScreens.xml#FindMessageInfo"/> <view-map name="login" type="screen" page="component://oagis/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://oagis/widget/CommonScreens.xml#requirePasswordChange"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=582517&r1=582516&r2=582517&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Sat Oct 6 10:25:42 2007 @@ -20,6 +20,7 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-requests.xml"/> <include location="component://product/webapp/catalog/WEB-INF/controller.xml"/> <include location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/> <include location="component://accounting/webapp/accounting/WEB-INF/controller.xml"/> @@ -27,9 +28,6 @@ <include location="component://humanres/webapp/humanres/WEB-INF/controller.xml"/> <description>Project Management Component Site Configuration File</description> - <errorpage>/error/error.jsp</errorpage> - - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> <request-map uri="main"> <security https="true" auth="true"/> @@ -350,8 +348,6 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="error" page="/error/error.jsp"/> - <view-map name="main" type="screen" page="component://projectmgr/widget/TaskScreens.xml#FindTaskByRange"/> <view-map name="login" type="screen" page="component://projectmgr/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://projectmgr/widget/CommonScreens.xml#requirePasswordChange"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |