svn commit: r588474 - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r588474 - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: adrianc
Date: Thu Oct 25 19:29:49 2007 New Revision: 588474 URL: http://svn.apache.org/viewvc?rev=588474&view=rev Log: Eliminated redundant code by switching components over to the common login and password change screens. I didn't change the hand held component - since it will probably need its own login screen. Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/widget/CommonScreens.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/trunk/applications/content/widget/CommonScreens.xml ofbiz/trunk/applications/content/widget/SurveyScreens.xml ofbiz/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/trunk/applications/content/widget/content/ContentScreens.xml ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml ofbiz/trunk/applications/marketing/widget/CommonScreens.xml ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -39,16 +39,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -1401,8 +1391,6 @@ <!-- View Mappings --> <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"/> <!-- BillingAccount --> <view-map name="FindBillingAccount" type="screen" page="component://accounting/widget/BillingAccountScreens.xml#FindBillingAccount"/> Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -331,32 +331,6 @@ </widgets> </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="creditCardFields"> <section> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -41,16 +41,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security 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> @@ -1653,8 +1643,6 @@ <request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map> <!-- View Mappings --> <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="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/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -20,7 +20,7 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="mainContentDecorator"> + <screen name="main-decorator"> <section> <actions> <!-- base/top/specific map first, then more common map added for shared labels --> @@ -54,7 +54,7 @@ <set field="headerItem" value="CMS"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator"> + <decorator-screen name="main-decorator"> <decorator-section name="body"> <section> <condition> @@ -80,7 +80,7 @@ <set field="headerItem" value="Content"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator"> + <decorator-screen name="main-decorator"> <decorator-section name="body"> <section> <condition> @@ -120,7 +120,7 @@ <set field="headerItem" value="Forum"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator"> + <decorator-screen name="main-decorator"> <decorator-section name="body"> <section> <condition> @@ -163,7 +163,7 @@ <set field="currentContentMenuItemName" from-field="currentContentMenuItemName" from-scope="user"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator"> + <decorator-screen name="main-decorator"> <decorator-section name="body"> <section> <condition> @@ -200,7 +200,7 @@ <set field="headerItem" value="CompDoc"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator" > + <decorator-screen name="main-decorator" > <decorator-section name="body"> <include-menu name="${menuName}" location="component://content/widget/compdoc/CompDocMenus.xml"/> <label text="${title}" style="head1"/> @@ -217,7 +217,7 @@ <set field="currentMenuItemName" from-field="currentMenuItemName" from-scope="user"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml"> + <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> <section> <condition> @@ -243,7 +243,7 @@ <set field="tabButtonItem" from-field="tabButtonItem" from-scope="user"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml"> + <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> <section> <condition> @@ -269,7 +269,7 @@ <set field="tabButtonItem" from-field="tabButtonItem" from-scope="user"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml"> + <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> <section> <condition> @@ -292,7 +292,7 @@ <screen name="main"> <section> <widgets> - <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-header"> @@ -302,32 +302,6 @@ <container><label style="tabletext" text="Welcome to the Content Manager!"/></container> </container> </container> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Thu Oct 25 19:29:49 2007 @@ -57,7 +57,7 @@ <set field="headerItem" value="survey"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml"> + <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> <section> <condition> Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Thu Oct 25 19:29:49 2007 @@ -32,7 +32,7 @@ </entity-condition> </actions> <widgets> - <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml"> + <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> <section> <condition> @@ -59,7 +59,7 @@ <set field="headerItem" value="websites"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml"> + <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> <section> <condition> Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Thu Oct 25 19:29:49 2007 @@ -35,7 +35,7 @@ <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container><link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container> <label style="head1" text="${uiLabelMap.PageTitleFindContent}"/> @@ -46,7 +46,7 @@ </decorator-screen> </widgets> <fail-widgets> - <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <label style="head3">${uiLabelMap.ContentUpdatePermissionError}</label> </decorator-section> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Thu Oct 25 19:29:49 2007 @@ -28,7 +28,7 @@ <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/> </actions> <widgets> - <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container><link target="editDataResource" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container> <label style="head1" text="${uiLabelMap.PageTitleFindDataResource}"/> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -40,16 +40,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -526,8 +516,6 @@ <request-map uri="LookupPayGrade"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayGrade"/></request-map> <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="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/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -180,30 +180,4 @@ </widgets> </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -40,16 +40,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="view"> <security https="false" auth="false"/> @@ -729,8 +719,6 @@ <!-- View Mappings --> <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"/> <!-- Routing view mappings --> <view-map name="FindCalendar" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#FindCalendar" type="screen"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -45,31 +45,5 @@ </widgets> </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -36,16 +36,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="MarketingReport"> <security https="true" auth="true"/> @@ -377,8 +367,6 @@ <!-- View Mappings --> <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="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/marketing/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -102,30 +102,4 @@ </widgets> </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -40,16 +40,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="view"> <security https="false" auth="false"/> @@ -1544,8 +1534,6 @@ <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/> <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="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/order/widget/ordermgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -118,32 +118,5 @@ </widgets> </section> </screen> - - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -38,16 +38,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- 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> @@ -902,8 +892,6 @@ <!-- View Mappings --> <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="findparty" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#findparty"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -274,32 +274,6 @@ </widgets> </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -40,16 +40,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -2510,8 +2500,6 @@ <!-- View Mappings --> <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="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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -42,16 +42,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="request" value="checkLogin"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -1112,8 +1102,6 @@ <!-- View Mappings --> <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="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/product/widget/catalog/CatalogCommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -336,17 +336,4 @@ </widgets> </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -135,30 +135,4 @@ </widgets> </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -44,33 +44,6 @@ </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="CommonFacilityDecorator"> <section> <actions> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -36,16 +36,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="changeDelegator"> @@ -609,8 +599,6 @@ <!-- View Mappings --> <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="RequestList" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestList"/> Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -164,32 +164,6 @@ </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="main"> <section> <actions> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -173,8 +173,6 @@ <!-- View Mappings --> <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"/> <!-- FixedAsset and Relationship management screens --> <view-map name="FindFixedAssets" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#FindFixedAssets" /> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -52,33 +52,6 @@ </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="CommonFixedAssetDecorator"><!--Appbar level decorator--> <section> <actions> Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/controller.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -24,16 +24,6 @@ <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> <description>Business Intelligence Component Site Configuration File</description> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="view"> <security https="false" auth="false"/> @@ -80,8 +70,6 @@ <!-- View Mappings --> <view-map name="main" type="screen" page="component://bi/widget/BiScreens.xml#main"/> - <view-map name="login" type="screen" page="component://bi/widget/BiScreens.xml#login"/> - <view-map name="requirePasswordChange" type="screen" page="component://bi/widget/BiScreens.xml#requirePasswordChange"/> <view-map name="ReportBuilderSelectStarSchema" type="screen" page="component://bi/widget/BiScreens.xml#ReportBuilderSelectStarSchema"/> <view-map name="ReportBuilderSelectStarSchemaFields" type="screen" page="component://bi/widget/BiScreens.xml#ReportBuilderSelectStarSchemaFields"/> Modified: ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml (original) +++ ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml Thu Oct 25 19:29:49 2007 @@ -37,32 +37,6 @@ </widgets> </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="ReportBuilderSelectStarSchema"> <section> <actions> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -42,16 +42,6 @@ </postprocessor> --> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="login"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <!-- Request Mappings --> <request-map uri="main"> <security https="true" auth="true"/> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -47,16 +47,6 @@ <response name="success" type="view" value="main"/> </request-map> - <!-- Security Mappings --> - <request-map uri="login"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> - <response name="success" type="view" value="main"/> - <response name="requirePasswordChange" type="view" value="requirePasswordChange"/> - <response name="error" type="view" value="login"/> - </request-map> - <!-- End of Security Mappings --> - <request-map uri="FindMessageInfo"> <security https="true" auth="true"/> <response name="success" type="view" value="FindMessageInfo"/> @@ -208,8 +198,6 @@ <!-- View Mappings --> <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"/> <view-map name="FindMessageInfo" type="screen" page="component://oagis/widget/MessageInfoScreens.xml#FindMessageInfo"/> <view-map name="EditMessageInfo" type="screen" page="component://oagis/widget/MessageInfoScreens.xml#EditMessageInfo"/> Modified: ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -45,33 +45,6 @@ </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="CommonOagisMessageScreen"> <section> <widgets> 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=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Thu Oct 25 19:29:49 2007 @@ -20,7 +20,6 @@ <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-controller.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"/> @@ -349,8 +348,6 @@ <!-- View Mappings --> <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"/> <view-map name="FindProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindProject"/> <view-map name="FindProjectByRange" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindProjectByRange"/> <view-map name="EditProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=588474&r1=588473&r2=588474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Thu Oct 25 19:29:49 2007 @@ -58,33 +58,6 @@ </section> </screen> - <screen name="login"> - <section> - <widgets> - <decorator-screen name="main-decorator"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="requirePasswordChange"> - <section> - <widgets> - <decorator-screen name="main-decorator"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="CommonProjectDecorator"> <section> <actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |