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 2009/04/21 21:57:58 UTC

svn commit: r767278 - in /ofbiz/trunk/applications/accounting: config/ data/ entitydef/ script/org/ofbiz/accounting/payment/ servicedef/ webapp/accounting/WEB-INF/ widget/

Author: mrisaliti
Date: Tue Apr 21 19:57:57 2009
New Revision: 767278

URL: http://svn.apache.org/viewvc?rev=767278&view=rev
Log:
Misc improvements on Payment Gateway Config (OFBIZ-2297)

Added:
    ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml   (contents, props changed)
      - copied, changed from r767263, ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml
    ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml   (contents, props changed)
      - copied, changed from r767263, ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml
Removed:
    ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml
    ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml
Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=767278&r1=767277&r2=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Apr 21 19:57:57 2009
@@ -5733,12 +5733,12 @@
         <value xml:lang="en">Payment Gateway Config Type Id</value>
         <value xml:lang="it">Tipo configurazione gateway pagamenti</value>
     </property>
-    <property key="AccountingPaymentGatewayConfigurations">
-        <value xml:lang="en">Payment Gateway Configurations</value>
+    <property key="AccountingPaymentGatewayConfig">
+        <value xml:lang="en">Payment Gateway Config</value>
         <value xml:lang="it">Configurazioni gateway pagamenti</value>
     </property>
-    <property key="AccountingPaymentGatewayConfigurationTypes">
-        <value xml:lang="en">Payment Gateway Configuration Types</value>
+    <property key="AccountingPaymentGatewayConfigTypes">
+        <value xml:lang="en">Payment Gateway Config Types</value>
         <value xml:lang="it">Tipi configurazione gateway pagamenti</value>
     </property>
     <property key="AccountingPaymentGatewayDecline">
@@ -10431,12 +10431,12 @@
         <value xml:lang="ru">Поиск финансовых счетов</value>
         <value xml:lang="th">ค้นหางบกำไรสะสมและงบแสดงการเปลี่ยนแปลงฐานะการเงิน</value>
     </property>
-    <property key="PageTitleFindPaymentGatewayConfigurations">
-        <value xml:lang="en">Find Payment Gateway Configurations</value>
+    <property key="PageTitleFindPaymentGatewayConfig">
+        <value xml:lang="en">Find Payment Gateway Config</value>
         <value xml:lang="it">Ricerca configurazioni gateway pagamenti</value>
     </property>
-    <property key="PageTitleFindPaymentGatewayConfigurationTypes">
-        <value xml:lang="en">Find Payment Gateway Configuration Types</value>
+    <property key="PageTitleFindPaymentGatewayConfigTypes">
+        <value xml:lang="en">Find Payment Gateway Config Types</value>
         <value xml:lang="it">Ricerca tipi configurazioni gateway pagamenti</value>
     </property>
     <property key="PageTitleFindGatewayResponses">
@@ -10882,24 +10882,24 @@
         <value xml:lang="th">Un-posted Accounting Transactions</value>
         <value xml:lang="zh">未过户财务交易</value>
     </property>
-    <property key="PageTitleUpdatePaymentGatewayConfiguration">
-        <value xml:lang="en">Update Payment Gateway Configuration</value>
+    <property key="PageTitleUpdatePaymentGatewayConfig">
+        <value xml:lang="en">Update Payment Gateway Config</value>
         <value xml:lang="it">Aggiorna configurazione gateway pagamento</value>
     </property>
-    <property key="PageTitleUpdatePaymentGatewayConfigurationType">
-        <value xml:lang="en">Update Payment Gateway Configuration Type</value>
+    <property key="PageTitleUpdatePaymentGatewayConfigType">
+        <value xml:lang="en">Update Payment Gateway Config Type</value>
         <value xml:lang="it">Aggiorna tipo configurazione gateway pagamento</value>
     </property>
-    <property key="PageTitleUpdatePaymentGatewayConfigurationClearCommerce">
-        <value xml:lang="en">Update Payment Gateway Configuration Clear Commerce</value>
+    <property key="PageTitleUpdatePaymentGatewayConfigClearCommerce">
+        <value xml:lang="en">Update Payment Gateway Config Clear Commerce</value>
         <value xml:lang="it">Aggiorna configurazione gateway pagamento Clear Commerce</value>
     </property>
-    <property key="PageTitleUpdatePaymentGatewayConfigurationPayflowPro">
-        <value xml:lang="en">Update Payment Gateway Configuration Payflow Pro</value>
+    <property key="PageTitleUpdatePaymentGatewayConfigPayflowPro">
+        <value xml:lang="en">Update Payment Gateway Config Payflow Pro</value>
         <value xml:lang="it">Aggiorna configurazione gateway pagamento Payflow Pro</value>
     </property>
-    <property key="PageTitleUpdatePaymentGatewayConfigurationPayPal">
-        <value xml:lang="en">Update Payment Gateway Configuration PayPal</value>
+    <property key="PageTitleUpdatePaymentGatewayConfigPayPal">
+        <value xml:lang="en">Update Payment Gateway Config PayPal</value>
         <value xml:lang="it">Aggiorna configurazione gateway pagamento PayPal</value>
     </property>
     <property key="PageTitleViewAccountingTransaction">

Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=767278&r1=767277&r2=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Tue Apr 21 19:57:57 2009
@@ -665,17 +665,17 @@
     <PaymentType description="POS Paid Out" hasTable="N" parentTypeId="DISBURSEMENT" paymentTypeId="POS_PAID_OUT"/>
     <PaymentType description="POS Paid In" hasTable="N" parentTypeId="RECEIPT" paymentTypeId="POS_PAID_IN"/>
 
-    <!-- Payment Gateway Configuration -->
-    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYFLOWPRO" hasTable="N" description="Payment Gateway Payflow Pro"/>
-    <PaymentGatewayConfig paymentGatewayConfigId="PAYFLOWPRO_CONFIG" paymentGatewayConfigTypeId="PAYFLOWPRO" description="Configuration of Payflow Pro"/>
+    <!-- Payment Gateway Config -->
+    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYFLOWPRO" hasTable="N" description="Payflow Pro Payment Gateway"/>
+    <PaymentGatewayConfig paymentGatewayConfigId="PAYFLOWPRO_CONFIG" paymentGatewayConfigTypeId="PAYFLOWPRO" description="Payflow Pro Config"/>
     <PaymentGatewayPayflowPro paymentGatewayConfigId="PAYFLOWPRO_CONFIG" certsPath="${sys:getProperty('ofbiz.home')}/applications/accounting/pfcerts" hostAddress="test-payflow.verisign.com" hostPort="443" timeout="80" proxyAddress="" proxyPort="80" proxyLogon="" proxyPassword="" vendor="[Vendor]" userId="[PayFlow UserID]" pwd="[PayFlow Password]" partner="[PayFlow Partner]" checkAvs="Y" checkCvv2="Y" preAuth="Y" enableTransmit="true" logFileName="${sys:getProperty('ofbiz.home')}/runtime/logs/payflow_java.log" loggingLevel="6" maxLogFileSize="1000000" stackTraceOn="N"/>
     
-    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N" description="Payment Gateway PayPal"/>
-    <PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAYPAL" description="Configuration of PayPal"/>
+    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N" description="PayPal Payment Gateway"/>
+    <PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAYPAL" description="PayPal Config"/>
     <PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG" businessEmail="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl="" confirmTemplate="/order/emailconfirmation.ftl" redirectUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr" confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr"/>
     
-    <PaymentGatewayConfigType paymentGatewayConfigTypeId="CLEARCOMMERCE" hasTable="N" description="Payment Gateway Clear Commerce"/>
-    <PaymentGatewayConfig paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" paymentGatewayConfigTypeId="CLEARCOMMERCE" description="Configuration of Clear Commerce"/>
+    <PaymentGatewayConfigType paymentGatewayConfigTypeId="CLEARCOMMERCE" hasTable="N" description="Clear Commerce Payment Gateway"/>
+    <PaymentGatewayConfig paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" paymentGatewayConfigTypeId="CLEARCOMMERCE" description="Clear Commerce Config"/>
     <PaymentGatewayClearCommerce paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" sourceId="mySource" groupId="myGroup" clientId="[ClearCommerce clientId]" username="[ClearCommerce username]" pwd="[ClearCommerce password]" userAlias="[ClearCommerce alias]" effectiveAlias="" processMode="P" serverURL="https://test5x.clearcommerce.com:11500" enableCVM="N"/>
     
     <!--  Credit Card methods by type -->

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=767278&r1=767277&r2=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Tue Apr 21 19:57:57 2009
@@ -2967,7 +2967,7 @@
     </entity>
     <entity entity-name="PaymentGatewayConfigType"
         package-name="org.ofbiz.accounting.payment"
-        title="Payment Gateway Configuration Type">
+        title="Payment Gateway Config Type">
       <field name="paymentGatewayConfigTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -2982,7 +2982,7 @@
     </entity>
     <entity entity-name="PaymentGatewayConfig"
         package-name="org.ofbiz.accounting.payment"
-        title="Payment Gateway Configuration">
+        title="Payment Gateway Config">
       <field name="paymentGatewayConfigId" type="id-ne"></field>
       <field name="paymentGatewayConfigTypeId" type="id-ne"></field>
       <field name="description" type="description"></field>
@@ -2993,7 +2993,7 @@
     </entity>
     <entity entity-name="PaymentGatewayPayflowPro"
         package-name="org.ofbiz.accounting.payment"
-        title="Payflow Pro Payment Gateway Configuration">
+        title="Payflow Pro Payment Gateway Config">
       <field name="paymentGatewayConfigId" type="id-ne"></field>
       <field name="certsPath" type="value"><description>Path the the VeriSign Certificate</description></field>
       <field name="hostAddress" type="value"><description>Address of the payment processor</description></field>
@@ -3002,10 +3002,10 @@
       <field name="proxyAddress" type="value"><description>Proxy Address</description></field>
       <field name="proxyPort" type="numeric"><description>Proxy Port</description></field>
       <field name="proxyLogon" type="value"><description>Proxy Logon</description></field>
