Author: lektran
Date: Sun Feb 11 00:46:30 2007
New Revision: 505862
URL: http://svn.apache.org/viewvc?view=rev&rev=505862
Log:
Applied patch from Anil Patel, OFBIZ-713.
Cleans up assetmaint's controller file by increasing use of the include element
and removing the redundant entries.
Removed:
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/facility-controller.xml
Modified:
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
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?view=diff&rev=505862&r1=505861&r2=505862
==============================================================================
---
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
Sun Feb 11 00:46:30 2007
@@ -20,196 +20,25 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd";>
- <include
location="component://assetmaint/webapp/assetmaint/WEB-INF/facility-controller.xml"/>
+ <include
location="component://product/webapp/facility/WEB-INF/controller.xml"/>
+ <include
location="component://accounting/webapp/accounting/WEB-INF/controller.xml"/>
+ <include
location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>
<description>Asset Maintenance 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="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="ftl" type="view"
class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
- <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.ScreenFopPdfViewHandler"/>
- <handler name="http" type="view"
class="org.ofbiz.webapp.view.HttpViewHandler"/>
- <!--
- These can be used to return the reports as views; make sure the classes
are compiled and available
- <handler name="datavision" type="view"
class="org.ofbiz.webapp.view.DataVisionViewHandler"/>
- <handler name="jasperreportspdf" type="view"
class="org.ofbiz.webapp.view.JasperReportsPdfViewHandler"/>
- <handler name="jasperreportsxml" type="view"
class="org.ofbiz.webapp.view.JasperReportsXmlViewHandler"/>
- -->
-
- <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>
- <postprocessor>
- <!-- Events to run on every request after all other processing (chains
exempt) -->
- <!-- <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"/>
- <response name="success" type="view" value="main"/>
- <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="view">
- <security https="false" auth="false"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="error"/>
- </request-map>
-
- <request-map uri="authview">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="error"/>
- </request-map>
-
<request-map uri="main">
<security https="true" auth="true"/>
<response name="success" type="view" value="main"/>
</request-map>
- <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>
- <!-- FixedAssets requests -->
<request-map uri="findFixedAssets">
<security https="true" auth="true" />
<response name="success" type="view" value="FindFixedAssets" />
<response name="error" type="view" value="FindFixedAssets" />
</request-map>
- <request-map uri="EditFixedAsset">
- <security https="true" auth="true" />
- <response name="success" type="view" value="EditFixedAsset" />
- <response name="error" type="view" value="EditFixedAsset" />
- </request-map>
- <request-map uri="createFixedAsset">
- <security https="true" auth="true" />
- <event type="service" path="" invoke="createFixedAsset" />
- <response name="success" type="view" value="EditFixedAsset" />
- <response name="error" type="view" value="EditFixedAsset" />
- </request-map>
- <request-map uri="updateFixedAsset">
- <security https="true" auth="true" />
- <event type="service" path="" invoke="updateFixedAsset" />
- <response name="success" type="view" value="EditFixedAsset" />
- <response name="error" type="view" value="EditFixedAsset" />
- </request-map>
- <request-map uri="FixedAssetChildren">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FixedAssetChildren"/>
- <response name="error" type="view" value="FixedAssetChildren"/>
- </request-map>
- <!-- ================ Fixed Asset Calendar Requests ================= -->
- <request-map uri="ListFixedAssetCalendar">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListFixedAssetCalendar"/>
- </request-map>
- <request-map uri="updateFixedAssetCalendar">
- <security https="true" auth="true"/>
- <event type="service"
path="org.ofbiz.accounting.fixedasset.FixedAssetServices.xml"
invoke="updateFixedAssetCalendar"/>
- <response name="success" type="view" value="ListFixedAssetCalendar"/>
- <response name="error" type="view" value="ListFixedAssetCalendar"/>
- </request-map>
- <request-map uri="EditFixedAssetStdCosts">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditFixedAssetStdCosts"/>
- </request-map>
- <request-map uri="createFixedAssetStdCost">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetStdCost"/>
- <response name="success" type="view" value="ListFixedAssetStdCosts"/>
- </request-map>
- <request-map uri="updateFixedAssetStdCost">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetStdCost"/>
- <response name="success" type="view" value="ListFixedAssetStdCosts"/>
- </request-map>
- <request-map uri="cancelFixedAssetStdCost">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="cancelFixedAssetStdCost"/>
- <response name="success" type="view" value="ListFixedAssetStdCosts"/>
- </request-map>
- <!-- FixedAssetIdent -->
- <request-map uri="EditFixedAssetIdents">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditFixedAssetIdents"/>
- <response name="error" type="view" value="EditFixedAssetIdents"/>
- </request-map>
- <request-map uri="createFixedAssetIdent">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetIdent"/>
- <response name="success" type="view" value="EditFixedAssetIdents"/>
- <response name="error" type="view" value="EditFixedAssetIdents"/>
- </request-map>
- <request-map uri="updateFixedAssetIdent">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetIdent"/>
- <response name="success" type="view" value="EditFixedAssetIdents"/>
- <response name="error" type="view" value="EditFixedAssetIdents"/>
- </request-map>
- <request-map uri="removeFixedAssetIdent">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="removeFixedAssetIdent"/>
- <response name="success" type="view" value="EditFixedAssetIdents"/>
- <response name="error" type="view" value="EditFixedAssetIdents"/>
- </request-map>
-
- <!-- FixedAssetRegistration -->
- <request-map uri="EditFixedAssetRegistrations">
- <security https="true" auth="true"/>
- <response name="success" type="view"
value="EditFixedAssetRegistrations"/>
- <response name="error" type="view"
value="EditFixedAssetRegistrations"/>
- </request-map>
- <request-map uri="createFixedAssetRegistration">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetRegistration"/>
- <response name="success" type="view"
value="EditFixedAssetRegistrations"/>
- <response name="error" type="view"
value="EditFixedAssetRegistrations"/>
- </request-map>
- <request-map uri="updateFixedAssetRegistration">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetRegistration"/>
- <response name="success" type="view"
value="EditFixedAssetRegistrations"/>
- <response name="error" type="view"
value="EditFixedAssetRegistrations"/>
- </request-map>
- <request-map uri="deleteFixedAssetRegistration">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteFixedAssetRegistration"/>
- <response name="success" type="view"
value="EditFixedAssetRegistrations"/>
- <response name="error" type="view"
value="EditFixedAssetRegistrations"/>
- </request-map>
<!-- FixedAssetMaintenance -->
<request-map uri="ListFixedAssetMaints">
<security https="true" auth="true"/>
@@ -246,32 +75,7 @@
<response name="error" type="view" value="FindFixedAssetMaints"/>
</request-map>
- <!-- FixedAssetMaintenance Meter -->
- <request-map uri="EditFixedAssetMaintMeters">
- <security https="true" auth="true"/>
- <response name="success" type="view"
value="EditFixedAssetMaintMeters"/>
- <response name="error" type="view" value="EditFixedAssetMaintMeters"/>
- </request-map>
- <request-map uri="createFixedAssetMaintMeter">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetMaintMeter"/>
- <response name="success" type="view"
value="EditFixedAssetMaintMeters"/>
- <response name="error" type="view" value="EditFixedAssetMaintMeters"/>
- </request-map>
- <request-map uri="updateFixedAssetMaintMeter">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetMaintMeter"/>
- <response name="success" type="view"
value="EditFixedAssetMaintMeters"/>
- <response name="error" type="view" value="EditFixedAssetMaintMeters"/>
- </request-map>
- <request-map uri="deleteFixedAssetMaintMeter">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteFixedAssetMaintMeter"/>
- <response name="success" type="view"
value="EditFixedAssetMaintMeters"/>
- <response name="error" type="view" value="EditFixedAssetMaintMeters"/>
- </request-map>
-
- <!-- WorkEffort request mappings -->
+ <!-- WorkEffort request mappings -->
<request-map uri="EditWorkEfforts">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditWorkEfforts"/>
@@ -319,19 +123,6 @@
<response name="success" type="view"
value="EditWorkEffortTimeEntries"/>
<response name="error" type="view" value="EditWorkEffortTimeEntries"/>
</request-map>
-
- <!-- Notes on a Maintenance request mappings -->
- <request-map uri="EditWorkEffortNotes">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditWorkEffortNotes"/>
- </request-map>
-
- <request-map uri="createWorkEffortNote">
- <security https="true" auth="true"/>
- <event type="service" invoke="createWorkEffortNote"/>
- <response name="success" type="view" value="EditWorkEffortNotes"/>
- <response name="error" type="view" value="EditWorkEffortNotes"/>
- </request-map>
<request-map uri="createWorkEffortAndAssoc">
<security https="true" auth="true"/>
@@ -357,7 +148,6 @@
<response name="error" type="view" value="EditItemIssuences"/>
</request-map>
-
<!-- ================ Lookup Requests ================= -->
<request-map uri="LookupFixedAsset"><security auth="true"
https="true"/><response name="success" type="view"
value="LookupFixedAsset"/></request-map>
<request-map uri="LookupPartyName"><security auth="true"
https="true"/><response name="success" type="view"
value="LookupPartyName"/></request-map>
@@ -404,9 +194,10 @@
<view-map name="LookupPerson" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
<view-map name="LookupPartyGroup" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>
<view-map name="LookupOrderHeader" type="screen"
page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/>
- <view-map name="LookupFacility" type="screen"
page="component://product/widget/facility/LookupScreens.xml#LookupFacility"/>
- <view-map name="LookupFacilityLocation"
page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation"
type="screen"/>
<view-map name="LookupPartsProduct" type="screen"
page="component://assetmaint/widget/ProductScreens.xml#LookupPartsProduct"/>
+
+ <!-- Facility screens -->
+ <view-map name="FindFacility" type="screen"
page="component://assetmaint/widget/FacilityScreens.xml#FindFacility"/>
<!-- end of view mappings -->
</site-conf>
