svn commit: r1742503 - in /ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/ applications/content/servicedef/ applications/content/template/ applications/content/webapp/content/WEB-INF/ applications/content/widget/compdoc/ applications/hu...

[Deepak Dixit-5]

Author: deepak
Date: Fri May  6 06:48:38 2016
New Revision: 1742503

URL: http://svn.apache.org/viewvc?rev=1742503&view=rev
Log:
(OFBIZ-7043) Remove commented code labeled as "TO BE REMOVED" since 2008.

Removed:
    ofbiz/trunk/applications/content/template/Dummy.ftl
Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/content/servicedef/services_data.xml
    ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
    ofbiz/trunk/applications/humanres/widget/LookupScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/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=1742503&r1=1742502&r2=1742503&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri May  6 06:48:38 2016
@@ -593,13 +593,6 @@ under the License.
         <response name="error" type="view" value="EditPaymentGatewayConfig"/>
     </request-map>
 
-    <!-- TO BE REMOVED
-    <request-map uri="TransactionReports">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="TransactionReports"/>
-    </request-map>
-    -->
-
     <!-- transaction action requests -->
     <request-map uri="processAuthorizeTransaction">
         <security https="true" auth="true"/>
@@ -724,13 +717,6 @@ under the License.
         <response name="success" type="view" value="GlAccountNavigate"/>
     </request-map>
 
-    <!-- TO BE REMOVED
-    <request-map uri="ListGlobalGlAccount">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ListGlobalGlAccount"/>
-    </request-map>
-     -->
-
     <request-map uri="FindGlobalGlAccount">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="FindGlobalGlAccount"/>
@@ -792,10 +778,6 @@ under the License.
         <response name="error" type="view" value="ImportExport"/>
     </request-map>
 
-    <!-- TO BE REMOVED
-    <request-map uri="EditGlobalGlAccountOrganizations"><security https="true" auth="true"/><response name="success" type="view" value="EditGlobalGlAccountOrganizations"/></request-map>
-    -->
-
     <request-map uri="createGlAccountOrganization">
         <security https="true" auth="true"/>
         <event type="service" invoke="createGlAccountOrganization"/>
@@ -809,22 +791,6 @@ under the License.
         <response name="error" type="view" value="ListGlAccountOrganization"/>
     </request-map>
 
-    <!-- TO BE REMOVED
-    <request-map uri="EditGlobalGlAccountRoles"><security https="true" auth="true"/><response name="success" type="view" value="EditGlobalGlAccountRoles"/></request-map>
-    <request-map uri="createGlAccountRole">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createGlAccountRole"/>
-        <response name="success" type="view" value="EditGlobalGlAccountRoles"/>
-        <response name="error" type="view" value="EditGlobalGlAccountRoles"/>
-    </request-map>
-    <request-map uri="updateGlAccountRole">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateGlAccountRole"/>
-        <response name="success" type="view" value="EditGlobalGlAccountRoles"/>
-        <response name="error" type="view" value="EditGlobalGlAccountRoles"/>
-    </request-map>
-    -->
-
     <request-map uri="ListGlAccountEntries">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ListGlAccountEntries"/>
@@ -943,67 +909,6 @@ under the License.
         <response name="error" type="view" value="ListFixedAssetProducts"/>
     </request-map>
 
-    <!-- TO BE REMOVED ??
-    <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="ListFixedAssetParties">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ListFixedAssetParties"/>
-    </request-map>
-    <request-map uri="EditFixedAssetParties">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditFixedAssetParties"/>
-    </request-map>
-    <request-map uri="addPartyToFixedAsset">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="addPartyToFixedAsset"/>
-        <response name="success" type="view" value="EditFixedAssetParties"/>
-        <response name="error" type="view" value="EditFixedAssetParties"/>
-    </request-map>
-    <request-map uri="updatePartyToFixedAsset">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updatePartyToFixedAsset"/>
-        <response name="success" type="view" value="EditFixedAssetParties"/>
-        <response name="error" type="view" value="EditFixedAssetParties"/>
-    </request-map>
-    <request-map uri="removePartyFromFixedAsset">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removePartyFromFixedAsset"/>
-        <response name="success" type="view" value="EditFixedAssetParties"/>
-        <response name="error" type="view" value="EditFixedAssetParties"/>
-    </request-map>
-
-    <request-map uri="ListFixedAssetRollUp"><security https="true" auth="true"/><response name="success" type="view" value="ListFixedAssetRollUp"/></request-map>
-    <request-map uri="EditFixedAssetRollup"><security https="true" auth="true"/><response name="success" type="view" value="EditFixedAssetRollup"/></request-map>
-    <request-map uri="addFixedAssetToFixedAsset">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="safeAddFixedAssetToFixedAsset"/>
-        <response name="success" type="view" value="EditFixedAssetRollup"/>
-        <response name="error" type="view" value="EditFixedAssetRollup"/>
-    </request-map>
-    <request-map uri="updateFixedAssetToFixedAsset">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updateFixedAssetToFixedAsset"/>
-        <response name="success" type="view" value="EditFixedAssetRollup"/>
-        <response name="error" type="view" value="EditFixedAssetRollup"/>
-    </request-map>
-    <request-map uri="removeFixedAssetFromFixedAsset">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removeFixedAssetFromFixedAsset"/>
-        <response name="success" type="view" value="EditFixedAssetRollup"/>
-        <response name="error" type="view" value="EditFixedAssetRollup"/>
-    </request-map>
-    -->
-
     <!-- ================ FixedAsset Standard Costs Requests ================= -->
     <request-map uri="FixedAssetChildren"><security https="true" auth="true"/><response name="success" type="view" value="FixedAssetChildren"/></request-map>
 