-      <field name="proxyPassword" type="value"><description>Proxy Password</description></field>
+      <field name="proxyPassword" type="value" encrypt="true"><description>Proxy Password</description></field>
       <field name="vendor" type="short-varchar"><description>Vendor of account information</description></field>
       <field name="userId" type="short-varchar"><description>PayFlow UserID of account information</description></field>
-      <field name="pwd" type="short-varchar"><description>PayFlow Password of account information</description></field>
+      <field name="pwd" type="value" encrypt="true"><description>PayFlow Password of account information</description></field>
       <field name="partner" type="short-varchar"><description>PayFlow Partner of account information</description></field>
       <field name="checkAvs" type="indicator"><description>Use Address Verification</description></field>
       <field name="checkCvv2" type="indicator"><description>Require CVV2 Verification</description></field>
@@ -3022,7 +3022,7 @@
     </entity>
     <entity entity-name="PaymentGatewayPayPal"
         package-name="org.ofbiz.accounting.payment"
-        title="PayPal Payment Gateway Configuration">
+        title="PayPal Payment Gateway Config">
         <field name="paymentGatewayConfigId" type="id-ne"></field>
         <field name="businessEmail" type="value"><description>Business e-mail</description></field>
         <field name="notifyUrl" type="value"><description>Notify URL</description></field>
@@ -3039,13 +3039,13 @@
     </entity>
     <entity entity-name="PaymentGatewayClearCommerce"
         package-name="org.ofbiz.accounting.payment"
-        title="Clear Commerce Payment Gateway Configuration">
+        title="Clear Commerce Payment Gateway Config">
       <field name="paymentGatewayConfigId" type="id-ne"></field>
       <field name="sourceId" type="short-varchar"><description>Useful for tagging transactions</description></field>
       <field name="groupId" type="short-varchar"><description>Useful for grouping transactions</description></field>
       <field name="clientId" type="short-varchar"><description>Client Id of account information</description></field>
       <field name="username" type="short-varchar"><description>User name of account informatio</description></field>
-      <field name="pwd" type="short-varchar"><description>Password of account informatio</description></field>
+      <field name="pwd" type="value" encrypt="true"><description>Password of account informatio</description></field>
       <field name="userAlias" type="short-varchar"><description>Alias of account informatio</description></field>
       <field name="effectiveAlias" type="short-varchar"><description>Effective Alias of account information</description></field>
       <field name="processMode" type="indicator"><description>Process mode (Y: approve / N: decline / R: random / P: production)</description></field>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml?rev=767278&r1=767277&r2=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml Tue Apr 21 19:57:57 2009
@@ -20,31 +20,31 @@
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
-    <simple-method method-name="updateGatewayConfiguration" short-description="Update Payment Gateway Configuration">
+    <simple-method method-name="updatePaymentGatewayConfig" short-description="Update Payment Gateway Config">
         <entity-one entity-name="PaymentGatewayConfig" value-field="lookedUpValue"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
     
-    <simple-method method-name="updateGatewayConfigurationPayflowPro" short-description="Update Payment Gateway Configuration Payflow Pro">
+    <simple-method method-name="updatePaymentGatewayConfigPayflowPro" short-description="Update Payment Gateway Config Payflow Pro">
         <entity-one entity-name="PaymentGatewayPayflowPro" value-field="lookedUpValue"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
     
-    <simple-method method-name="updateGatewayConfigurationPayPal" short-description="Update Payment Gateway Configuration PayPal">
+    <simple-method method-name="updatePaymentGatewayConfigPayPal" short-description="Update Payment Gateway Config PayPal">
         <entity-one entity-name="PaymentGatewayPayPal" value-field="lookedUpValue"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
     
-    <simple-method method-name="updateGatewayConfigurationClearCommerce" short-description="Update Payment Gateway Configuration Clear Commerce">
+    <simple-method method-name="updatePaymentGatewayConfigClearCommerce" short-description="Update Payment Gateway Config Clear Commerce">
         <entity-one entity-name="PaymentGatewayClearCommerce" value-field="lookedUpValue"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
     
-    <simple-method method-name="updateGatewayConfigurationType" short-description="Update Payment Gateway Configuration Type">
+    <simple-method method-name="updatePaymentGatewayConfigType" short-description="Update Payment Gateway Config Type">
         <entity-one entity-name="PaymentGatewayConfigType" value-field="lookedUpValue"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-field="lookedUpValue"/>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml?rev=767278&r1=767277&r2=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml Tue Apr 21 19:57:57 2009
@@ -20,37 +20,37 @@
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
-    <description>Accounting Payment Gateway Configuration Services</description>
+    <description>Accounting Payment Gateway Config Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
     
-    <!-- Payment Gateway Configuration Method services -->
-    <service name="updateGatewayConfiguration" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfiguration">
-        <description>Update Payment Gateway Configuration</description>
+    <!-- Payment Gateway Config Method services -->
+    <service name="updatePaymentGatewayConfig" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfig">
+        <description>Update Payment Gateway Config</description>
         <auto-attributes entity-name="PaymentGatewayConfig" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="PaymentGatewayConfig" include="nonpk" mode="IN" optional="true"/>
     </service>
     
-    <service name="updateGatewayConfigurationPayflowPro" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfigurationPayflowPro">
-        <description>Update Payment Gateway Configuration Payflow Pro</description>
+    <service name="updatePaymentGatewayConfigPayflowPro" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigPayflowPro">
+        <description>Update Payment Gateway Config Payflow Pro</description>
         <auto-attributes entity-name="PaymentGatewayPayflowPro" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="PaymentGatewayPayflowPro" include="nonpk" mode="IN" optional="true"/>
     </service>
     
-    <service name="updateGatewayConfigurationPayPal" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfigurationPayPal">
-        <description>Update Payment Gateway Configuration PayPal</description>
+    <service name="updatePaymentGatewayConfigPayPal" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigPayPal">
+        <description>Update Payment Gateway Config PayPal</description>
         <auto-attributes entity-name="PaymentGatewayPayPal" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="PaymentGatewayPayPal" include="nonpk" mode="IN" optional="true"/>
     </service>
     
-    <service name="updateGatewayConfigurationClearCommerce" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfigurationClearCommerce">
-        <description>Update Payment Gateway Configuration Clear Commerce</description>
+    <service name="updatePaymentGatewayConfigClearCommerce" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigClearCommerce">
+        <description>Update Payment Gateway Config Clear Commerce</description>
         <auto-attributes entity-name="PaymentGatewayClearCommerce" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="PaymentGatewayClearCommerce" include="nonpk" mode="IN" optional="true"/>
     </service>
     
-    <service name="updateGatewayConfigurationType" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfigurationType">
-        <description>Update Payment Gateway Configuration Type</description>
+    <service name="updatePaymentGatewayConfigType" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigType">
+        <description>Update Payment Gateway Config Type</description>
         <auto-attributes entity-name="PaymentGatewayConfigType" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="PaymentGatewayConfigType" include="nonpk" mode="IN" optional="true"/>
     </service>

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=767278&r1=767277&r2=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Apr 21 19:57:57 2009
@@ -406,52 +406,52 @@
         <response name="success" type="view" value="ManualTransaction"/>
     </request-map>
     
-    <!-- Payment Gateway Configurations --> 
-    <request-map uri="FindGatewayConfigurations">
+    <!-- Payment Gateway Config --> 
+    <request-map uri="FindPaymentGatewayConfig">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindGatewayConfigurations"/>
+        <response name="success" type="view" value="FindPaymentGatewayConfig"/>
     </request-map>
-    <request-map uri="ViewGatewayConfiguration">
+    <request-map uri="EditPaymentGatewayConfig">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="ViewGatewayConfiguration"/>
+        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
     </request-map>
-    <request-map uri="UpdateGatewayConfiguration">
+    <request-map uri="UpdatePaymentGatewayConfig">
         <security https="true" auth="true"/>
-        <event type="service" invoke="updateGatewayConfiguration"/>
-        <response name="success" type="view" value="ViewGatewayConfiguration"/>
-        <response name="error" type="view" value="ViewGatewayConfiguration"/>
+        <event type="service" invoke="updatePaymentGatewayConfig"/>
+        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
+        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
     </request-map>
-    <request-map uri="UpdateGatewayConfigurationPayflowPro">
+    <request-map uri="UpdatePaymentGatewayConfigPayflowPro">
         <security https="true" auth="true"/>
-        <event type="service" invoke="updateGatewayConfigurationPayflowPro"/>
-        <response name="success" type="view" value="ViewGatewayConfiguration"/>
-        <response name="error" type="view" value="ViewGatewayConfiguration"/>
+        <event type="service" invoke="updatePaymentGatewayConfigPayflowPro"/>
+        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
+        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
     </request-map>
-    <request-map uri="UpdateGatewayConfigurationPayPal">
+    <request-map uri="UpdatePaymentGatewayConfigPayPal">
         <security https="true" auth="true"/>
-        <event type="service" invoke="updateGatewayConfigurationPayPal"/>
-        <response name="success" type="view" value="ViewGatewayConfiguration"/>
-        <response name="error" type="view" value="ViewGatewayConfiguration"/>
+        <event type="service" invoke="updatePaymentGatewayConfigPayPal"/>
+        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
+        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
     </request-map>
-    <request-map uri="UpdateGatewayConfigurationClearCommerce">
+    <request-map uri="UpdatePaymentGatewayConfigClearCommerce">
         <security https="true" auth="true"/>
-        <event type="service" invoke="updateGatewayConfigurationClearCommerce"/>
-        <response name="success" type="view" value="ViewGatewayConfiguration"/>
-        <response name="error" type="view" value="ViewGatewayConfiguration"/>
+        <event type="service" invoke="updatePaymentGatewayConfigClearCommerce"/>
+        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
+        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
     </request-map>
