Author: doogie
Date: Mon Apr 27 15:28:34 2015
New Revision: 1676305
URL: http://svn.apache.org/r1676305
Log:
Fix dumb compile errors in this file; please, let's be careful. Note
the EntityQuery import; this was due to this class being added, but not
imported, which is an obvious error.
Also, if you don't understand generics, please ask. The changes listed
here are very basic compile errors.
The general problems discovered here are due to the class *not being
compiled* by default. If you change something, at least attempt to see
if it has an effect. Compile errors are just plain bad.
cherry-picked from 1676303
Modified:
ofbiz/branches/OFBIZ-6271/ (props changed)
ofbiz/branches/OFBIZ-6271/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
ofbiz/branches/OFBIZ-6271/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
(props changed)
ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
(props changed)
ofbiz/branches/OFBIZ-6271/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
(props changed)
ofbiz/branches/OFBIZ-6271/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
(props changed)
ofbiz/branches/OFBIZ-6271/framework/common/widget/HelpScreens.xml (props
changed)
ofbiz/branches/OFBIZ-6271/framework/security/data/PasswordSecurityData.xml
(props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
(props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
(props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
(props changed)
ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.bat (props changed)
ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.sh (props changed)
Propchange: ofbiz/branches/OFBIZ-6271/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1675958,1676154-1676156
+/ofbiz/trunk:1675958,1676154-1676156,1676303
Modified:
ofbiz/branches/OFBIZ-6271/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=1676305&r1=1676304&r2=1676305&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-6271/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
(original)
+++
ofbiz/branches/OFBIZ-6271/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
Mon Apr 27 15:28:34 2015
@@ -39,6 +39,7 @@ import org.ofbiz.base.util.string.Flexib
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityQuery;
import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.order.shoppingcart.ShoppingCart;
@@ -89,7 +90,7 @@ public class PayflowPro {
isPayPal = true;
}
- Map<String, String> data = new HashMap<String, Object>();
+ Map<String, String> data = new HashMap<String, String>();
boolean isReAuth = false;
if (isPayPal) {
@@ -432,7 +433,7 @@ public class PayflowPro {
"AccountingPayPalShoppingCartIsEmpty", locale));
}
- Map<String, String> data = new HashMap<String, Object>();
+ Map<String, String> data = new HashMap<String, String>();
data.put("TRXTYPE", "O");
data.put("TENDER", "P");
@@ -542,7 +543,7 @@ public class PayflowPro {
String paymentGatewayConfigId =
payPalPaymentSetting.getString("paymentGatewayConfigId");
String configString = "payment.properties";
- Map<String, String> data = new HashMap<String, Object>();
+ Map<String, String> data = new HashMap<String, String>();
data.put("TRXTYPE", "O");
data.put("TENDER", "P");
data.put("ACTION", "G");
@@ -621,7 +622,7 @@ public class PayflowPro {
}
BigDecimal processAmount = paymentPref.getBigDecimal("maxAmount");
- Map<String, String> data = new HashMap<String, Object>();
+ Map<String, String> data = new HashMap<String, String>();
data.put("TRXTYPE", "O");
data.put("TENDER", "P");
data.put("PAYERID", payPalPaymentMethod.getString("payerId"));
@@ -669,7 +670,7 @@ public class PayflowPro {
private static Map<String, String> parseResponse(String resp) {
Debug.logInfo("Verisign response string: " + resp, module);
- Map<String, String> parameters = new HashMap<String, Object>();
+ Map<String, String> parameters = new HashMap<String, String>();
List<String> params = StringUtil.split(resp, "&");
for (String str : params) {
if (str.length() > 0) {
Propchange:
ofbiz/branches/OFBIZ-6271/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
/ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1675958,1676154-1676156
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1675958,1676154-1676156,1676303
Propchange:
ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -6,4 +6,4 @@
/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:952958-1044489
/ofbiz/branches/json-integration-refactoring/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1634077-1635900
/ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:921280-927264
-/ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1675958,1676154-1676156
+/ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1675958,1676154-1676156,1676303
Propchange:
ofbiz/branches/OFBIZ-6271/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1675958,1676154-1676156
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1675958,1676154-1676156,1676303
Propchange:
ofbiz/branches/OFBIZ-6271/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957
/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1675958,1676154-1676156
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1675958,1676154-1676156,1676303
Propchange: ofbiz/branches/OFBIZ-6271/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957
/ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1675958,1676154-1676156
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1675958,1676154-1676156,1676303
Propchange:
ofbiz/branches/OFBIZ-6271/framework/security/data/PasswordSecurityData.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957
/ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264
-/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1675958,1676154-1676156
+/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1675958,1676154-1676156,1676303
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
/ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:1675958,1676154-1676156
+/ofbiz/trunk/specialpurpose/ebaystore/lib:1675958,1676154-1676156,1676303
Propchange:
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1675958,1676154-1676156
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1675958,1676154-1676156,1676303
Propchange:
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1675958,1676154-1676156
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1675958,1676154-1676156,1676303
Propchange:
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1675958,1676154-1676156
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1675958,1676154-1676156,1676303
Propchange: ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -4,4 +4,4 @@
/ofbiz/branches/jquery/mergefromtrunk.bat:952958-1044489
/ofbiz/branches/multitenant20100310/mergefromtrunk.bat:921280-927264
/ofbiz/trunk/mergefromtrunk.bat:1332097,1333885,1334201,1334336,1334483,1335343,1335347,1335351,1335946
-/ofbiz/trunk/tools/mergefromtrunk.bat:1675958,1676154-1676156
+/ofbiz/trunk/tools/mergefromtrunk.bat:1675958,1676154-1676156,1676303
Propchange: ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:28:34 2015
@@ -4,4 +4,4 @@
/ofbiz/branches/jquery/mergefromtrunk.sh:952958-1044489
/ofbiz/branches/multitenant20100310/mergefromtrunk.sh:921280-927264
/ofbiz/trunk/mergefromtrunk.sh:1332097,1333885,1334201,1334336,1334483,1335343,1335347,1335351,1335946
-/ofbiz/trunk/tools/mergefromtrunk.sh:1675958,1676154-1676156
+/ofbiz/trunk/tools/mergefromtrunk.sh:1675958,1676154-1676156,1676303