@@ -1900,24 +1805,6 @@ under the License.
         <response name="error" type="view" value="EditCreditCardTypeGlAccounts"/>
     </request-map>
 
-    <!-- TO BE REMOVED
-    <request-map uri="reconcileGlAccount">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="reconcileGlAccount"/>
-        <response name="success" type="view" value="ViewGlAccountBalance"/>
-        <response name="error" type="view" value="ReconcileAccounts"/>
-    </request-map>
-    <request-map uri="viewGlAccountBalance">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ViewGlAccountBalance"/>
-    </request-map>
-
-    <request-map uri="viewGlReconciliation">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ViewGlReconciliation"/>
-    </request-map>
-    -->
-
     <request-map uri="findGlAccountReconciliation">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="FindGlAccountReconciliation"/>
@@ -2748,7 +2635,6 @@ under the License.
     <!-- GlAccount, GlJournalEntry, AcctgTrans -->
     <view-map name="AddGlAccount" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#AddGlAccount"/>
     <view-map name="FindGlobalGlAccount" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListGlAccounts"/>
-    <view-map name="ListGlobalGlAccounts" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListGlAccounts"/>
     <view-map name="ListGlAccountsReport" type="screenfop" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListGlAccountsReport" content-type="application/pdf" encoding="none"/>
     <view-map name="ListGlAccountsExport" type="screenxml" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListGlAccountsReport" content-type="text/xml"/>
     <view-map name="GlAccountNavigate" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#GlAccountNavigate"/>
@@ -2758,11 +2644,6 @@ under the License.
     <view-map name="EditGlReconciliation" type="screen" page="component://accounting/widget/GlScreens.xml#EditGlReconciliation"/>
 
     <view-map name="EditGlobalGlAccount" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#AddGlAccount"/>
-    <!-- NOTE/TODO: these 2 appear to never have been implemented all the way, just request and view defs so far...
-    <view-map name="EditGlobalGlAccountOrganizations" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#EditGlobalGlAccountOrganizations"/>
-    <view-map name="EditGlobalGlAccountRoles" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#EditGlobalGlAccountRoles"/>
-    -->
-
     <view-map name="ListGlAccountEntries" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListGlAccountEntries"/>
     <view-map name="ListAcctgTransEntries" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListAcctgTransEntries"/>
     <view-map name="EditPartyGlAccount" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditPartyGlAccount"/>
@@ -2777,10 +2658,6 @@ under the License.
     <view-map name="NewDepositPayment" type="screen" page="component://accounting/widget/FinAccountScreens.xml#NewDepositPayment"/>
     <view-map name="NewWithdrawalPayment" type="screen" page="component://accounting/widget/FinAccountScreens.xml#NewWithdrawalPayment"/>
 
-    <!-- TO BE REMOVED
-    <view-map name="ListFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#ListFinAccount"/>
-    -->
-
     <view-map name="EditFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccount"/>
     <view-map name="EditFinAccountRoles" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountRoles"/>
     <view-map name="EditFinAccountTrans" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountTrans"/>
@@ -2807,18 +2684,6 @@ under the License.
     <view-map name="BudgetRoles" type="screen" page="component://accounting/widget/BudgetScreens.xml#BudgetRoles"/>
     <view-map name="BudgetReviews" type="screen" page="component://accounting/widget/BudgetScreens.xml#BudgetReviews"/>
 
-    <!-- TO BE REMOVED
-    <view-map name="addFixedAssetProduct" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#addFixedAssetProduct"/>
-    <view-map name="updateFixedAssetProduct" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetProduct"/>
-    <view-map name="removeFixedAssetProduct" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#removeFixedAssetProduct"/>
-
-    <view-map name="ListFixedAssetCalendar" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetCalendar"/>
-    <view-map name="updateFixedAssetCalendar" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetCalendar"/>
-
-    <view-map name="ListFixedAssetParties" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetParties"/>
-    <view-map name="ListFixedAssetsRollUp" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetRollUp"/>
-    -->
-
     <view-map name="EditFixedAssetStdCosts" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetStdCosts"/>
     <view-map name="FixedAssetChildren" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetChildren"/>
 