-    <request-map uri="FindGatewayConfigurationTypes">
+    <request-map uri="FindPaymentGatewayConfigTypes">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindGatewayConfigurationTypes"/>
+        <response name="success" type="view" value="FindPaymentGatewayConfigTypes"/>
     </request-map>
-    <request-map uri="ViewGatewayConfigurationType">
+    <request-map uri="EditPaymentGatewayConfigType">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="ViewGatewayConfigurationType"/>
+        <response name="success" type="view" value="EditPaymentGatewayConfigType"/>
     </request-map>
-    <request-map uri="UpdateGatewayConfigurationType">
+    <request-map uri="UpdatePaymentGatewayConfigType">
         <security https="true" auth="true"/>
-        <event type="service" invoke="updateGatewayConfigurationType"/>
-        <response name="success" type="view" value="ViewGatewayConfigurationType"/>
-        <response name="error" type="view" value="ViewGatewayConfigurationType"/>
+        <event type="service" invoke="updatePaymentGatewayConfigType"/>
+        <response name="success" type="view" value="EditPaymentGatewayConfigType"/>
+        <response name="error" type="view" value="EditPaymentGatewayConfigType"/>
     </request-map>
     
     <!-- TO BE REMOVED
@@ -2156,11 +2156,11 @@
     <view-map name="AuthorizeTransaction" page="component://accounting/widget/TransactionScreens.xml#AuthorizeTransaction" type="screen"/>
     <view-map name="CaptureTransaction" page="component://accounting/widget/TransactionScreens.xml#CaptureTransaction" type="screen"/>
 
-    <!-- Payment Gateway Configurations -->
-    <view-map name="FindGatewayConfigurations" page="component://accounting/widget/PaymentGatewayConfigurationsScreens.xml#FindGatewayConfigurations" type="screen"/>
-    <view-map name="ViewGatewayConfiguration" page="component://accounting/widget/PaymentGatewayConfigurationsScreens.xml#ViewGatewayConfiguration" type="screen"/>
-    <view-map name="FindGatewayConfigurationTypes" page="component://accounting/widget/PaymentGatewayConfigurationsScreens.xml#FindGatewayConfigurationTypes" type="screen"/>
-    <view-map name="ViewGatewayConfigurationType" page="component://accounting/widget/PaymentGatewayConfigurationsScreens.xml#ViewGatewayConfigurationType" type="screen"/>
+    <!-- Payment Gateway Config -->
+    <view-map name="FindPaymentGatewayConfig" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#FindPaymentGatewayConfig" type="screen"/>
+    <view-map name="EditPaymentGatewayConfig" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#EditPaymentGatewayConfig" type="screen"/>
+    <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"/>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=767278&r1=767277&r2=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Apr 21 19:57:57 2009
@@ -30,7 +30,12 @@
             </condition>
             <link target="FindGatewayResponses"/>
         </menu-item>
-        <menu-item name="PaymentGateways" title="${uiLabelMap.AccountingPaymentGatewayConfigurations}"><link target="FindGatewayConfigurations"/></menu-item>
+        <menu-item name="PaymentGatewayConfig" title="${uiLabelMap.AccountingPaymentGatewayConfig}">
+            <condition>
+                <if-has-permission permission="PAYPROC" action="_ADMIN"/>
+            </condition>
+            <link target="FindPaymentGatewayConfig"/>
+        </menu-item>
         <menu-item name="billingaccount" title="${uiLabelMap.AccountingBillingMenu}"><link target="FindBillingAccount"/></menu-item>
         <menu-item name="FindFinAccount" title="${uiLabelMap.AccountingFinAccount}"><link target="FindFinAccount"/></menu-item>
         <menu-item name="TaxAuthorities" title="${uiLabelMap.AccountingTaxAuthorities}"><link target="FindTaxAuthority"/></menu-item>
@@ -948,12 +953,12 @@
         </menu-item>
     </menu>
     
-    <menu name="PaymentGatewayTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
-        <menu-item name="paymentGatewayConfigurationsTab" title="${uiLabelMap.AccountingPaymentGatewayConfigurations}">
-            <link target="FindGatewayConfigurations"/>
+    <menu name="PaymentGatewayConfigTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="paymentGatewayConfigTab" title="${uiLabelMap.AccountingPaymentGatewayConfig}">
+            <link target="FindPaymentGatewayConfig"/>
         </menu-item>
-        <menu-item name="paymentGatewayConfigurationTypesTab" title="${uiLabelMap.AccountingPaymentGatewayConfigurationTypes}">
-            <link target="FindGatewayConfigurationTypes"/>
+        <menu-item name="paymentGatewayConfigTypesTab" title="${uiLabelMap.AccountingPaymentGatewayConfigTypes}">
+            <link target="FindPaymentGatewayConfigTypes"/>
         </menu-item>
     </menu>
 </menus>

Copied: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml (from r767263, ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?p2=ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml&p1=ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml&r1=767263&r2=767278&rev=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Tue Apr 21 19:57:57 2009
@@ -19,8 +19,8 @@
 -->
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     
-    <!-- form whose input filters the ListFindGatewayConfigurations -->
-    <form name="FindGatewayConfigurations" type="single" target="FindGatewayConfigurations" header-row-style="header-row" default-table-style="basic-table">
+    <!-- form whose input filters the FindPaymentGatewayConfig -->
+    <form name="FindPaymentGatewayConfig" type="single" target="FindPaymentGatewayConfig" header-row-style="header-row" default-table-style="basic-table">
         <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
@@ -37,7 +37,7 @@
         </field>
     </form>
     
-    <form name="ListGatewayConfigurations" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+    <form name="ListPaymentGatewayConfig" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
@@ -47,7 +47,7 @@
         </actions>
         <auto-fields-entity entity-name="PaymentGatewayConfig" default-field-type="display"/>
         <field name="paymentGatewayConfigId" widget-style="buttontext" title="${uiLabelMap.AccountingPaymentGatewayConfigId}">
-          <hyperlink description="${paymentGatewayConfigId}" target="ViewGatewayConfiguration?paymentGatewayConfigId=${paymentGatewayConfigId}"/>
+          <hyperlink description="${paymentGatewayConfigId}" target="EditPaymentGatewayConfig?paymentGatewayConfigId=${paymentGatewayConfigId}"/>
         </field>
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"/>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
@@ -55,7 +55,7 @@
         </field>
     </form>
     
-    <form name="ViewGatewayConfiguration" type="single" target="UpdateGatewayConfiguration" default-map-name="paymentGatewayConfig" header-row-style="header-row" default-table-style="basic-table">
+    <form name="EditPaymentGatewayConfig" type="single" target="UpdatePaymentGatewayConfig" default-map-name="paymentGatewayConfig" header-row-style="header-row" default-table-style="basic-table">
         <field name="paymentGatewayConfigId"><hidden/></field>
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text size="60" maxlength="60"/></field>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
@@ -66,7 +66,7 @@
         </field>
     </form>
     
-    <form name="ViewGatewayConfigurationPayflowPro" type="single" target="UpdateGatewayConfigurationPayflowPro" default-map-name="paymentGatewayPayflowPro" header-row-style="header-row" default-table-style="basic-table">
+    <form name="EditPaymentGatewayConfigPayflowPro" type="single" target="UpdatePaymentGatewayConfigPayflowPro" default-map-name="paymentGatewayPayflowPro" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="PaymentGatewayPayflowPro" default-field-type="edit"/>
         <field name="certsPath"><text size="80" maxlength="80"/></field>
         <field name="paymentGatewayConfigId"><hidden/></field>
@@ -116,7 +116,7 @@
         </field>
     </form>
     
-    <form name="ViewGatewayConfigurationClearCommerce" type="single" target="UpdateGatewayConfigurationClearCommerce" default-map-name="paymentGatewayClearCommerce" header-row-style="header-row" default-table-style="basic-table">
+    <form name="EditPaymentGatewayConfigClearCommerce" type="single" target="UpdatePaymentGatewayConfigClearCommerce" default-map-name="paymentGatewayClearCommerce" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="PaymentGatewayClearCommerce" default-field-type="edit"/>
         <field name="paymentGatewayConfigId"><hidden/></field>
         <field name="enableCVM">
@@ -138,7 +138,7 @@
         </field>
     </form>
     
-    <form name="FindGatewayConfigurationTypes" type="single" target="FindGatewayConfigurationTypes" header-row-style="header-row" default-table-style="basic-table">
+    <form name="FindPaymentGatewayConfigTypes" type="single" target="FindPaymentGatewayConfigTypes" header-row-style="header-row" default-table-style="basic-table">
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="performSearch"><hidden value="Y"/></field>
@@ -148,7 +148,7 @@
         </field>
     </form>
     
-    <form name="ListGatewayConfigurationTypes" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+    <form name="ListPaymentGatewayConfigTypes" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
@@ -158,12 +158,12 @@
         </actions>
         <auto-fields-entity entity-name="PaymentGatewayConfigType" default-field-type="display"/>
         <field name="paymentGatewayConfigTypeId" widget-style="buttontext" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
-          <hyperlink description="${paymentGatewayConfigTypeId}" target="ViewGatewayConfigurationType?paymentGatewayConfigTypeId=${paymentGatewayConfigTypeId}"/>
+          <hyperlink description="${paymentGatewayConfigTypeId}" target="EditPaymentGatewayConfigType?paymentGatewayConfigTypeId=${paymentGatewayConfigTypeId}"/>
         </field>
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}"/>
     </form>
     
-    <form name="ViewGatewayConfigurationType" type="single" target="UpdateGatewayConfigurationType" default-map-name="paymentGatewayConfigType" header-row-style="header-row" default-table-style="basic-table">
+    <form name="EditPaymentGatewayConfigType" type="single" target="UpdatePaymentGatewayConfigType" default-map-name="paymentGatewayConfigType" header-row-style="header-row" default-table-style="basic-table">
         <field name="paymentGatewayConfigTypeId"><hidden/></field>
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}"><text size="60" maxlength="60"/></field>
         <field name="parentTypeId">
