svn commit: r831899 - in /ofbiz/trunk/applications/accounting: data/AccountingTypeData.xml entitydef/entitymodel.xml src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java

[ashish-18]

Author: ashish
Date: Mon Nov  2 14:09:15 2009
New Revision: 831899

URL: http://svn.apache.org/viewvc?rev=831899&view=rev
Log:
Renaming the two fields from PaymentGatewayOrbital entity as reported on Dev mailing list.
1) password -> connectionPassword.
2) class -> engineClass.

Thanks Jacques for your comment on this.

Modified:
    ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java

Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=831899&r1=831898&r2=831899&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Mon Nov  2 14:09:15 2009
@@ -714,7 +714,7 @@
 
     <PaymentGatewayConfigType paymentGatewayConfigTypeId="ORBITAL" hasTable="N" description="Orbital Payment Gateway"/>
     <PaymentGatewayConfig paymentGatewayConfigId="ORBITAL_CONFIG" paymentGatewayConfigTypeId="ORBITAL" description="Orbital Config"/>
-    <PaymentGatewayOrbital paymentGatewayConfigId="ORBITAL_CONFIG" username="ofbizuser" password="ofbizpwd" merchantId="785240009879" class="com.paymentech.orbital.sdk.engine.https.HttpsEngine" hostName="orbitalvar1.paymentech.net" port="443" hostNameFailover="orbitalvar2.paymentech.net" portFailover="443" connectionTimeoutSeconds="90" readTimeoutSeconds="90" authorizationURI="/authorize" sdkVersion="PaymentechSDK_6.3.0" sslSocketFactory="default" responseType="gateway"/>
+    <PaymentGatewayOrbital paymentGatewayConfigId="ORBITAL_CONFIG" username="ofbizuser" connectionPassword="ofbizpwd" merchantId="785240009879" engineClass="com.paymentech.orbital.sdk.engine.https.HttpsEngine" hostName="orbitalvar1.paymentech.net" port="443" hostNameFailover="orbitalvar2.paymentech.net" portFailover="443" connectionTimeoutSeconds="90" readTimeoutSeconds="90" authorizationURI="/authorize" sdkVersion="PaymentechSDK_6.3.0" sslSocketFactory="default" responseType="gateway"/>
 
     <!--  Credit Card methods by type -->
     <CustomMethodType customMethodTypeId="CC_AUTH" parentTypeId="" hasTable="N" description="Credit Card authorize methods"/>

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=831899&r1=831898&r2=831899&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Nov  2 14:09:15 2009
@@ -3237,9 +3237,9 @@
             title="Orbital Payment Gateway Config">
       <field name="paymentGatewayConfigId" type="id-ne"></field>
       <field name="username" type="short-varchar"><description>Orbital Username of account information</description></field>
-      <field name="password" type="value" encrypt="true"><description>Orbital Password of account information</description></field>
+      <field name="connectionPassword" type="value" encrypt="true"><description>Orbital Password of account information</description></field>
       <field name="merchantId" type="value"><description>You merchant ID</description></field>
-      <field name="class" type="value"><description>Class for the Orbital Gateway - Default should be used - HttpsEngine</description></field>
+      <field name="engineClass" type="value"><description>Class for the Orbital Gateway - Default should be used - HttpsEngine</description></field>
       <field name="hostName" type="value"><description>Address of the payment processor</description></field>
       <field name="port" type="numeric"><description>Port of the payment processor</description></field>
       <field name="hostNameFailover" type="value"><description>Failover Address of the payment processor</description></field>

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java?rev=831899&r1=831898&r2=831899&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java Mon Nov  2 14:09:15 2009
@@ -252,9 +252,9 @@
         Map<String, Object> buildConfiguratorContext = FastMap.newInstance();
         try {
             buildConfiguratorContext.put("OrbitalConnectionUsername", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "username"));
-            buildConfiguratorContext.put("OrbitalConnectionPassword", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "password"));
+            buildConfiguratorContext.put("OrbitalConnectionPassword", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "connectionPassword"));
             buildConfiguratorContext.put("merchantId", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "merchantId"));
-            buildConfiguratorContext.put("engine.class", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "class"));
+            buildConfiguratorContext.put("engine.class", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "engineClass"));
             buildConfiguratorContext.put("engine.hostname", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "hostName"));
             buildConfiguratorContext.put("engine.port", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "port"));
             buildConfiguratorContext.put("engine.hostname.failover", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "hostNameFailover"));