@@ -2910,10 +2775,6 @@ under the License.
     <view-map name="FindPaymentGatewayConfigTypes" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#FindPaymentGatewayConfigTypes" type="screen"/>
     <view-map name="EditPaymentGatewayConfigType" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#EditPaymentGatewayConfigType" type="screen"/>
 
-    <!-- TO BE REMOVED
-    <view-map name="TransactionReports" page="component://accounting/widget/TransactionScreens.xml#TransactionReports" type="screen"/>
-    -->
-
     <!-- Lookup mappings -->
     <view-map name="viewprofile" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewprofile"/>
     <view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>

Modified: ofbiz/trunk/applications/content/servicedef/services_data.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_data.xml?rev=1742503&r1=1742502&r2=1742503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_data.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_data.xml Fri May  6 06:48:38 2016
@@ -275,14 +275,6 @@
         <attribute mode="IN" name="dataResourceTypeId" optional="true" type="String"/>
         <attribute mode="IN" name="objectInfo" optional="true" type="String"/>
     </service>
-    <!-- TO BE REMOVED
-    <service name="removeFile" engine="simple"
-            location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeFile" auth="true">
-        <description>Remove File</description>
-        <attribute mode="IN" name="rootDir" optional="true" type="String"/>
-    </service>
-    -->
-
     <!-- Cleared associated DataResource rendered cache from UtilCache. -->
     <service name="clearAssociatedRenderCache" engine="java" auth="true" default-entity-name="DataResource"
             location="org.ofbiz.content.data.DataServices" invoke="clearAssociatedRenderCache">

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=1742503&r1=1742502&r2=1742503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Fri May  6 06:48:38 2016
@@ -163,20 +163,6 @@ under the License.
         <response name="success" type="view" value="ViewResponse"/>
         <response name="error" type="view" value="ViewResponse"/>
     </request-map>
-    <!--  UNUSED REQUEST TO BE REMOVED
-    <request-map uri="defaultcontent">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="defaultcontent"/>
-    </request-map>
-    <request-map uri="showcontenttree">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="showcontenttree"/>
-    </request-map>
-    <request-map uri="viewcontent">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="viewcontent"/>
-    </request-map>
-    -->
     <!-- ================ Forum Requests ================= -->
     <request-map uri="findForumGroups">
         <security https="true" auth="true"/>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=1742503&r1=1742502&r2=1742503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Fri May  6 06:48:38 2016
@@ -532,36 +532,6 @@ under the License.
         <field name="newDataResourceId" widget-style="inputBox"></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit/></field>
     </form>
-    <!-- TO BE REMOVED
-    <form name="ListContentRevisionItemApproval" type="list"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <entity-and entity-name="ContentRevisionItemAndContentApprovalView" use-cache="true">
-                <field-map from-field="contentId" field-name="contentId"/>
-                <field-map from-field="contentRevisionSeqId" field-name="contentRevisionSeqId"/>
-            </entity-and>
-        </actions>
-        <field name="contentId"><display/></field>
-        <field name="contentRevisionSeqId"><display/></field>
-        <field name="itemContentId"><display/></field>
-        <field name="oldDataResourceId"><display/></field>
-        <field name="newDataResourceId"><display/></field>
-        <field name="contentApprovalId"><display/></field>
-
-        <field name="editLink" title=" " widget-style="buttontext" use-when="approvalCount &gt; 0">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem">
-                <parameter param-name="contentId"/>
-                <parameter param-name="contentRevisionSeqId"/>
-                <parameter param-name="itemContentId"/>
-                <parameter param-name="rootContentId"/>
-                <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId/>
-            </hyperlink>
-        </field>
-        <field name="create" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="Create" target="EditContentRevisionItem"/>
-        </field>
-    </form>
-    -->
     <form name="UploadCompDocContent" type="upload" target="uploadCompDocContent"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="caContentIdTo" entry-name="contentIdTo" map-name="contentAssoc"><hidden/></field>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=1742503&r1=1742502&r2=1742503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Fri May  6 06:48:38 2016
