Author: jaz
Date: Tue Dec 6 20:25:52 2011
New Revision: 1211088
URL: http://svn.apache.org/viewvc?rev=1211088&view=rev
Log:
reverted previous commit since it breaks SUN (oracle) JDK, ick.
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1211088&r1=1211087&r2=1211088&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
Tue Dec 6 20:25:52 2011
@@ -399,7 +399,7 @@ public class WorldPayEvents {
// attempt to release the offline hold on the order (workflow)
OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId);
// call the email confirm service
- Map<String, Object> emailContext = UtilMisc.toMap("orderId",
orderId, "userLogin", userLogin);
+ Map<String, String> emailContext = UtilMisc.toMap("orderId",
orderId, "userLogin", userLogin);
try {
dispatcher.runSync("sendOrderConfirmation", emailContext);
} catch (GenericServiceException e) {
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1211088&r1=1211087&r2=1211088&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
(original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Tue
Dec 6 20:25:52 2011
@@ -184,7 +184,7 @@ public class CommonServices {
partyId = userLogin.getString("partyId");
}
- Map<String, Object> fields = UtilMisc.toMap("noteId", noteId,
"noteName", noteName, "noteInfo", note,
+ Map<String, String> fields = UtilMisc.toMap("noteId", noteId,
"noteName", noteName, "noteInfo", note,
"noteParty", partyId, "noteDateTime", noteDate);
try {
Modified:
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=1211088&r1=1211087&r2=1211088&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
(original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
Tue Dec 6 20:25:52 2011
@@ -49,7 +49,7 @@ public class OFBizSecurity implements Se
protected Delegator delegator = null;
- protected static final Map<String, Map<String, Object>> simpleRoleEntity =
UtilMisc.toMap(
+ protected static final Map<String, Map<String, String>> simpleRoleEntity =
UtilMisc.toMap(
"ORDERMGR", UtilMisc.toMap("name", "OrderRole", "pkey", "orderId"),
"FACILITY", UtilMisc.toMap("name", "FacilityParty", "pkey",
"facilityId"),
"MARKETING", UtilMisc.toMap("name", "MarketingCampaignRole", "pkey",
"marketingCampaignId"));
@@ -208,10 +208,10 @@ public class OFBizSecurity implements Se
if (hasEntityPermission(application + "_ROLE", action, userLogin))
return true;
}
- Map<String, Object> simpleRoleMap =
OFBizSecurity.simpleRoleEntity.get(application);
+ Map<String, String> simpleRoleMap =
OFBizSecurity.simpleRoleEntity.get(application);
if (simpleRoleMap != null && roles != null) {
- entityName = (String) simpleRoleMap.get("name");
- String pkey = (String) simpleRoleMap.get("pkey");
+ entityName = simpleRoleMap.get("name");
+ String pkey = simpleRoleMap.get("pkey");
if (pkey != null) {
List<EntityExpr> expressions = new ArrayList<EntityExpr>();
for (String role: roles) {