@@ -185,7 +185,7 @@
         </field>
     </form>
     
-    <form name="ViewGatewayConfigurationPayPal" type="single" target="UpdateGatewayConfigurationPayPal" default-map-name="paymentGatewayPayPal" header-row-style="header-row" default-table-style="basic-table">
+    <form name="EditPaymentGatewayConfigPayPal" type="single" target="UpdatePaymentGatewayConfigPayPal" default-map-name="paymentGatewayPayPal" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="PaymentGatewayPayPal" default-field-type="edit"/>
         <field name="paymentGatewayConfigId"><hidden/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">

Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml (from r767263, ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml?p2=ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml&p1=ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml&r1=767263&r2=767278&rev=767278&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml Tue Apr 21 19:57:57 2009
@@ -21,10 +21,10 @@
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
-    <screen name="GenericPaymentGatewayDecorator">
+    <screen name="GenericPaymentGatewayConfigDecorator">
         <section>
             <actions>
-                <set field="headerItem" value="paymentGatewayConfigurations"/> 
+                <set field="headerItem" value="paymentGatewayConfig"/> 
             </actions>
             <widgets>
                 <!-- main defines the regions of the HTML page -->
@@ -33,7 +33,7 @@
                     <decorator-section name="body">
                         <section>
                             <widgets>
-                                <include-menu name="PaymentGatewayTabBar" location="component://accounting/widget/Menus.xml"/>
+                                <include-menu name="PaymentGatewayConfigTabBar" location="component://accounting/widget/Menus.xml"/>
                                 <container>
                                     <label style="h1">${uiLabelMap[labelTitleProperty]}</label>
                                 </container>
@@ -48,25 +48,25 @@
         </section>
     </screen>
     
-    <screen name="FindGatewayConfigurations">
+    <screen name="FindPaymentGatewayConfig">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigurations"/>
-                <set field="tabButtonItem" value="paymentGatewayConfigurationsTab"/> 
+                <set field="titleProperty" value="PageTitleFindPaymentGatewayConfig"/>
+                <set field="tabButtonItem" value="paymentGatewayConfigTab"/> 
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="GenericPaymentGatewayDecorator">
+                <decorator-screen name="GenericPaymentGatewayConfigDecorator">
                     <decorator-section name="body">
                         <section>
                             <widgets>
                                 <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
                                     <decorator-section name="search-options">
-                                        <include-form name="FindGatewayConfigurations" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                        <include-form name="FindPaymentGatewayConfig" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
-                                        <include-form name="ListGatewayConfigurations" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                        <include-form name="ListPaymentGatewayConfig" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                     </decorator-section>
                                 </decorator-screen>
                             </widgets>
@@ -77,11 +77,11 @@
         </section>
     </screen>
     
-    <screen name="ViewGatewayConfiguration">
+    <screen name="EditPaymentGatewayConfig">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfiguration"/>
-                <set field="tabButtonItem" value="paymentGatewayConfigurationsTab"/> 
+                <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfig"/>
+                <set field="tabButtonItem" value="paymentGatewayConfigTab"/> 
                 
                 <set field="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/>
                 <entity-one entity-name="PaymentGatewayConfig" value-field="paymentGatewayConfig"/>
@@ -96,18 +96,18 @@
                 </entity-one>
             </actions>
             <widgets>
-                <decorator-screen name="GenericPaymentGatewayDecorator">
+                <decorator-screen name="GenericPaymentGatewayConfigDecorator">
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfiguration}"/>
+                                    <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfig}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-form name="ViewGatewayConfiguration" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                        <include-form name="EditPaymentGatewayConfig" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                     </widgets>
                                 </section>
                             </container>
@@ -120,13 +120,13 @@
                                 <container style="screenlet">
                                     <container style="screenlet-title-bar">
                                         <container style="h3">
-                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationPayflowPro}"/>
+                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigPayflowPro}"/>
                                         </container>
                                     </container>
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>
-                                                <include-form name="ViewGatewayConfigurationPayflowPro" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                                <include-form name="EditPaymentGatewayConfigPayflowPro" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                             </widgets>
                                         </section>
                                     </container>
@@ -141,13 +141,13 @@
                                 <container style="screenlet">
                                     <container style="screenlet-title-bar">
                                         <container style="h3">
-                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationPayPal}"/>
+                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigPayPal}"/>
                                         </container>
                                     </container>
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>
-                                                <include-form name="ViewGatewayConfigurationPayPal" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                                <include-form name="EditPaymentGatewayConfigPayPal" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                             </widgets>
                                         </section>
                                     </container>
@@ -162,13 +162,13 @@
                                 <container style="screenlet">
                                     <container style="screenlet-title-bar">
                                         <container style="h3">
-                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationClearCommerce}"/>
+                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigClearCommerce}"/>
                                         </container>
                                     </container>
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>
-                                                <include-form name="ViewGatewayConfigurationClearCommerce" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                                <include-form name="EditPaymentGatewayConfigClearCommerce" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                             </widgets>
                                         </section>
                                     </container>
@@ -181,25 +181,25 @@
         </section>
     </screen>
     
-    <screen name="FindGatewayConfigurationTypes">
+    <screen name="FindPaymentGatewayConfigTypes">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigurationTypes"/>
-                <set field="tabButtonItem" value="paymentGatewayConfigurationTypesTab"/> 
+                <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigTypes"/>
+                <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> 
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="GenericPaymentGatewayDecorator">
+                <decorator-screen name="GenericPaymentGatewayConfigDecorator">
                     <decorator-section name="body">
                         <section>
                             <widgets>
                                 <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
                                     <decorator-section name="search-options">
-                                        <include-form name="FindGatewayConfigurationTypes" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                        <include-form name="FindPaymentGatewayConfigTypes" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
-                                        <include-form name="ListGatewayConfigurationTypes" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                        <include-form name="ListPaymentGatewayConfigTypes" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                     </decorator-section>
                                 </decorator-screen>
                             </widgets>
@@ -210,28 +210,28 @@
         </section>
     </screen>
     
-    <screen name="ViewGatewayConfigurationType">
+    <screen name="EditPaymentGatewayConfigType">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfigurationType"/>
-                <set field="tabButtonItem" value="paymentGatewayConfigurationTypesTab"/> 
+                <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfigType"/>
+                <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> 
                 
                 <set field="paymentGatewayConfigTypeId" from-field="parameters.paymentGatewayConfigTypeId"/>
                 <entity-one entity-name="PaymentGatewayConfigType" value-field="paymentGatewayConfigType"/>
             </actions>
             <widgets>
-                <decorator-screen name="GenericPaymentGatewayDecorator">
+                <decorator-screen name="GenericPaymentGatewayConfigDecorator">
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationType}"/>
+                                    <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigType}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-form name="ViewGatewayConfigurationType" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+                                        <include-form name="EditPaymentGatewayConfigType" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
                                     </widgets>
                                 </section>
                             </container>

Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Re: svn commit: r767278 - in /ofbiz/trunk/applications/accounting: config/ data/ entitydef/ script/org/ofbiz/accounting/payment/ servicedef/ webapp/accounting/WEB-INF/ widget/

Posted by Hans Bakker <ma...@antwebsystems.com>.
This change causes run-install-seed giving the error: 
null (Odd number of characters.)

and fails to load file:
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml


On Tue, 2009-04-21 at 19:57 +0000, mrisaliti@apache.org wrote:
> Author: mrisaliti
> Date: Tue Apr 21 19:57:57 2009
> New Revision: 767278
> 
> URL: http://svn.apache.org/viewvc?rev=767278&view=rev
> Log:
> Misc improvements on Payment Gateway Config (OFBIZ-2297)
> 
> Added:
>     ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml   (contents, props changed)
>       - copied, changed from r767263, ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml
>     ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml   (contents, props changed)
>       - copied, changed from r767263, ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml
> Removed:
>     ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml
>     ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml
> Modified:
>     ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>     ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
>     ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
>     ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml
>     ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml
>     ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
>     ofbiz/trunk/applications/accounting/widget/Menus.xml
> 
> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=767278&r1=767277&r2=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Apr 21 19:57:57 2009
> @@ -5733,12 +5733,12 @@
>          <value xml:lang="en">Payment Gateway Config Type Id</value>
>          <value xml:lang="it">Tipo configurazione gateway pagamenti</value>
>      </property>
> -    <property key="AccountingPaymentGatewayConfigurations">
> -        <value xml:lang="en">Payment Gateway Configurations</value>
> +    <property key="AccountingPaymentGatewayConfig">
> +        <value xml:lang="en">Payment Gateway Config</value>
>          <value xml:lang="it">Configurazioni gateway pagamenti</value>
>      </property>
> -    <property key="AccountingPaymentGatewayConfigurationTypes">
> -        <value xml:lang="en">Payment Gateway Configuration Types</value>
> +    <property key="AccountingPaymentGatewayConfigTypes">
> +        <value xml:lang="en">Payment Gateway Config Types</value>
>          <value xml:lang="it">Tipi configurazione gateway pagamenti</value>
>      </property>
>      <property key="AccountingPaymentGatewayDecline">
> @@ -10431,12 +10431,12 @@
>          <value xml:lang="ru">Поиск финансовых счетов</value>
>          <value xml:lang="th">ค้นหางบกำไรสะสมและงบแสดงการเปลี่ยนแปลงฐานะการเงิน</value>
>      </property>
> -    <property key="PageTitleFindPaymentGatewayConfigurations">
> -        <value xml:lang="en">Find Payment Gateway Configurations</value>
> +    <property key="PageTitleFindPaymentGatewayConfig">
> +        <value xml:lang="en">Find Payment Gateway Config</value>
>          <value xml:lang="it">Ricerca configurazioni gateway pagamenti</value>
>      </property>
> -    <property key="PageTitleFindPaymentGatewayConfigurationTypes">
> -        <value xml:lang="en">Find Payment Gateway Configuration Types</value>
> +    <property key="PageTitleFindPaymentGatewayConfigTypes">
> +        <value xml:lang="en">Find Payment Gateway Config Types</value>
>          <value xml:lang="it">Ricerca tipi configurazioni gateway pagamenti</value>
>      </property>
>      <property key="PageTitleFindGatewayResponses">
> @@ -10882,24 +10882,24 @@
>          <value xml:lang="th">Un-posted Accounting Transactions</value>
>          <value xml:lang="zh">未过户财务交易</value>
>      </property>
> -    <property key="PageTitleUpdatePaymentGatewayConfiguration">
> -        <value xml:lang="en">Update Payment Gateway Configuration</value>
> +    <property key="PageTitleUpdatePaymentGatewayConfig">
> +        <value xml:lang="en">Update Payment Gateway Config</value>
>          <value xml:lang="it">Aggiorna configurazione gateway pagamento</value>
>      </property>
> -    <property key="PageTitleUpdatePaymentGatewayConfigurationType">
> -        <value xml:lang="en">Update Payment Gateway Configuration Type</value>
> +    <property key="PageTitleUpdatePaymentGatewayConfigType">
> +        <value xml:lang="en">Update Payment Gateway Config Type</value>
>          <value xml:lang="it">Aggiorna tipo configurazione gateway pagamento</value>
>      </property>
> -    <property key="PageTitleUpdatePaymentGatewayConfigurationClearCommerce">
> -        <value xml:lang="en">Update Payment Gateway Configuration Clear Commerce</value>
> +    <property key="PageTitleUpdatePaymentGatewayConfigClearCommerce">
> +        <value xml:lang="en">Update Payment Gateway Config Clear Commerce</value>
>          <value xml:lang="it">Aggiorna configurazione gateway pagamento Clear Commerce</value>
>      </property>
> -    <property key="PageTitleUpdatePaymentGatewayConfigurationPayflowPro">
> -        <value xml:lang="en">Update Payment Gateway Configuration Payflow Pro</value>
> +    <property key="PageTitleUpdatePaymentGatewayConfigPayflowPro">
> +        <value xml:lang="en">Update Payment Gateway Config Payflow Pro</value>
>          <value xml:lang="it">Aggiorna configurazione gateway pagamento Payflow Pro</value>
>      </property>
> -    <property key="PageTitleUpdatePaymentGatewayConfigurationPayPal">
> -        <value xml:lang="en">Update Payment Gateway Configuration PayPal</value>
> +    <property key="PageTitleUpdatePaymentGatewayConfigPayPal">
> +        <value xml:lang="en">Update Payment Gateway Config PayPal</value>
>          <value xml:lang="it">Aggiorna configurazione gateway pagamento PayPal</value>
>      </property>
>      <property key="PageTitleViewAccountingTransaction">
> 
> Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=767278&r1=767277&r2=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
> +++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Tue Apr 21 19:57:57 2009
> @@ -665,17 +665,17 @@
>      <PaymentType description="POS Paid Out" hasTable="N" parentTypeId="DISBURSEMENT" paymentTypeId="POS_PAID_OUT"/>
>      <PaymentType description="POS Paid In" hasTable="N" parentTypeId="RECEIPT" paymentTypeId="POS_PAID_IN"/>
>  
> -    <!-- Payment Gateway Configuration -->
> -    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYFLOWPRO" hasTable="N" description="Payment Gateway Payflow Pro"/>
> -    <PaymentGatewayConfig paymentGatewayConfigId="PAYFLOWPRO_CONFIG" paymentGatewayConfigTypeId="PAYFLOWPRO" description="Configuration of Payflow Pro"/>
> +    <!-- Payment Gateway Config -->
> +    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYFLOWPRO" hasTable="N" description="Payflow Pro Payment Gateway"/>
> +    <PaymentGatewayConfig paymentGatewayConfigId="PAYFLOWPRO_CONFIG" paymentGatewayConfigTypeId="PAYFLOWPRO" description="Payflow Pro Config"/>
>      <PaymentGatewayPayflowPro paymentGatewayConfigId="PAYFLOWPRO_CONFIG" certsPath="${sys:getProperty('ofbiz.home')}/applications/accounting/pfcerts" hostAddress="test-payflow.verisign.com" hostPort="443" timeout="80" proxyAddress="" proxyPort="80" proxyLogon="" proxyPassword="" vendor="[Vendor]" userId="[PayFlow UserID]" pwd="[PayFlow Password]" partner="[PayFlow Partner]" checkAvs="Y" checkCvv2="Y" preAuth="Y" enableTransmit="true" logFileName="${sys:getProperty('ofbiz.home')}/runtime/logs/payflow_java.log" loggingLevel="6" maxLogFileSize="1000000" stackTraceOn="N"/>
>      
> -    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N" description="Payment Gateway PayPal"/>
> -    <PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAYPAL" description="Configuration of PayPal"/>
> +    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N" description="PayPal Payment Gateway"/>
> +    <PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAYPAL" description="PayPal Config"/>
>      <PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG" businessEmail="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl="" confirmTemplate="/order/emailconfirmation.ftl" redirectUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr" confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr"/>
>      
> -    <PaymentGatewayConfigType paymentGatewayConfigTypeId="CLEARCOMMERCE" hasTable="N" description="Payment Gateway Clear Commerce"/>
> -    <PaymentGatewayConfig paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" paymentGatewayConfigTypeId="CLEARCOMMERCE" description="Configuration of Clear Commerce"/>
> +    <PaymentGatewayConfigType paymentGatewayConfigTypeId="CLEARCOMMERCE" hasTable="N" description="Clear Commerce Payment Gateway"/>
> +    <PaymentGatewayConfig paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" paymentGatewayConfigTypeId="CLEARCOMMERCE" description="Clear Commerce Config"/>
>      <PaymentGatewayClearCommerce paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" sourceId="mySource" groupId="myGroup" clientId="[ClearCommerce clientId]" username="[ClearCommerce username]" pwd="[ClearCommerce password]" userAlias="[ClearCommerce alias]" effectiveAlias="" processMode="P" serverURL="https://test5x.clearcommerce.com:11500" enableCVM="N"/>
>      
>      <!--  Credit Card methods by type -->
> 
> Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=767278&r1=767277&r2=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
> +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Tue Apr 21 19:57:57 2009
> @@ -2967,7 +2967,7 @@
>      </entity>
>      <entity entity-name="PaymentGatewayConfigType"
>          package-name="org.ofbiz.accounting.payment"
> -        title="Payment Gateway Configuration Type">
> +        title="Payment Gateway Config Type">
>        <field name="paymentGatewayConfigTypeId" type="id-ne"></field>
>        <field name="parentTypeId" type="id"></field>
>        <field name="hasTable" type="indicator"></field>
> @@ -2982,7 +2982,7 @@
>      </entity>
>      <entity entity-name="PaymentGatewayConfig"
>          package-name="org.ofbiz.accounting.payment"
> -        title="Payment Gateway Configuration">
> +        title="Payment Gateway Config">
>        <field name="paymentGatewayConfigId" type="id-ne"></field>
>        <field name="paymentGatewayConfigTypeId" type="id-ne"></field>
>        <field name="description" type="description"></field>
> @@ -2993,7 +2993,7 @@
>      </entity>
>      <entity entity-name="PaymentGatewayPayflowPro"
>          package-name="org.ofbiz.accounting.payment"
> -        title="Payflow Pro Payment Gateway Configuration">
> +        title="Payflow Pro Payment Gateway Config">
>        <field name="paymentGatewayConfigId" type="id-ne"></field>
>        <field name="certsPath" type="value"><description>Path the the VeriSign Certificate</description></field>
>        <field name="hostAddress" type="value"><description>Address of the payment processor</description></field>
> @@ -3002,10 +3002,10 @@
>        <field name="proxyAddress" type="value"><description>Proxy Address</description></field>
>        <field name="proxyPort" type="numeric"><description>Proxy Port</description></field>
>        <field name="proxyLogon" type="value"><description>Proxy Logon</description></field>
> -      <field name="proxyPassword" type="value"><description>Proxy Password</description></field>
> +      <field name="proxyPassword" type="value" encrypt="true"><description>Proxy Password</description></field>
>        <field name="vendor" type="short-varchar"><description>Vendor of account information</description></field>
>        <field name="userId" type="short-varchar"><description>PayFlow UserID of account information</description></field>
> -      <field name="pwd" type="short-varchar"><description>PayFlow Password of account information</description></field>
> +      <field name="pwd" type="value" encrypt="true"><description>PayFlow Password of account information</description></field>
>        <field name="partner" type="short-varchar"><description>PayFlow Partner of account information</description></field>
>        <field name="checkAvs" type="indicator"><description>Use Address Verification</description></field>
>        <field name="checkCvv2" type="indicator"><description>Require CVV2 Verification</description></field>
> @@ -3022,7 +3022,7 @@
>      </entity>
>      <entity entity-name="PaymentGatewayPayPal"
>          package-name="org.ofbiz.accounting.payment"
> -        title="PayPal Payment Gateway Configuration">
> +        title="PayPal Payment Gateway Config">
>          <field name="paymentGatewayConfigId" type="id-ne"></field>
>          <field name="businessEmail" type="value"><description>Business e-mail</description></field>
>          <field name="notifyUrl" type="value"><description>Notify URL</description></field>
> @@ -3039,13 +3039,13 @@
>      </entity>
>      <entity entity-name="PaymentGatewayClearCommerce"
>          package-name="org.ofbiz.accounting.payment"
> -        title="Clear Commerce Payment Gateway Configuration">
> +        title="Clear Commerce Payment Gateway Config">
>        <field name="paymentGatewayConfigId" type="id-ne"></field>
>        <field name="sourceId" type="short-varchar"><description>Useful for tagging transactions</description></field>
>        <field name="groupId" type="short-varchar"><description>Useful for grouping transactions</description></field>
>        <field name="clientId" type="short-varchar"><description>Client Id of account information</description></field>
>        <field name="username" type="short-varchar"><description>User name of account informatio</description></field>
> -      <field name="pwd" type="short-varchar"><description>Password of account informatio</description></field>
> +      <field name="pwd" type="value" encrypt="true"><description>Password of account informatio</description></field>
>        <field name="userAlias" type="short-varchar"><description>Alias of account informatio</description></field>
>        <field name="effectiveAlias" type="short-varchar"><description>Effective Alias of account information</description></field>
>        <field name="processMode" type="indicator"><description>Process mode (Y: approve / N: decline / R: random / P: production)</description></field>
> 
> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml?rev=767278&r1=767277&r2=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml (original)
> +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml Tue Apr 21 19:57:57 2009
> @@ -20,31 +20,31 @@
>  
>  <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
>          xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
> -    <simple-method method-name="updateGatewayConfiguration" short-description="Update Payment Gateway Configuration">
> +    <simple-method method-name="updatePaymentGatewayConfig" short-description="Update Payment Gateway Config">
>          <entity-one entity-name="PaymentGatewayConfig" value-field="lookedUpValue"/>
>          <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
>          <store-value value-field="lookedUpValue"/>
>      </simple-method>
>      
> -    <simple-method method-name="updateGatewayConfigurationPayflowPro" short-description="Update Payment Gateway Configuration Payflow Pro">
> +    <simple-method method-name="updatePaymentGatewayConfigPayflowPro" short-description="Update Payment Gateway Config Payflow Pro">
>          <entity-one entity-name="PaymentGatewayPayflowPro" value-field="lookedUpValue"/>
>          <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
>          <store-value value-field="lookedUpValue"/>
>      </simple-method>
>      
> -    <simple-method method-name="updateGatewayConfigurationPayPal" short-description="Update Payment Gateway Configuration PayPal">
> +    <simple-method method-name="updatePaymentGatewayConfigPayPal" short-description="Update Payment Gateway Config PayPal">
>          <entity-one entity-name="PaymentGatewayPayPal" value-field="lookedUpValue"/>
>          <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
>          <store-value value-field="lookedUpValue"/>
>      </simple-method>
>      
> -    <simple-method method-name="updateGatewayConfigurationClearCommerce" short-description="Update Payment Gateway Configuration Clear Commerce">
> +    <simple-method method-name="updatePaymentGatewayConfigClearCommerce" short-description="Update Payment Gateway Config Clear Commerce">
>          <entity-one entity-name="PaymentGatewayClearCommerce" value-field="lookedUpValue"/>
>          <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
>          <store-value value-field="lookedUpValue"/>
>      </simple-method>
>      
> -    <simple-method method-name="updateGatewayConfigurationType" short-description="Update Payment Gateway Configuration Type">
> +    <simple-method method-name="updatePaymentGatewayConfigType" short-description="Update Payment Gateway Config Type">
>          <entity-one entity-name="PaymentGatewayConfigType" value-field="lookedUpValue"/>
>          <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
>          <store-value value-field="lookedUpValue"/>
> 
> Modified: ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml?rev=767278&r1=767277&r2=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml (original)
> +++ ofbiz/trunk/applications/accounting/servicedef/services_paymentgateway.xml Tue Apr 21 19:57:57 2009
> @@ -20,37 +20,37 @@
>  
>  <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>          xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
> -    <description>Accounting Payment Gateway Configuration Services</description>
> +    <description>Accounting Payment Gateway Config Services</description>
>      <vendor>OFBiz</vendor>
>      <version>1.0</version>
>      
> -    <!-- Payment Gateway Configuration Method services -->
> -    <service name="updateGatewayConfiguration" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfiguration">
> -        <description>Update Payment Gateway Configuration</description>
> +    <!-- Payment Gateway Config Method services -->
> +    <service name="updatePaymentGatewayConfig" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfig">
> +        <description>Update Payment Gateway Config</description>
>          <auto-attributes entity-name="PaymentGatewayConfig" include="pk" mode="IN" optional="false"/>
>          <auto-attributes entity-name="PaymentGatewayConfig" include="nonpk" mode="IN" optional="true"/>
>      </service>
>      
> -    <service name="updateGatewayConfigurationPayflowPro" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfigurationPayflowPro">
> -        <description>Update Payment Gateway Configuration Payflow Pro</description>
> +    <service name="updatePaymentGatewayConfigPayflowPro" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigPayflowPro">
> +        <description>Update Payment Gateway Config Payflow Pro</description>
>          <auto-attributes entity-name="PaymentGatewayPayflowPro" include="pk" mode="IN" optional="false"/>
>          <auto-attributes entity-name="PaymentGatewayPayflowPro" include="nonpk" mode="IN" optional="true"/>
>      </service>
>      
> -    <service name="updateGatewayConfigurationPayPal" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfigurationPayPal">
> -        <description>Update Payment Gateway Configuration PayPal</description>
> +    <service name="updatePaymentGatewayConfigPayPal" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigPayPal">
> +        <description>Update Payment Gateway Config PayPal</description>
>          <auto-attributes entity-name="PaymentGatewayPayPal" include="pk" mode="IN" optional="false"/>
>          <auto-attributes entity-name="PaymentGatewayPayPal" include="nonpk" mode="IN" optional="true"/>
>      </service>
>      
> -    <service name="updateGatewayConfigurationClearCommerce" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfigurationClearCommerce">
> -        <description>Update Payment Gateway Configuration Clear Commerce</description>
> +    <service name="updatePaymentGatewayConfigClearCommerce" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigClearCommerce">
> +        <description>Update Payment Gateway Config Clear Commerce</description>
>          <auto-attributes entity-name="PaymentGatewayClearCommerce" include="pk" mode="IN" optional="false"/>
>          <auto-attributes entity-name="PaymentGatewayClearCommerce" include="nonpk" mode="IN" optional="true"/>
>      </service>
>      
> -    <service name="updateGatewayConfigurationType" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updateGatewayConfigurationType">
> -        <description>Update Payment Gateway Configuration Type</description>
> +    <service name="updatePaymentGatewayConfigType" engine="simple" location="org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigType">
> +        <description>Update Payment Gateway Config Type</description>
>          <auto-attributes entity-name="PaymentGatewayConfigType" include="pk" mode="IN" optional="false"/>
>          <auto-attributes entity-name="PaymentGatewayConfigType" include="nonpk" mode="IN" optional="true"/>
>      </service>
> 
> 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=767278&r1=767277&r2=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Apr 21 19:57:57 2009
> @@ -406,52 +406,52 @@
>          <response name="success" type="view" value="ManualTransaction"/>
>      </request-map>
>      
> -    <!-- Payment Gateway Configurations --> 
> -    <request-map uri="FindGatewayConfigurations">
> +    <!-- Payment Gateway Config --> 
> +    <request-map uri="FindPaymentGatewayConfig">
>          <security https="true" auth="true"/>
> -        <response name="success" type="view" value="FindGatewayConfigurations"/>
> +        <response name="success" type="view" value="FindPaymentGatewayConfig"/>
>      </request-map>
> -    <request-map uri="ViewGatewayConfiguration">
> +    <request-map uri="EditPaymentGatewayConfig">
>          <security https="true" auth="true"/>
> -        <response name="success" type="view" value="ViewGatewayConfiguration"/>
> +        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
>      </request-map>
> -    <request-map uri="UpdateGatewayConfiguration">
> +    <request-map uri="UpdatePaymentGatewayConfig">
>          <security https="true" auth="true"/>
> -        <event type="service" invoke="updateGatewayConfiguration"/>
> -        <response name="success" type="view" value="ViewGatewayConfiguration"/>
> -        <response name="error" type="view" value="ViewGatewayConfiguration"/>
> +        <event type="service" invoke="updatePaymentGatewayConfig"/>
> +        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
> +        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
>      </request-map>
> -    <request-map uri="UpdateGatewayConfigurationPayflowPro">
> +    <request-map uri="UpdatePaymentGatewayConfigPayflowPro">
>          <security https="true" auth="true"/>
> -        <event type="service" invoke="updateGatewayConfigurationPayflowPro"/>
> -        <response name="success" type="view" value="ViewGatewayConfiguration"/>
> -        <response name="error" type="view" value="ViewGatewayConfiguration"/>
> +        <event type="service" invoke="updatePaymentGatewayConfigPayflowPro"/>
> +        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
> +        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
>      </request-map>
> -    <request-map uri="UpdateGatewayConfigurationPayPal">
> +    <request-map uri="UpdatePaymentGatewayConfigPayPal">
>          <security https="true" auth="true"/>
> -        <event type="service" invoke="updateGatewayConfigurationPayPal"/>
> -        <response name="success" type="view" value="ViewGatewayConfiguration"/>
> -        <response name="error" type="view" value="ViewGatewayConfiguration"/>
> +        <event type="service" invoke="updatePaymentGatewayConfigPayPal"/>
> +        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
> +        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
>      </request-map>
> -    <request-map uri="UpdateGatewayConfigurationClearCommerce">
> +    <request-map uri="UpdatePaymentGatewayConfigClearCommerce">
>          <security https="true" auth="true"/>
> -        <event type="service" invoke="updateGatewayConfigurationClearCommerce"/>
> -        <response name="success" type="view" value="ViewGatewayConfiguration"/>
> -        <response name="error" type="view" value="ViewGatewayConfiguration"/>
> +        <event type="service" invoke="updatePaymentGatewayConfigClearCommerce"/>
> +        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
> +        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
>      </request-map>
> -    <request-map uri="FindGatewayConfigurationTypes">
> +    <request-map uri="FindPaymentGatewayConfigTypes">
>          <security https="true" auth="true"/>
> -        <response name="success" type="view" value="FindGatewayConfigurationTypes"/>
> +        <response name="success" type="view" value="FindPaymentGatewayConfigTypes"/>
>      </request-map>
> -    <request-map uri="ViewGatewayConfigurationType">
> +    <request-map uri="EditPaymentGatewayConfigType">
>          <security https="true" auth="true"/>
> -        <response name="success" type="view" value="ViewGatewayConfigurationType"/>
> +        <response name="success" type="view" value="EditPaymentGatewayConfigType"/>
>      </request-map>
> -    <request-map uri="UpdateGatewayConfigurationType">
> +    <request-map uri="UpdatePaymentGatewayConfigType">
>          <security https="true" auth="true"/>
> -        <event type="service" invoke="updateGatewayConfigurationType"/>
> -        <response name="success" type="view" value="ViewGatewayConfigurationType"/>
> -        <response name="error" type="view" value="ViewGatewayConfigurationType"/>
> +        <event type="service" invoke="updatePaymentGatewayConfigType"/>
> +        <response name="success" type="view" value="EditPaymentGatewayConfigType"/>
> +        <response name="error" type="view" value="EditPaymentGatewayConfigType"/>
>      </request-map>
>      
>      <!-- TO BE REMOVED
> @@ -2156,11 +2156,11 @@
>      <view-map name="AuthorizeTransaction" page="component://accounting/widget/TransactionScreens.xml#AuthorizeTransaction" type="screen"/>
>      <view-map name="CaptureTransaction" page="component://accounting/widget/TransactionScreens.xml#CaptureTransaction" type="screen"/>
>  
> -    <!-- Payment Gateway Configurations -->
> -    <view-map name="FindGatewayConfigurations" page="component://accounting/widget/PaymentGatewayConfigurationsScreens.xml#FindGatewayConfigurations" type="screen"/>
> -    <view-map name="ViewGatewayConfiguration" page="component://accounting/widget/PaymentGatewayConfigurationsScreens.xml#ViewGatewayConfiguration" type="screen"/>
> -    <view-map name="FindGatewayConfigurationTypes" page="component://accounting/widget/PaymentGatewayConfigurationsScreens.xml#FindGatewayConfigurationTypes" type="screen"/>
> -    <view-map name="ViewGatewayConfigurationType" page="component://accounting/widget/PaymentGatewayConfigurationsScreens.xml#ViewGatewayConfigurationType" type="screen"/>
> +    <!-- Payment Gateway Config -->
> +    <view-map name="FindPaymentGatewayConfig" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#FindPaymentGatewayConfig" type="screen"/>
> +    <view-map name="EditPaymentGatewayConfig" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#EditPaymentGatewayConfig" type="screen"/>
> +    <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"/>
> 
> Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=767278&r1=767277&r2=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Apr 21 19:57:57 2009
> @@ -30,7 +30,12 @@
>              </condition>
>              <link target="FindGatewayResponses"/>
>          </menu-item>
> -        <menu-item name="PaymentGateways" title="${uiLabelMap.AccountingPaymentGatewayConfigurations}"><link target="FindGatewayConfigurations"/></menu-item>
> +        <menu-item name="PaymentGatewayConfig" title="${uiLabelMap.AccountingPaymentGatewayConfig}">
> +            <condition>
> +                <if-has-permission permission="PAYPROC" action="_ADMIN"/>
> +            </condition>
> +            <link target="FindPaymentGatewayConfig"/>
> +        </menu-item>
>          <menu-item name="billingaccount" title="${uiLabelMap.AccountingBillingMenu}"><link target="FindBillingAccount"/></menu-item>
>          <menu-item name="FindFinAccount" title="${uiLabelMap.AccountingFinAccount}"><link target="FindFinAccount"/></menu-item>
>          <menu-item name="TaxAuthorities" title="${uiLabelMap.AccountingTaxAuthorities}"><link target="FindTaxAuthority"/></menu-item>
> @@ -948,12 +953,12 @@
>          </menu-item>
>      </menu>
>      
> -    <menu name="PaymentGatewayTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
> -        <menu-item name="paymentGatewayConfigurationsTab" title="${uiLabelMap.AccountingPaymentGatewayConfigurations}">
> -            <link target="FindGatewayConfigurations"/>
> +    <menu name="PaymentGatewayConfigTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
> +        <menu-item name="paymentGatewayConfigTab" title="${uiLabelMap.AccountingPaymentGatewayConfig}">
> +            <link target="FindPaymentGatewayConfig"/>
>          </menu-item>
> -        <menu-item name="paymentGatewayConfigurationTypesTab" title="${uiLabelMap.AccountingPaymentGatewayConfigurationTypes}">
> -            <link target="FindGatewayConfigurationTypes"/>
> +        <menu-item name="paymentGatewayConfigTypesTab" title="${uiLabelMap.AccountingPaymentGatewayConfigTypes}">
> +            <link target="FindPaymentGatewayConfigTypes"/>
>          </menu-item>
>      </menu>
>  </menus>
> 
> Copied: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml (from r767263, ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml)
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?p2=ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml&p1=ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml&r1=767263&r2=767278&rev=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Tue Apr 21 19:57:57 2009
> @@ -19,8 +19,8 @@
>  -->
>  <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
>      
> -    <!-- form whose input filters the ListFindGatewayConfigurations -->
> -    <form name="FindGatewayConfigurations" type="single" target="FindGatewayConfigurations" header-row-style="header-row" default-table-style="basic-table">
> +    <!-- form whose input filters the FindPaymentGatewayConfig -->
> +    <form name="FindPaymentGatewayConfig" type="single" target="FindPaymentGatewayConfig" header-row-style="header-row" default-table-style="basic-table">
>          <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}"><text-find default-option="contains" ignore-case="true"/></field>
>          <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find default-option="contains" ignore-case="true"/></field>
>          <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
> @@ -37,7 +37,7 @@
>          </field>
>      </form>
>      
> -    <form name="ListGatewayConfigurations" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
> +    <form name="ListPaymentGatewayConfig" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <service service-name="performFind" result-map="result" result-map-list="listIt">
>                  <field-map field-name="inputFields" from-field="parameters"/>
> @@ -47,7 +47,7 @@
>          </actions>
>          <auto-fields-entity entity-name="PaymentGatewayConfig" default-field-type="display"/>
>          <field name="paymentGatewayConfigId" widget-style="buttontext" title="${uiLabelMap.AccountingPaymentGatewayConfigId}">
> -          <hyperlink description="${paymentGatewayConfigId}" target="ViewGatewayConfiguration?paymentGatewayConfigId=${paymentGatewayConfigId}"/>
> +          <hyperlink description="${paymentGatewayConfigId}" target="EditPaymentGatewayConfig?paymentGatewayConfigId=${paymentGatewayConfigId}"/>
>          </field>
>          <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"/>
>          <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
> @@ -55,7 +55,7 @@
>          </field>
>      </form>
>      
> -    <form name="ViewGatewayConfiguration" type="single" target="UpdateGatewayConfiguration" default-map-name="paymentGatewayConfig" header-row-style="header-row" default-table-style="basic-table">
> +    <form name="EditPaymentGatewayConfig" type="single" target="UpdatePaymentGatewayConfig" default-map-name="paymentGatewayConfig" header-row-style="header-row" default-table-style="basic-table">
>          <field name="paymentGatewayConfigId"><hidden/></field>
>          <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text size="60" maxlength="60"/></field>
>          <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
> @@ -66,7 +66,7 @@
>          </field>
>      </form>
>      
> -    <form name="ViewGatewayConfigurationPayflowPro" type="single" target="UpdateGatewayConfigurationPayflowPro" default-map-name="paymentGatewayPayflowPro" header-row-style="header-row" default-table-style="basic-table">
> +    <form name="EditPaymentGatewayConfigPayflowPro" type="single" target="UpdatePaymentGatewayConfigPayflowPro" default-map-name="paymentGatewayPayflowPro" header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-entity entity-name="PaymentGatewayPayflowPro" default-field-type="edit"/>
>          <field name="certsPath"><text size="80" maxlength="80"/></field>
>          <field name="paymentGatewayConfigId"><hidden/></field>
> @@ -116,7 +116,7 @@
>          </field>
>      </form>
>      
> -    <form name="ViewGatewayConfigurationClearCommerce" type="single" target="UpdateGatewayConfigurationClearCommerce" default-map-name="paymentGatewayClearCommerce" header-row-style="header-row" default-table-style="basic-table">
> +    <form name="EditPaymentGatewayConfigClearCommerce" type="single" target="UpdatePaymentGatewayConfigClearCommerce" default-map-name="paymentGatewayClearCommerce" header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-entity entity-name="PaymentGatewayClearCommerce" default-field-type="edit"/>
>          <field name="paymentGatewayConfigId"><hidden/></field>
>          <field name="enableCVM">
> @@ -138,7 +138,7 @@
>          </field>
>      </form>
>      
> -    <form name="FindGatewayConfigurationTypes" type="single" target="FindGatewayConfigurationTypes" header-row-style="header-row" default-table-style="basic-table">
> +    <form name="FindPaymentGatewayConfigTypes" type="single" target="FindPaymentGatewayConfigTypes" header-row-style="header-row" default-table-style="basic-table">
>          <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}"><text-find default-option="contains" ignore-case="true"/></field>
>          <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find default-option="contains" ignore-case="true"/></field>
>          <field name="performSearch"><hidden value="Y"/></field>
> @@ -148,7 +148,7 @@
>          </field>
>      </form>
>      
> -    <form name="ListGatewayConfigurationTypes" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
> +    <form name="ListPaymentGatewayConfigTypes" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <service service-name="performFind" result-map="result" result-map-list="listIt">
>                  <field-map field-name="inputFields" from-field="parameters"/>
> @@ -158,12 +158,12 @@
>          </actions>
>          <auto-fields-entity entity-name="PaymentGatewayConfigType" default-field-type="display"/>
>          <field name="paymentGatewayConfigTypeId" widget-style="buttontext" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
> -          <hyperlink description="${paymentGatewayConfigTypeId}" target="ViewGatewayConfigurationType?paymentGatewayConfigTypeId=${paymentGatewayConfigTypeId}"/>
> +          <hyperlink description="${paymentGatewayConfigTypeId}" target="EditPaymentGatewayConfigType?paymentGatewayConfigTypeId=${paymentGatewayConfigTypeId}"/>
>          </field>
>          <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}"/>
>      </form>
>      
> -    <form name="ViewGatewayConfigurationType" type="single" target="UpdateGatewayConfigurationType" default-map-name="paymentGatewayConfigType" header-row-style="header-row" default-table-style="basic-table">
> +    <form name="EditPaymentGatewayConfigType" type="single" target="UpdatePaymentGatewayConfigType" default-map-name="paymentGatewayConfigType" header-row-style="header-row" default-table-style="basic-table">
>          <field name="paymentGatewayConfigTypeId"><hidden/></field>
>          <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}"><text size="60" maxlength="60"/></field>
>          <field name="parentTypeId">
> @@ -185,7 +185,7 @@
>          </field>
>      </form>
>      
> -    <form name="ViewGatewayConfigurationPayPal" type="single" target="UpdateGatewayConfigurationPayPal" default-map-name="paymentGatewayPayPal" header-row-style="header-row" default-table-style="basic-table">
> +    <form name="EditPaymentGatewayConfigPayPal" type="single" target="UpdatePaymentGatewayConfigPayPal" default-map-name="paymentGatewayPayPal" header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-entity entity-name="PaymentGatewayPayPal" default-field-type="edit"/>
>          <field name="paymentGatewayConfigId"><hidden/></field>
>          <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
> 
> Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
> ------------------------------------------------------------------------------
>     svn:keywords = "Date Rev Author URL Id"
> 
> Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
> ------------------------------------------------------------------------------
>     svn:mergeinfo = 
> 
> Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
> ------------------------------------------------------------------------------
>     svn:mime-type = text/xml
> 
> Copied: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml (from r767263, ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml)
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml?p2=ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml&p1=ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml&r1=767263&r2=767278&rev=767278&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml Tue Apr 21 19:57:57 2009
> @@ -21,10 +21,10 @@
>  <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
>          xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
>  
> -    <screen name="GenericPaymentGatewayDecorator">
> +    <screen name="GenericPaymentGatewayConfigDecorator">
>          <section>
>              <actions>
> -                <set field="headerItem" value="paymentGatewayConfigurations"/> 
> +                <set field="headerItem" value="paymentGatewayConfig"/> 
>              </actions>
>              <widgets>
>                  <!-- main defines the regions of the HTML page -->
> @@ -33,7 +33,7 @@
>                      <decorator-section name="body">
>                          <section>
>                              <widgets>
> -                                <include-menu name="PaymentGatewayTabBar" location="component://accounting/widget/Menus.xml"/>
> +                                <include-menu name="PaymentGatewayConfigTabBar" location="component://accounting/widget/Menus.xml"/>
>                                  <container>
>                                      <label style="h1">${uiLabelMap[labelTitleProperty]}</label>
>                                  </container>
> @@ -48,25 +48,25 @@
>          </section>
>      </screen>
>      
> -    <screen name="FindGatewayConfigurations">
> +    <screen name="FindPaymentGatewayConfig">
>          <section>
>              <actions>
> -                <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigurations"/>
> -                <set field="tabButtonItem" value="paymentGatewayConfigurationsTab"/> 
> +                <set field="titleProperty" value="PageTitleFindPaymentGatewayConfig"/>
> +                <set field="tabButtonItem" value="paymentGatewayConfigTab"/> 
>                  <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
>                  <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
>              </actions>
>              <widgets>
> -                <decorator-screen name="GenericPaymentGatewayDecorator">
> +                <decorator-screen name="GenericPaymentGatewayConfigDecorator">
>                      <decorator-section name="body">
>                          <section>
>                              <widgets>
>                                  <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
>                                      <decorator-section name="search-options">
> -                                        <include-form name="FindGatewayConfigurations" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                        <include-form name="FindPaymentGatewayConfig" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                      </decorator-section>
>                                      <decorator-section name="search-results">
> -                                        <include-form name="ListGatewayConfigurations" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                        <include-form name="ListPaymentGatewayConfig" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                      </decorator-section>
>                                  </decorator-screen>
>                              </widgets>
> @@ -77,11 +77,11 @@
>          </section>
>      </screen>
>      
> -    <screen name="ViewGatewayConfiguration">
> +    <screen name="EditPaymentGatewayConfig">
>          <section>
>              <actions>
> -                <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfiguration"/>
> -                <set field="tabButtonItem" value="paymentGatewayConfigurationsTab"/> 
> +                <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfig"/>
> +                <set field="tabButtonItem" value="paymentGatewayConfigTab"/> 
>                  
>                  <set field="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/>
>                  <entity-one entity-name="PaymentGatewayConfig" value-field="paymentGatewayConfig"/>
> @@ -96,18 +96,18 @@
>                  </entity-one>
>              </actions>
>              <widgets>
> -                <decorator-screen name="GenericPaymentGatewayDecorator">
> +                <decorator-screen name="GenericPaymentGatewayConfigDecorator">
>                      <decorator-section name="body">
>                          <container style="screenlet">
>                              <container style="screenlet-title-bar">
>                                  <container style="h3">
> -                                    <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfiguration}"/>
> +                                    <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfig}"/>
>                                  </container>
>                              </container>
>                              <container style="screenlet-body">
>                                  <section>
>                                      <widgets>
> -                                        <include-form name="ViewGatewayConfiguration" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                        <include-form name="EditPaymentGatewayConfig" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                      </widgets>
>                                  </section>
>                              </container>
> @@ -120,13 +120,13 @@
>                                  <container style="screenlet">
>                                      <container style="screenlet-title-bar">
>                                          <container style="h3">
> -                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationPayflowPro}"/>
> +                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigPayflowPro}"/>
>                                          </container>
>                                      </container>
>                                      <container style="screenlet-body">
>                                          <section>
>                                              <widgets>
> -                                                <include-form name="ViewGatewayConfigurationPayflowPro" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                                <include-form name="EditPaymentGatewayConfigPayflowPro" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                              </widgets>
>                                          </section>
>                                      </container>
> @@ -141,13 +141,13 @@
>                                  <container style="screenlet">
>                                      <container style="screenlet-title-bar">
>                                          <container style="h3">
> -                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationPayPal}"/>
> +                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigPayPal}"/>
>                                          </container>
>                                      </container>
>                                      <container style="screenlet-body">
>                                          <section>
>                                              <widgets>
> -                                                <include-form name="ViewGatewayConfigurationPayPal" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                                <include-form name="EditPaymentGatewayConfigPayPal" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                              </widgets>
>                                          </section>
>                                      </container>
> @@ -162,13 +162,13 @@
>                                  <container style="screenlet">
>                                      <container style="screenlet-title-bar">
>                                          <container style="h3">
> -                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationClearCommerce}"/>
> +                                            <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigClearCommerce}"/>
>                                          </container>
>                                      </container>
>                                      <container style="screenlet-body">
>                                          <section>
>                                              <widgets>
> -                                                <include-form name="ViewGatewayConfigurationClearCommerce" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                                <include-form name="EditPaymentGatewayConfigClearCommerce" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                              </widgets>
>                                          </section>
>                                      </container>
> @@ -181,25 +181,25 @@
>          </section>
>      </screen>
>      
> -    <screen name="FindGatewayConfigurationTypes">
> +    <screen name="FindPaymentGatewayConfigTypes">
>          <section>
>              <actions>
> -                <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigurationTypes"/>
> -                <set field="tabButtonItem" value="paymentGatewayConfigurationTypesTab"/> 
> +                <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigTypes"/>
> +                <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> 
>                  <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
>                  <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
>              </actions>
>              <widgets>
> -                <decorator-screen name="GenericPaymentGatewayDecorator">
> +                <decorator-screen name="GenericPaymentGatewayConfigDecorator">
>                      <decorator-section name="body">
>                          <section>
>                              <widgets>
>                                  <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
>                                      <decorator-section name="search-options">
> -                                        <include-form name="FindGatewayConfigurationTypes" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                        <include-form name="FindPaymentGatewayConfigTypes" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                      </decorator-section>
>                                      <decorator-section name="search-results">
> -                                        <include-form name="ListGatewayConfigurationTypes" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                        <include-form name="ListPaymentGatewayConfigTypes" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                      </decorator-section>
>                                  </decorator-screen>
>                              </widgets>
> @@ -210,28 +210,28 @@
>          </section>
>      </screen>
>      
> -    <screen name="ViewGatewayConfigurationType">
> +    <screen name="EditPaymentGatewayConfigType">
>          <section>
>              <actions>
> -                <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfigurationType"/>
> -                <set field="tabButtonItem" value="paymentGatewayConfigurationTypesTab"/> 
> +                <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfigType"/>
> +                <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> 
>                  
>                  <set field="paymentGatewayConfigTypeId" from-field="parameters.paymentGatewayConfigTypeId"/>
>                  <entity-one entity-name="PaymentGatewayConfigType" value-field="paymentGatewayConfigType"/>
>              </actions>
>              <widgets>
> -                <decorator-screen name="GenericPaymentGatewayDecorator">
> +                <decorator-screen name="GenericPaymentGatewayConfigDecorator">
>                      <decorator-section name="body">
>                          <container style="screenlet">
>                              <container style="screenlet-title-bar">
>                                  <container style="h3">
> -                                    <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationType}"/>
> +                                    <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigType}"/>
>                                  </container>
>                              </container>
>                              <container style="screenlet-body">
>                                  <section>
>                                      <widgets>
> -                                        <include-form name="ViewGatewayConfigurationType" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
> +                                        <include-form name="EditPaymentGatewayConfigType" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
>                                      </widgets>
>                                  </section>
>                              </container>
> 
> Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
> ------------------------------------------------------------------------------
>     svn:keywords = "Date Rev Author URL Id"
> 
> Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
> ------------------------------------------------------------------------------
>     svn:mergeinfo = 
> 
> Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
> ------------------------------------------------------------------------------
>     svn:mime-type = text/xml
> 
> 
-- 
Antwebsystems.com: Quality OFBiz services for competitive rates