You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/10/06 23:07:11 UTC
svn commit: r702264 - in /ofbiz/trunk/applications:
accounting/script/org/ofbiz/accounting/invoice/
ecommerce/webapp/ecommerce/WEB-INF/ humanres/widget/
manufacturing/webapp/manufacturing/WEB-INF/ marketing/webapp/sfa/WEB-INF/
order/webapp/ordermgr/WEB...
Author: mrisaliti
Date: Mon Oct 6 14:07:11 2008
New Revision: 702264
URL: http://svn.apache.org/viewvc?rev=702264&view=rev
Log:
Various cleanup on application components (Part of issue OFBIZ-1982)
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/LookupScreens.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=702264&r1=702263&r2=702264&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Mon Oct 6 14:07:11 2008
@@ -407,7 +407,7 @@
<if-not-empty field="paymentApplication.billingAccountId">
<field-to-result field-name="paymentApplication.billingAccountId" result-name="billingAccountId"/>
<property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToBillingAccount" field-name="toMessage"/>
- <entity-one entity-name="BillingAccount">
+ <entity-one entity-name="BillingAccount" value-name="billingAccount">
<field-map field-name="billingAccountId" env-name="paymentApplication.billingAccountId"/>
</entity-one>
<set field="currencyUomId" from-field="billingAccount.accountCurrencyUomId"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=702264&r1=702263&r2=702264&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Oct 6 14:07:11 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -133,8 +133,10 @@
<request-map uri="main"><security https="false" auth="false"/><response name="success" type="view" value="main"/></request-map>
<request-map uri="policies"><security https="false" auth="false"/><response name="success" type="view" value="policies"/></request-map>
+ <!-- TO BE REMOVED
<request-map uri="passwordemail"><security https="false" auth="false"/><response name="success" type="view" value="passwordemail"/></request-map>
-
+ -->
+
<request-map uri="setSessionLocale">
<security https="false" auth="false"/>
<event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/>
@@ -772,10 +774,13 @@
<response name="error" type="view" value="main"/>
</request-map>
+ <!-- TO BE REMOVED
<request-map uri="catalog">
<security https="false" auth="false"/>
<response name="success" type="view" value="catalog"/>
</request-map>
+ -->
+
<request-map uri="quickadd">
<security https="false" auth="false"/>
<response name="success" type="view" value="quickadd"/>
@@ -1369,7 +1374,7 @@
</request-map>
- <!-- old forum -->
+ <!-- TO BE REMOVED
<request-map uri="defaultcontent">
<security https="true" auth="false"/>
<response name="success" type="view" value="defaultcontent"/>
@@ -1443,16 +1448,21 @@
<security https="true" auth="false"/>
<response name="success" type="view" value="viewcontent"/>
</request-map>
+ -->
+
+ <!-- TO BE REMOVED
<request-map uri="mostrecent">
<security https="true" auth="true"/>
<response name="success" type="view" value="mostrecent"/>
</request-map>
- <request-map uri="publishResponse">
+ <request-map uri="publishResponse">
<security https="true" auth="true"/>
<event type="service-multi" invoke="updateContent"/>
<response name="success" type="view" value="mostrecent"/>
<response name="error" type="view" value="mostrecent"/>
</request-map>
+ -->
+
<request-map uri="searchContent">
<security https="true" auth="false"/>
<response name="success" type="view" value="searchContent"/>
@@ -1845,19 +1855,20 @@
<!-- new -->
<view-map name="Showforum" type="screen" page="component://ecommerce/widget/ForumScreens.xml#Showforum"/>
<view-map name="AddForumThread" page="component://ecommerce/widget/ForumScreens.xml#AddForumThread" type="screen"/>
- <!-- old -->
+ <view-map name="ViewForumMessage" type="screen" page="component://ecommerce/widget/ForumScreens.xml#ViewForumMessage"/>
+
+ <!-- TO BE REMOVED
<view-map name="showforumarticle" type="screen" page="component://ecommerce/widget/ForumScreens.xml#showforumarticle"/>
<view-map name="createforumarticle" type="screen" page="component://ecommerce/widget/ForumScreens.xml#createforumarticle"/>
<view-map name="editforumarticle" type="screen" page="component://ecommerce/widget/ForumScreens.xml#editforumarticle"/>
- <view-map name="ViewForumMessage" type="screen" page="component://ecommerce/widget/ForumScreens.xml#ViewForumMessage"/>
-
<view-map name="showforumresponse" type="screen" page="component://ecommerce/widget/ForumScreens.xml#showforumresponse"/>
<view-map name="createforumresponse" type="screen" page="component://ecommerce/widget/ForumScreens.xml#createforumresponse"/>
<view-map name="editforuminfo" type="screen" page="component://ecommerce/widget/ForumScreens.xml#editforuminfo"/>
<view-map name="editaddforumdata" type="screen" page="component://ecommerce/widget/ForumScreens.xml#editaddforumdata"/>
<view-map name="editaddimage" type="screen" page="component://ecommerce/widget/ForumScreens.xml#editaddimage"/>
- <!-- Is this used? DEJ20050113 <view-map name="mostrecent" type="screen" page="component://ecommerce/widget/ForumScreens.xml#mostrecent"/> -->
-
+ <view-map name="mostrecent" type="screen" page="component://ecommerce/widget/ForumScreens.xml#mostrecent"/>
+ -->
+
<!-- Quote Views -->
<view-map name="ListQuotes" type="screen" page="component://ecommerce/widget/QuoteScreens.xml#ListQuotes"/>
<view-map name="ViewQuote" type="screen" page="component://ecommerce/widget/QuoteScreens.xml#ViewQuote"/>
@@ -1871,9 +1882,10 @@
<view-map name="NewArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#NewArticle"/>
<view-map name="EditArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditArticle"/>
<view-map name="ViewResponse" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#ViewResponse"/>
- <view-map name="RespondBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#RespondBlog"/>
- <view-map name="EditBlogText" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogText"/>
- <view-map name="EditBlogImage" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogImage"/>
+ <view-map name="RespondBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#AddBlogResponse"/>
+ <view-map name="EditBlogText" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogResponse"/>
+ <view-map name="EditBlogImage" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogResponse"/>
+ <view-map name="EditBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogResponse"/>
<view-map name="LatestResponses" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#LatestResponses"/>
<view-map name="ViewSimpleContent" page="" type="simplecontent"/>
Modified: ofbiz/trunk/applications/humanres/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/LookupScreens.xml?rev=702264&r1=702263&r2=702264&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/LookupScreens.xml Mon Oct 6 14:07:11 2008
@@ -164,6 +164,8 @@
</widgets>
</section>
</screen>
+
+ <!-- TO BE REMOVED
<screen name="LookupAgreement">
<section>
<actions>
@@ -182,6 +184,8 @@
</widgets>
</section>
</screen>
+ -->
+
<screen name="LookupAgreementEmploymentAppl">
<section>
<actions>
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=702264&r1=702263&r2=702264&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Mon Oct 6 14:07:11 2008
@@ -227,7 +227,7 @@
</request-map>
<request-map uri="RemoveRoutingTask">
<security https="true" auth="true"/>
- <event type="service" invoke="removeWorkEffort"/>
+ <event type="service" invoke="deleteWorkEffort"/>
<response name="success" type="view" value="FindRoutingTask"/>
<response name="error" type="view" value="FindRoutingTask"/>
</request-map>
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=702264&r1=702263&r2=702264&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Mon Oct 6 14:07:11 2008
@@ -107,7 +107,9 @@
</request-map>
<request-map uri="mergeLeads">
<security https="true" auth="true"/>
+ <!-- TO DO
<event type="service" invoke="mergeLeads"/>
+ -->
<response name="success" type="view" value="viewprofile"/>
<response name="error" type="view" value="MergeLeads"/>
</request-map>
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=702264&r1=702263&r2=702264&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Mon Oct 6 14:07:11 2008
@@ -952,23 +952,17 @@
</request-map>
<request-map uri="createWebSitePaymentSetting">
<security https="true" auth="true"/>
- <event type="service" invoke="createWebSitePaymentSetting"/>
<response name="success" type="view" value="paysetup"/>
- <response name="error" type="view" value="paysetup"/>
</request-map>
<request-map uri="updateWebSitePaymentSetting">
<security https="true" auth="true"/>
- <event type="service" invoke="updateWebSitePaymentSetting"/>
<response name="success" type="view" value="paysetup"/>
- <response name="error" type="view" value="paysetup"/>
</request-map>
<request-map uri="removeWebSitePaymentSetting">
<security https="true" auth="true"/>
- <event type="service" invoke="removeWebSitePaymentSetting"/>
<response name="success" type="view" value="paysetup"/>
- <response name="error" type="view" value="paysetup"/>
</request-map>
-
+
<request-map uri="OrderPurchaseReportOptions"><security https="true" auth="true"/>
<response name="success" type="view" value="OrderPurchaseReportOptions"/>
</request-map>
@@ -1403,7 +1397,9 @@
</request-map>
<request-map uri="deleteOrderHeader">
<security https="true" auth="true"/>
+ <!-- TO DO
<event type="service" invoke="deleteOrderHeader"/>
+ -->
<response name="success" type="view" value="ListOrderHeaders"/>
<response name="error" type="view" value="ListOrderHeaders"/>
</request-map>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=702264&r1=702263&r2=702264&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Mon Oct 6 14:07:11 2008
@@ -279,7 +279,7 @@
<widgets>
<decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="ApprovedProductRequirementsByVendorList" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ <include-form name="ApprovedProductRequirementsByVendor" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
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=702264&r1=702263&r2=702264&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Mon Oct 6 14:07:11 2008
@@ -394,7 +394,9 @@
</request-map>
<request-map uri="updateTimesheetRole">
<security https="true" auth="true"/>
+ <!-- TO DO
<event type="service" invoke="updateTimesheetRole"/>
+ -->
<response name="success" type="view" value="EditTimesheetRoles"/>
<response name="error" type="view" value="EditTimesheetRoles"/>
</request-map>