Author: jleroux
Date: Thu Nov 19 22:28:56 2009
New Revision: 882337
URL: http://svn.apache.org/viewvc?rev=882337&view=rev
Log:
Fix a possible conflict (MODE is a SQL reserved word). Thanks to Adrian on dev
ML
Modified:
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=882337&r1=882336&r2=882337&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Thu Nov 19
22:28:56 2009
@@ -696,7 +696,7 @@
<!-- Payment Gateway Config -->
<PaymentGatewayConfigType paymentGatewayConfigTypeId="SAGEPAY"
hasTable="N" description="SagePay Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="SAGEPAY_CONFIG"
paymentGatewayConfigTypeId="SAGEPAY" description="SagePay Config"/>
- <PaymentGatewaySagePay paymentGatewayConfigId="SAGEPAY_CONFIG"
vendor="YOUR_VENDOR_NAME" productionHost="https://live.sagepay.com:443";
testingHost="https://test.sagepay.com:443"; mode="TEST" protocolVersion="2.22"
authenticationTransType="DEFERRED"
authenticationUrl="/gateway/service/vspdirect-register.vsp"
authoriseTransType="RELEASE" authoriseUrl="/gateway/service/release.vsp"
releaseTransType="ABORT" releaseUrl="/gateway/service/abort.vsp"
voidUrl="/gateway/service/void.vsp" refundUrl="/gateway/service/refund.vsp"/>
+ <PaymentGatewaySagePay paymentGatewayConfigId="SAGEPAY_CONFIG"
vendor="YOUR_VENDOR_NAME" productionHost="https://live.sagepay.com:443";
testingHost="https://test.sagepay.com:443"; sagePayMode="TEST"
protocolVersion="2.22" authenticationTransType="DEFERRED"
authenticationUrl="/gateway/service/vspdirect-register.vsp"
authoriseTransType="RELEASE" authoriseUrl="/gateway/service/release.vsp"
releaseTransType="ABORT" releaseUrl="/gateway/service/abort.vsp"
voidUrl="/gateway/service/void.vsp" refundUrl="/gateway/service/refund.vsp"/>
<PaymentGatewayConfigType paymentGatewayConfigTypeId="AUTHORIZE_NET"
hasTable="N" description="Authorize Dot Net Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="AUTHORIZE_NET_CONFIG"
paymentGatewayConfigTypeId="AUTHORIZE_NET" description="Authorize Dot Net
Config"/>
Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=882337&r1=882336&r2=882337&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Thu Nov 19
22:28:56 2009
@@ -3153,7 +3153,7 @@
<field name="vendor" type="short-varchar"><description>Vendor
name</description></field>
<field name="productionHost"
type="short-varchar"><description>Production Host</description></field>
<field name="testingHost" type="short-varchar"><description>Testing
Host</description></field>
- <field name="mode" type="short-varchar"><description>Mode
(PRODUCTION/TEST)</description></field>
+ <field name="sagePayMode" type="short-varchar"><description>Mode
(PRODUCTION/TEST)</description></field>
<field name="protocolVersion" type="very-short"><description>Protocol
Version</description></field>
<field name="authenticationTransType"
type="short-varchar"><description>Authentication type
(PAYMENT/AUTHENTICATE/DEFERRED)</description></field>
<field name="authenticationUrl"
type="long-varchar"><description>Authentication Url</description></field>
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java?rev=882337&r1=882336&r2=882337&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
Thu Nov 19 22:28:56 2009
@@ -119,9 +119,9 @@
public static HttpHost getHost(Map<String, String> props) {
String hostUrl = null;
- if("PRODUCTION".equals(props.get("mode"))) {
+ if("PRODUCTION".equals(props.get("sagePayMode"))) {
hostUrl = props.get("productionHost");
- } else if("TEST".equals(props.get("mode"))) {
+ } else if("TEST".equals(props.get("sagePayMode"))) {
hostUrl = props.get("testingHost");
}
String scheme = hostUrl.substring(0, 5);
Modified:
ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=882337&r1=882336&r2=882337&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
Thu Nov 19 22:28:56 2009
@@ -80,7 +80,7 @@
<field name="testingHost"
title="${uiLabelMap.AccountingSagePayTestingHost}">
<text size="100" maxlength="100"/>
</field>
- <field name="mode" title="${uiLabelMap.AccountingSagePayMode}">
+ <field name="sagePayMode" title="${uiLabelMap.AccountingSagePayMode}">
<drop-down>
<option key="TEST"
description="${uiLabelMap.AccountingSagePayTest}"/>
<option key="PRODUCTION"
description="${uiLabelMap.AccountingSagePayProduction}"/>