@@ -1208,38 +1208,6 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <!-- TO BE REMOVED
-    <screen name="ListContentRevisionItemApproval">
-        <section>
-            <condition>
-                <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
-            </condition>
-            <actions>
-                <set field="menuName" value="empty"/>
-                <set field="title" value="ContentRevisionItem and Approval List Page"/>
-
-                <set field="contentId" from-field="parameters.contentId" to-scope="screen" default-value="${defaultContentId}"/>
-                <set field="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" to-scope="screen" default-value="${defaultContentRevisionSeqId}"/>
-
-                <entity-and entity-name="ContentRevisionItemAndContentApprovalView" use-cache="true" list-name="ContentRevAppList">
-                        <field-map from-field="contentId" field-name="contentId"/>
-                        <field-map from-field="contentRevisionSeqId" field-name="contentRevisionSeqId"/>
-                </entity-and>
-            </actions>
-            <widgets>
-                <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <platform-specific>
-                            <html>
-                                <html-template location="component://content/template/Dummy.ftl"/>
-                            </html>
-                        </platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    -->
     <screen name="EditCompDocContentRole">
         <section>
             <condition>

Modified: ofbiz/trunk/applications/humanres/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/LookupScreens.xml?rev=1742503&r1=1742502&r2=1742503&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/LookupScreens.xml Fri May  6 06:48:38 2016
@@ -200,27 +200,6 @@
         </section>
     </screen>
 
-    <!-- TO BE REMOVED
-    <screen name="LookupAgreement">
-        <section>
-            <actions>
-                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="title" value="${uiLabelMap.HumanResLookupAgreement}"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="search-options">
-                        <include-form name="LookupAgreement" location="component://humanres/widget/forms/LookupForms.xml"/>
-                    </decorator-section>
-                    <decorator-section name="search-results">
-                        <include-form name="ListAgreements" location="component://humanres/widget/forms/LookupForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    -->
-
     <screen name="LookupAgreementEmploymentAppl">
         <section>
             <actions>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1742503&r1=1742502&r2=1742503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Fri May  6 06:48:38 2016
@@ -124,10 +124,6 @@ under the License.
     <request-map uri="main"><security https="false" auth="false"/><response name="success" type="view" value="main" save-current-view="true"/></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>
-    -->
-
     <!-- Session Setting Requests -->
     <request-map uri="setSessionLocale">
         <security https="false" auth="false"/>
@@ -844,13 +840,6 @@ under the License.
         <response name="success" type="none"/>
     </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"/>
@@ -1495,83 +1484,6 @@ under the License.
         <response name="error" type="view" value="main"/>
     </request-map>
 
-    <!-- TO BE REMOVED
-    <request-map uri="createforumarticle">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="createforumarticle"/>
-    </request-map>
-    <request-map uri="editforumarticle">
-        <security https="true" auth="false"/>
-        <response name="success" type="view" value="editforumarticle"/>
-    </request-map>
-    <request-map uri="createforumresponse">
-        <security https="true" auth="false"/>
-        <response name="success" type="view" value="createforumresponse"/>
-    </request-map>
-    <request-map uri="editforuminfo">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="editforuminfo"/>
-    </request-map>
-    <request-map uri="editaddforumdata">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="editaddforumdata"/>
-    </request-map>
-    <request-map uri="editaddimage">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="editaddimage"/>
-    </request-map>
-    <request-map uri="persistImage">
-        <security auth="true" https="true"/>
-        <event type="java" path="org.ofbiz.content.content.UploadContentAndImage" invoke="uploadContentAndImage"/>
-        <response name="success" type="view" value="editforumarticle"/>
-        <response name="error" type="view" value="editaddimage"/>
-    </request-map>
-    <request-map uri="img">
-        <security auth="false" https="false"/>
-        <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="serveImage"/>
-        <response name="success" type="none"/>
-        <response name="error" type="view" value="main"/>
-    </request-map>
-    <request-map uri="uploadArticleAndImage">
-        <security https="true" auth="true"/>
-        <event type="java" path="org.ofbiz.content.content.UploadContentAndImage" invoke="uploadContentAndImage"/>
-        <response name="success" type="view" value="editforumarticle"/>
-        <response name="error" type="view" value="createforumarticle"/>
-    </request-map>
-    <request-map uri="updateContent">
-        <security auth="true" https="true"/>
-        <event invoke="updateContent" path="component://content/script/org/ofbiz/content/content/ContentEvents.xml" type="simple"/>
-        <response name="success" type="view" value="editforumarticle"/>
-        <response name="error" type="view" value="editforuminfo"/>
-    </request-map>
-
-    <request-map uri="uploadResponse">
-        <security https="true" auth="true"/>
-        <event invoke="persistContentAndAssoc" type="service"/>
-        <response name="success" type="view" value="showforumresponse"/>
-        <response name="error" type="view" value="createforumresponse"/>
-    </request-map>
-    <request-map uri="persistContent">
-        <security auth="true" https="true"/>
-        <event invoke="persistContentAndAssoc" type="service"/>
-        <response name="success" type="view" value="editforumarticle"/>
-        <response name="error" type="view" value="editaddforumdata"/>
-    </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">
-        <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"/>